From ecd3d1b56a328219fe2b1582e991fa980726034b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Fri, 20 May 2016 12:12:17 +0200 Subject: [PATCH] White noise: formatting --- .../googleapps/GoogleAppsConnector.java | 108 ++++----- .../googleapps/RequestResultHandler.java | 9 +- .../bundles/googleapps/UserHandler.java | 224 +++++++----------- 3 files changed, 134 insertions(+), 207 deletions(-) diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsConnector.java b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsConnector.java index ca92061..ecc0694 100644 --- a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsConnector.java +++ b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsConnector.java @@ -717,9 +717,9 @@ public void executeQuery( @Override public String handleResult(final Directory.Users.List request, final Users value) { if (null != value.getUsers()) { - for (User group : value.getUsers()) { + for (User user : value.getUsers()) { handler.handle(fromUser( - group, attributesToGet, configuration.getDirectory().groups())); + user, attributesToGet, configuration.getDirectory().groups())); } } return value.getNextPageToken(); @@ -749,9 +749,9 @@ public String handleResult(final Directory.Users.List request, final Users value new RequestResultHandler() { @Override - public Boolean handleResult(final Directory.Users.Get request, final User value) { - return handler.handle(fromUser(value, attributesToGet, - configuration.getDirectory().groups())); + public Boolean handleResult(final Directory.Users.Get request, final User user) { + return handler.handle( + fromUser(user, attributesToGet, configuration.getDirectory().groups())); } @Override @@ -1200,8 +1200,7 @@ protected Set getAttributesToGet(ObjectClass objectClass, OperationOptio if (i < 0 && j < 0) { attributesToGet.add(attribute); } else if (i == 0 || j == 0) { - throw new IllegalArgumentException("Invalid attribute name to get:/" - + attribute); + throw new IllegalArgumentException("Invalid attribute name to get:/" + attribute); } else { int l = attribute.length(); if (i > 0) { @@ -1612,8 +1611,7 @@ public Uid handleResult( return uidAfterUpdate; } - protected ConnectorObject fromUser(User user, Set attributesToGet, - Directory.Groups service) { + protected ConnectorObject fromUser(final User user, Set attributesToGet, final Directory.Groups service) { ConnectorObjectBuilder builder = new ConnectorObjectBuilder(); if (null != user.getEtag()) { builder.setUid(new Uid(user.getId(), user.getEtag())); @@ -1623,8 +1621,7 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, builder.setName(user.getPrimaryEmail()); // Optional - // If both givenName and familyName are empty then Google didn't return - // with 'name' + // If both givenName and familyName are empty then Google didn't return with 'name' if (null == attributesToGet || attributesToGet.contains(GIVEN_NAME_ATTR)) { builder.addAttribute(AttributeBuilder.build(GIVEN_NAME_ATTR, null != user.getName() ? user.getName().getGivenName() : null)); @@ -1642,35 +1639,33 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, builder.addAttribute(AttributeBuilder.build(IS_ADMIN_ATTR, user.getIsAdmin())); } if (null == attributesToGet || attributesToGet.contains(IS_DELEGATED_ADMIN_ATTR)) { - builder.addAttribute(AttributeBuilder.build(IS_DELEGATED_ADMIN_ATTR, user - .getIsDelegatedAdmin())); + builder.addAttribute(AttributeBuilder.build(IS_DELEGATED_ADMIN_ATTR, user.getIsDelegatedAdmin())); } - if (null == attributesToGet || attributesToGet.contains(LAST_LOGIN_TIME_ATTR)) { - builder.addAttribute(AttributeBuilder.build(LAST_LOGIN_TIME_ATTR, user - .getLastLoginTime().toString())); + if ((null == attributesToGet || attributesToGet.contains(LAST_LOGIN_TIME_ATTR)) + && user.getLastLoginTime() != null) { + + builder.addAttribute(AttributeBuilder.build(LAST_LOGIN_TIME_ATTR, user.getLastLoginTime().toString())); } - if (null == attributesToGet || attributesToGet.contains(CREATION_TIME_ATTR)) { - builder.addAttribute(AttributeBuilder.build(CREATION_TIME_ATTR, user.getCreationTime() - .toString())); + if ((null == attributesToGet || attributesToGet.contains(CREATION_TIME_ATTR)) + && user.getCreationTime() != null) { + + builder.addAttribute(AttributeBuilder.build(CREATION_TIME_ATTR, user.getCreationTime().toString())); } if (null == attributesToGet || attributesToGet.contains(AGREED_TO_TERMS_ATTR)) { - builder.addAttribute(AttributeBuilder.build(AGREED_TO_TERMS_ATTR, user - .getAgreedToTerms())); + builder.addAttribute(AttributeBuilder.build(AGREED_TO_TERMS_ATTR, user.getAgreedToTerms())); } if (null == attributesToGet || attributesToGet.contains(SUSPENDED_ATTR)) { builder.addAttribute(AttributeBuilder.build(SUSPENDED_ATTR, user.getSuspended())); } if (null == attributesToGet || attributesToGet.contains(SUSPENSION_REASON_ATTR)) { - builder.addAttribute(AttributeBuilder.build(SUSPENSION_REASON_ATTR, user - .getSuspensionReason())); + builder.addAttribute(AttributeBuilder.build(SUSPENSION_REASON_ATTR, user.getSuspensionReason())); } if (null == attributesToGet || attributesToGet.contains(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR)) { - builder.addAttribute(AttributeBuilder.build(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR, user - .getChangePasswordAtNextLogin())); + builder.addAttribute( + AttributeBuilder.build(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR, user.getChangePasswordAtNextLogin())); } if (null == attributesToGet || attributesToGet.contains(IP_WHITELISTED_ATTR)) { - builder.addAttribute(AttributeBuilder.build(IP_WHITELISTED_ATTR, user - .getIpWhitelisted())); + builder.addAttribute(AttributeBuilder.build(IP_WHITELISTED_ATTR, user.getIpWhitelisted())); } if (null == attributesToGet || attributesToGet.contains(IMS_ATTR)) { builder.addAttribute(AttributeBuilder.build(IMS_ATTR, (Collection) user.getIms())); @@ -1679,20 +1674,16 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, builder.addAttribute(AttributeBuilder.build(EMAILS_ATTR, (Collection) user.getEmails())); } if (null == attributesToGet || attributesToGet.contains(EXTERNAL_IDS_ATTR)) { - builder.addAttribute(AttributeBuilder.build(EXTERNAL_IDS_ATTR, (Collection) user - .getExternalIds())); + builder.addAttribute(AttributeBuilder.build(EXTERNAL_IDS_ATTR, (Collection) user.getExternalIds())); } if (null == attributesToGet || attributesToGet.contains(RELATIONS_ATTR)) { - builder.addAttribute(AttributeBuilder.build(RELATIONS_ATTR, (Collection) user - .getRelations())); + builder.addAttribute(AttributeBuilder.build(RELATIONS_ATTR, (Collection) user.getRelations())); } if (null == attributesToGet || attributesToGet.contains(ADDRESSES_ATTR)) { - builder.addAttribute(AttributeBuilder.build(ADDRESSES_ATTR, (Collection) user - .getAddresses())); + builder.addAttribute(AttributeBuilder.build(ADDRESSES_ATTR, (Collection) user.getAddresses())); } if (null == attributesToGet || attributesToGet.contains(ORGANIZATIONS_ATTR)) { - builder.addAttribute(AttributeBuilder.build(ORGANIZATIONS_ATTR, (Collection) user - .getOrganizations())); + builder.addAttribute(AttributeBuilder.build(ORGANIZATIONS_ATTR, (Collection) user.getOrganizations())); } if (null == attributesToGet || attributesToGet.contains(PHONES_ATTR)) { builder.addAttribute(AttributeBuilder.build(PHONES_ATTR, (Collection) user.getPhones())); @@ -1702,8 +1693,7 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, } if (null == attributesToGet || attributesToGet.contains(NON_EDITABLE_ALIASES_ATTR)) { - builder.addAttribute(AttributeBuilder.build(NON_EDITABLE_ALIASES_ATTR, user - .getNonEditableAliases())); + builder.addAttribute(AttributeBuilder.build(NON_EDITABLE_ALIASES_ATTR, user.getNonEditableAliases())); } if (null == attributesToGet || attributesToGet.contains(CUSTOMER_ID_ATTR)) { @@ -1713,17 +1703,16 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, builder.addAttribute(AttributeBuilder.build(ORG_UNIT_PATH_ATTR, user.getOrgUnitPath())); } if (null == attributesToGet || attributesToGet.contains(IS_MAILBOX_SETUP_ATTR)) { - builder.addAttribute(AttributeBuilder.build(IS_MAILBOX_SETUP_ATTR, user - .getIsMailboxSetup())); + builder.addAttribute(AttributeBuilder.build(IS_MAILBOX_SETUP_ATTR, user.getIsMailboxSetup())); } if (null == attributesToGet || attributesToGet.contains(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR)) { - builder.addAttribute(AttributeBuilder.build(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR, user - .getIncludeInGlobalAddressList())); + builder.addAttribute( + AttributeBuilder.build(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR, user.getIncludeInGlobalAddressList())); } if (null == attributesToGet || attributesToGet.contains(THUMBNAIL_PHOTO_URL_ATTR)) { - builder.addAttribute(AttributeBuilder.build(THUMBNAIL_PHOTO_URL_ATTR, user - .getThumbnailPhotoUrl())); + builder.addAttribute( + AttributeBuilder.build(THUMBNAIL_PHOTO_URL_ATTR, user.getThumbnailPhotoUrl())); } if (null == attributesToGet || attributesToGet.contains(DELETION_TIME_ATTR)) { builder.addAttribute(AttributeBuilder.build(DELETION_TIME_ATTR, null != user @@ -1732,15 +1721,18 @@ protected ConnectorObject fromUser(User user, Set attributesToGet, // Expensive to get if (null != attributesToGet && attributesToGet.contains(PredefinedAttributes.GROUPS_NAME)) { - builder.addAttribute(AttributeBuilder.build(PredefinedAttributes.GROUPS_NAME, - listGroups(service, user.getId()))); + builder.addAttribute( + AttributeBuilder.build(PredefinedAttributes.GROUPS_NAME, listGroups(service, user.getId()))); } return builder.build(); } - protected ConnectorObject fromGroup(Group group, Set attributesToGet, - Directory.Members service) { + protected ConnectorObject fromGroup( + final Group group, + final Set attributesToGet, + final Directory.Members service) { + ConnectorObjectBuilder builder = new ConnectorObjectBuilder(); builder.setObjectClass(ObjectClass.GROUP); @@ -1756,30 +1748,25 @@ protected ConnectorObject fromGroup(Group group, Set attributesToGet, builder.addAttribute(AttributeBuilder.build(NAME_ATTR, group.getName())); } if (null == attributesToGet || attributesToGet.contains(PredefinedAttributes.DESCRIPTION)) { - builder.addAttribute(AttributeBuilder.build(PredefinedAttributes.DESCRIPTION, group - .getDescription())); + builder.addAttribute(AttributeBuilder.build(PredefinedAttributes.DESCRIPTION, group.getDescription())); } if (null == attributesToGet || attributesToGet.contains(ADMIN_CREATED_ATTR)) { - builder.addAttribute(AttributeBuilder - .build(ADMIN_CREATED_ATTR, group.getAdminCreated())); + builder.addAttribute(AttributeBuilder.build(ADMIN_CREATED_ATTR, group.getAdminCreated())); } if (null == attributesToGet || attributesToGet.contains(ALIASES_ATTR)) { builder.addAttribute(AttributeBuilder.build(ALIASES_ATTR, group.getAliases())); } if (null == attributesToGet || attributesToGet.contains(NON_EDITABLE_ALIASES_ATTR)) { - builder.addAttribute(AttributeBuilder.build(NON_EDITABLE_ALIASES_ATTR, group - .getNonEditableAliases())); + builder.addAttribute(AttributeBuilder.build(NON_EDITABLE_ALIASES_ATTR, group.getNonEditableAliases())); } if (null == attributesToGet || attributesToGet.contains(DIRECT_MEMBERS_COUNT_ATTR)) { - builder.addAttribute(AttributeBuilder.build(DIRECT_MEMBERS_COUNT_ATTR, group - .getDirectMembersCount())); + builder.addAttribute(AttributeBuilder.build(DIRECT_MEMBERS_COUNT_ATTR, group.getDirectMembersCount())); } // Expensive to get if (null != attributesToGet && attributesToGet.contains(MEMBERS_ATTR)) { - builder.addAttribute(AttributeBuilder.build(MEMBERS_ATTR, listMembers(service, group - .getId(), null))); + builder.addAttribute(AttributeBuilder.build(MEMBERS_ATTR, listMembers(service, group.getId(), null))); } return builder.build(); @@ -1825,8 +1812,8 @@ protected Set listGroups(Directory.Groups service, String userKey) { Directory.Groups.List request = service.list(); request.setUserKey(userKey); request.setFields("groups/email"); - //400 Bad Request if the Customer(my_customer or exact value) is set, only domain-userKey combination allowed. - //request.setCustomer(MY_CUSTOMER_ID); + // 400 Bad Request if the Customer(my_customer or exact value) is set, only domain-userKey combination + // allowed. request.setCustomer(MY_CUSTOMER_ID); request.setDomain(configuration.getDomain()); String nextPageToken; @@ -1862,6 +1849,7 @@ protected , T, R> R execute( protected , T, R> R execute( G request, RequestResultHandler handler, int retry) { + try { if (retry >= 0) { long sleep = (long) ((1000 * Math.pow(2, retry)) + nextLong(1000)); @@ -1937,7 +1925,7 @@ protected RuntimeException get(GoogleJsonError.ErrorInfo errorInfo) { private static final Random RANDOM = new Random(); - long nextLong(long n) { + private static long nextLong(long n) { long bits, val; do { bits = (RANDOM.nextLong() << 1) >>> 1; diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/RequestResultHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/RequestResultHandler.java index 6c09d20..92c6fe7 100644 --- a/src/main/java/net/tirasa/connid/bundles/googleapps/RequestResultHandler.java +++ b/src/main/java/net/tirasa/connid/bundles/googleapps/RequestResultHandler.java @@ -23,26 +23,25 @@ */ package net.tirasa.connid.bundles.googleapps; +import com.google.api.client.googleapis.services.json.AbstractGoogleJsonClientRequest; import java.io.IOException; import org.identityconnectors.framework.common.exceptions.AlreadyExistsException; import org.identityconnectors.framework.common.exceptions.ConnectorException; import org.identityconnectors.framework.common.exceptions.UnknownUidException; -import com.google.api.client.googleapis.services.json.AbstractGoogleJsonClientRequest; - public abstract class RequestResultHandler, T, R> { public abstract R handleResult(G request, T value); - public R handleNotFound(IOException e) { + public R handleNotFound(final IOException e) { throw new UnknownUidException(e.getMessage(), e); } - public R handleDuplicate(IOException e) { + public R handleDuplicate(final IOException e) { throw new AlreadyExistsException(e.getMessage(), e); } - public R handleError(Throwable e) { + public R handleError(final Throwable e) { throw ConnectorException.wrap(e); } } diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java index b897691..1d20a6b 100644 --- a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java +++ b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java @@ -38,6 +38,7 @@ import org.identityconnectors.framework.common.objects.AttributeUtil; import org.identityconnectors.framework.common.objects.AttributesAccessor; import org.identityconnectors.framework.common.objects.Name; +import org.identityconnectors.framework.common.objects.Uid; import org.identityconnectors.framework.common.objects.ObjectClassInfo; import org.identityconnectors.framework.common.objects.ObjectClassInfoBuilder; import org.identityconnectors.framework.common.objects.OperationalAttributes; @@ -76,70 +77,6 @@ public class UserHandler implements FilterVisitor NAME_DICTIONARY; private static final Set S; @@ -148,13 +85,13 @@ public class UserHandler implements FilterVisitor dictionary = CollectionUtil.newCaseInsensitiveMap(); - dictionary.put(NAME, NAME); - dictionary.put("email", "email"); - dictionary.put(Name.NAME, "email"); - dictionary.put(GIVEN_NAME_ATTR, GIVEN_NAME_ATTR); - dictionary.put(FAMILY_NAME_ATTR, FAMILY_NAME_ATTR); - dictionary.put(IS_ADMIN_ATTR, IS_ADMIN_ATTR); - dictionary.put(IS_DELEGATED_ADMIN_ATTR, IS_DELEGATED_ADMIN_ATTR); + dictionary.put(Uid.NAME, Uid.NAME); + dictionary.put(GoogleAppsConnector.EMAIL_ATTR, GoogleAppsConnector.EMAIL_ATTR); + dictionary.put(Name.NAME, GoogleAppsConnector.EMAIL_ATTR); + dictionary.put(GoogleAppsConnector.GIVEN_NAME_ATTR, GoogleAppsConnector.GIVEN_NAME_ATTR); + dictionary.put(GoogleAppsConnector.FAMILY_NAME_ATTR, GoogleAppsConnector.FAMILY_NAME_ATTR); + dictionary.put(GoogleAppsConnector.IS_ADMIN_ATTR, GoogleAppsConnector.IS_ADMIN_ATTR); + dictionary.put(GoogleAppsConnector.IS_DELEGATED_ADMIN_ATTR, GoogleAppsConnector.IS_DELEGATED_ADMIN_ATTR); dictionary.put("isSuspended", "isSuspended"); dictionary.put("im", "im"); dictionary.put("externalId", "externalId"); @@ -182,7 +119,7 @@ public class UserHandler implements FilterVisitor s = CollectionUtil.newCaseInsensitiveSet(); - s.add(NAME); + s.add(Name.NAME); s.add("email"); s.add("givenName"); s.add("familyName"); @@ -248,8 +185,7 @@ public StringBuilder visitContainsFilter(Directory.Users.List list, ContainsFilt * @param filedName * @return */ - protected StringBuilder getStringBuilder(Attribute attribute, char operator, Character postfix, - String filedName) { + protected StringBuilder getStringBuilder(Attribute attribute, char operator, Character postfix, String filedName) { StringBuilder builder = new StringBuilder(); builder.append(filedName).append(operator); String stringValue = AttributeUtil.getAsStringValue(attribute); @@ -479,73 +415,74 @@ public static ObjectClassInfo getUserClassInfo() { // primaryEmail builder.addAttributeInfo(Name.INFO); - builder.addAttributeInfo(AttributeInfoBuilder.define(GIVEN_NAME_ATTR).setRequired(true) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.GIVEN_NAME_ATTR).setRequired(true) .build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(FAMILY_NAME_ATTR).setRequired(true) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.FAMILY_NAME_ATTR).setRequired(true) .build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(FULL_NAME_ATTR).setUpdateable(false) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.FULL_NAME_ATTR).setUpdateable(false) .setCreateable(false).build()); // Virtual attribute Modify supported - builder.addAttributeInfo(AttributeInfoBuilder.build(IS_ADMIN_ATTR, Boolean.TYPE)); + builder.addAttributeInfo(AttributeInfoBuilder.build(GoogleAppsConnector.IS_ADMIN_ATTR, Boolean.TYPE)); - builder.addAttributeInfo(AttributeInfoBuilder.define(IS_DELEGATED_ADMIN_ATTR, Boolean.TYPE) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.IS_DELEGATED_ADMIN_ATTR, Boolean.TYPE) .setUpdateable(false).setCreateable(false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(LAST_LOGIN_TIME_ATTR).setUpdateable( + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.LAST_LOGIN_TIME_ATTR).setUpdateable( false).setCreateable(false).setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(CREATION_TIME_ATTR).setUpdateable( + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.CREATION_TIME_ATTR).setUpdateable( false).setCreateable(false).setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(AGREED_TO_TERMS_ATTR, Boolean.TYPE) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.AGREED_TO_TERMS_ATTR, Boolean.TYPE) .setUpdateable(false).setCreateable(false).build()); builder.addAttributeInfo(AttributeInfoBuilder.define(OperationalAttributes.PASSWORD_NAME, GuardedString.class).setRequired(true).setReadable(false).setReturnedByDefault( false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.build(SUSPENDED_ATTR, Boolean.class)); - builder.addAttributeInfo(AttributeInfoBuilder.define(SUSPENSION_REASON_ATTR).setUpdateable( - false).setCreateable(false).build()); + builder.addAttributeInfo(AttributeInfoBuilder.build(GoogleAppsConnector.SUSPENDED_ATTR, Boolean.class)); + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.SUSPENSION_REASON_ATTR). + setUpdateable(false).setCreateable(false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.build(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR, - Boolean.class)); - builder.addAttributeInfo(AttributeInfoBuilder.build(IP_WHITELISTED_ATTR, Boolean.class)); + builder.addAttributeInfo(AttributeInfoBuilder.build( + GoogleAppsConnector.CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR, Boolean.class)); + builder.addAttributeInfo(AttributeInfoBuilder.build(GoogleAppsConnector.IP_WHITELISTED_ATTR, Boolean.class)); - builder.addAttributeInfo(AttributeInfoBuilder.define(IMS_ATTR, Map.class).setMultiValued( - true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(EMAILS_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.IMS_ATTR, Map.class). + setMultiValued(true).build()); + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.EMAILS_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(EXTERNAL_IDS_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.EXTERNAL_IDS_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(RELATIONS_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.RELATIONS_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(ADDRESSES_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.ADDRESSES_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(ORGANIZATIONS_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.ORGANIZATIONS_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(PHONES_ATTR, Map.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.PHONES_ATTR, Map.class) .setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(ALIASES_ATTR).setUpdateable(false) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.ALIASES_ATTR).setUpdateable(false) .setCreateable(false).setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(NON_EDITABLE_ALIASES_ATTR) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.NON_EDITABLE_ALIASES_ATTR) .setUpdateable(false).setCreateable(false).setMultiValued(true).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(CUSTOMER_ID_ATTR).setUpdateable(false) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.CUSTOMER_ID_ATTR).setUpdateable(false) .setCreateable(false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.build(ORG_UNIT_PATH_ATTR)); + builder.addAttributeInfo(AttributeInfoBuilder.build(GoogleAppsConnector.ORG_UNIT_PATH_ATTR)); - builder.addAttributeInfo(AttributeInfoBuilder.define(IS_MAILBOX_SETUP_ATTR, Boolean.class) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.IS_MAILBOX_SETUP_ATTR, Boolean.class) .setUpdateable(false).setCreateable(false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.build(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR, - Boolean.class)); + builder.addAttributeInfo( + AttributeInfoBuilder.build(GoogleAppsConnector.INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR, Boolean.class)); - builder.addAttributeInfo(AttributeInfoBuilder.define(THUMBNAIL_PHOTO_URL_ATTR) + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.THUMBNAIL_PHOTO_URL_ATTR) .setUpdateable(false).setCreateable(false).build()); - builder.addAttributeInfo(AttributeInfoBuilder.define(DELETION_TIME_ATTR).setUpdateable( - false).setCreateable(false).build()); + builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.DELETION_TIME_ATTR). + setUpdateable( + false).setCreateable(false).build()); // Virtual Attribute builder.addAttributeInfo(AttributeInfoBuilder.define(GoogleAppsConnector.PHOTO_ATTR, byte[].class). @@ -570,41 +507,44 @@ public static Directory.Users.Insert createUser(Directory.Users users, Attribute user.setName(new UserName()); // givenName The user's first name. Required when creating a user // account. - String givenName = attributes.findString(GIVEN_NAME_ATTR); + String givenName = attributes.findString(GoogleAppsConnector.GIVEN_NAME_ATTR); if (StringUtil.isNotBlank(givenName)) { user.getName().setGivenName(givenName); } else { throw new InvalidAttributeValueException( - "Missing required attribute 'givenName'. The user's first name. Required when creating a user account."); + "Missing required attribute 'givenName'." + + "The user's first name. Required when creating a user account."); } - // familyName The user's last name. Required when creating a user - // account. - String familyName = attributes.findString(FAMILY_NAME_ATTR); + // familyName The user's last name. Required when creating a user account. + String familyName = attributes.findString(GoogleAppsConnector.FAMILY_NAME_ATTR); if (StringUtil.isNotBlank(familyName)) { user.getName().setFamilyName(familyName); } else { throw new InvalidAttributeValueException( - "Missing required attribute 'familyName'. The user's last name. Required when creating a user account."); + "Missing required attribute 'familyName'." + + "The user's last name. Required when creating a user account."); } // Optional - user.setIms(attributes.findList(IMS_ATTR)); - user.setEmails(attributes.findList(EMAILS_ATTR)); - user.setExternalIds(attributes.findList(EXTERNAL_IDS_ATTR)); - user.setRelations(attributes.findList(RELATIONS_ATTR)); - user.setAddresses(attributes.findList(ADDRESSES_ATTR)); - user.setOrganizations(attributes.findList(ORGANIZATIONS_ATTR)); - user.setPhones(attributes.findList(PHONES_ATTR)); - - user.setSuspended(attributes.findBoolean(SUSPENDED_ATTR)); - user.setChangePasswordAtNextLogin(attributes.findBoolean(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR)); - user.setIpWhitelisted(attributes.findBoolean(IP_WHITELISTED_ATTR)); - user.setOrgUnitPath(attributes.findString(ORG_UNIT_PATH_ATTR)); - user.setIncludeInGlobalAddressList(attributes.findBoolean(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR)); + user.setIms(attributes.findList(GoogleAppsConnector.IMS_ATTR)); + user.setEmails(attributes.findList(GoogleAppsConnector.EMAILS_ATTR)); + user.setExternalIds(attributes.findList(GoogleAppsConnector.EXTERNAL_IDS_ATTR)); + user.setRelations(attributes.findList(GoogleAppsConnector.RELATIONS_ATTR)); + user.setAddresses(attributes.findList(GoogleAppsConnector.ADDRESSES_ATTR)); + user.setOrganizations(attributes.findList(GoogleAppsConnector.ORGANIZATIONS_ATTR)); + user.setPhones(attributes.findList(GoogleAppsConnector.PHONES_ATTR)); + + user.setSuspended(attributes.findBoolean(GoogleAppsConnector.SUSPENDED_ATTR)); + user.setChangePasswordAtNextLogin( + attributes.findBoolean(GoogleAppsConnector.CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR)); + user.setIpWhitelisted(attributes.findBoolean(GoogleAppsConnector.IP_WHITELISTED_ATTR)); + user.setOrgUnitPath(attributes.findString(GoogleAppsConnector.ORG_UNIT_PATH_ATTR)); + user.setIncludeInGlobalAddressList( + attributes.findBoolean(GoogleAppsConnector.INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR)); try { - return users.insert(user).setFields(ID_ETAG); + return users.insert(user).setFields(GoogleAppsConnector.ID_ETAG); } catch (IOException e) { LOG.warn(e, "Failed to initialize Groups#Insert"); throw ConnectorException.wrap(e); @@ -622,7 +562,7 @@ public static Directory.Users.Patch updateUser( content.setPrimaryEmail(email.getNameValue()); } - Attribute givenName = attributes.find(GIVEN_NAME_ATTR); + Attribute givenName = attributes.find(GoogleAppsConnector.GIVEN_NAME_ATTR); if (null != givenName) { String stringValue = GoogleAppsUtil.getStringValueWithDefault(givenName, null); if (null != stringValue) { @@ -634,7 +574,7 @@ public static Directory.Users.Patch updateUser( } } - Attribute familyName = attributes.find(FAMILY_NAME_ATTR); + Attribute familyName = attributes.find(GoogleAppsConnector.FAMILY_NAME_ATTR); if (null != familyName) { String stringValue = GoogleAppsUtil.getStringValueWithDefault(familyName, null); if (null != stringValue) { @@ -656,7 +596,7 @@ public static Directory.Users.Patch updateUser( content.setPassword(SecurityUtil.decrypt(password)); } - Attribute suspended = attributes.find(SUSPENDED_ATTR); + Attribute suspended = attributes.find(GoogleAppsConnector.SUSPENDED_ATTR); if (null != suspended) { Boolean booleanValue = GoogleAppsUtil.getBooleanValueWithDefault(suspended, null); if (null != booleanValue) { @@ -667,7 +607,7 @@ public static Directory.Users.Patch updateUser( } } - Attribute changePasswordAtNextLogin = attributes.find(CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR); + Attribute changePasswordAtNextLogin = attributes.find(GoogleAppsConnector.CHANGE_PASSWORD_AT_NEXT_LOGIN_ATTR); if (null != changePasswordAtNextLogin) { Boolean booleanValue = GoogleAppsUtil.getBooleanValueWithDefault(changePasswordAtNextLogin, null); @@ -679,7 +619,7 @@ public static Directory.Users.Patch updateUser( } } - Attribute ipWhitelisted = attributes.find(IP_WHITELISTED_ATTR); + Attribute ipWhitelisted = attributes.find(GoogleAppsConnector.IP_WHITELISTED_ATTR); if (null != ipWhitelisted) { Boolean booleanValue = GoogleAppsUtil.getBooleanValueWithDefault(ipWhitelisted, null); if (null != booleanValue) { @@ -691,7 +631,7 @@ public static Directory.Users.Patch updateUser( } // Maps - Attribute ims = attributes.find(IMS_ATTR); + Attribute ims = attributes.find(GoogleAppsConnector.IMS_ATTR); if (null != ims) { if (null == content) { content = new User(); @@ -699,7 +639,7 @@ public static Directory.Users.Patch updateUser( content.setIms(ims.getValue()); } - Attribute emails = attributes.find(EMAILS_ATTR); + Attribute emails = attributes.find(GoogleAppsConnector.EMAILS_ATTR); if (null != emails) { if (null == content) { content = new User(); @@ -707,7 +647,7 @@ public static Directory.Users.Patch updateUser( content.setEmails(emails.getValue()); } - Attribute externalIds = attributes.find(EXTERNAL_IDS_ATTR); + Attribute externalIds = attributes.find(GoogleAppsConnector.EXTERNAL_IDS_ATTR); if (null != externalIds) { if (null == content) { content = new User(); @@ -715,7 +655,7 @@ public static Directory.Users.Patch updateUser( content.setExternalIds(externalIds.getValue()); } - Attribute relations = attributes.find(RELATIONS_ATTR); + Attribute relations = attributes.find(GoogleAppsConnector.RELATIONS_ATTR); if (null != relations) { if (null == content) { content = new User(); @@ -723,7 +663,7 @@ public static Directory.Users.Patch updateUser( content.setRelations(relations.getValue()); } - Attribute addresses = attributes.find(ADDRESSES_ATTR); + Attribute addresses = attributes.find(GoogleAppsConnector.ADDRESSES_ATTR); if (null != addresses) { if (null == content) { content = new User(); @@ -731,7 +671,7 @@ public static Directory.Users.Patch updateUser( content.setAddresses(addresses.getValue()); } - Attribute organizations = attributes.find(ORGANIZATIONS_ATTR); + Attribute organizations = attributes.find(GoogleAppsConnector.ORGANIZATIONS_ATTR); if (null != organizations) { if (null == content) { content = new User(); @@ -739,7 +679,7 @@ public static Directory.Users.Patch updateUser( content.setOrganizations(organizations.getValue()); } - Attribute phones = attributes.find(PHONES_ATTR); + Attribute phones = attributes.find(GoogleAppsConnector.PHONES_ATTR); if (null != phones) { if (null == content) { content = new User(); @@ -747,7 +687,7 @@ public static Directory.Users.Patch updateUser( content.setPhones(phones.getValue()); } - Attribute orgUnitPath = attributes.find(ORG_UNIT_PATH_ATTR); + Attribute orgUnitPath = attributes.find(GoogleAppsConnector.ORG_UNIT_PATH_ATTR); if (null != orgUnitPath) { String stringValue = GoogleAppsUtil.getStringValueWithDefault(orgUnitPath, null); if (null != stringValue) { @@ -758,7 +698,7 @@ public static Directory.Users.Patch updateUser( } } - Attribute includeInGlobalAddressList = attributes.find(INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR); + Attribute includeInGlobalAddressList = attributes.find(GoogleAppsConnector.INCLUDE_IN_GLOBAL_ADDRESS_LIST_ATTR); if (null != includeInGlobalAddressList) { Boolean booleanValue = GoogleAppsUtil.getBooleanValueWithDefault(includeInGlobalAddressList, null); @@ -774,7 +714,7 @@ public static Directory.Users.Patch updateUser( return null; } try { - return users.patch(groupKey, content).setFields(ID_ETAG); + return users.patch(groupKey, content).setFields(GoogleAppsConnector.ID_ETAG); // } catch (HttpResponseException e){ } catch (IOException e) { LOG.warn(e, "Failed to initialize Groups#Patch"); @@ -814,7 +754,7 @@ public static Directory.Users.Aliases.Insert createUserAlias( Alias content = new Alias(); content.setAlias(alias); try { - return service.insert(userKey, content).setFields(ID_ETAG); + return service.insert(userKey, content).setFields(GoogleAppsConnector.ID_ETAG); } catch (IOException e) { LOG.warn(e, "Failed to initialize Aliases#Insert"); throw ConnectorException.wrap(e);