diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java index c63e9c291..383388867 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/ldap/LdapUtils.java @@ -291,14 +291,14 @@ public class LdapUtils { } public static String getAttrStringValue(Attributes attrs, String elem) { - String value = ""; + StringBuffer values = new StringBuffer(""); try { if (attrs.get(elem) != null) { for (int i = 0; i < attrs.get(elem).size(); i++) { if(i == 0) { - value += attrs.get(elem).get(i).toString(); + values.append(attrs.get(elem).get(i).toString()); }else { - value += "," + attrs.get(elem).get(i).toString(); + values.append(" , ").append(attrs.get(elem).get(i).toString()); } } } @@ -306,7 +306,26 @@ public class LdapUtils { e.printStackTrace(); _logger.error(e.getMessage()); } - return value; + return values.toString(); + } + + public static String getAttrStringValue(Attribute attr) { + StringBuffer values = new StringBuffer(""); + try { + if (attr != null) { + for (int i = 0; i < attr.size(); i++) { + if(i == 0) { + values.append(attr.get(i).toString()); + }else { + values.append(" , ").append(attr.get(i).toString()); + } + } + } + } catch (NamingException e) { + e.printStackTrace(); + _logger.error(e.getMessage()); + } + return values.toString(); } public static String getAttributeStringValue(String attribute ,HashMap attributeMap) throws NamingException { diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java index fd79a4015..278dc505f 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java @@ -76,7 +76,10 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer NamingEnumeration attrs = sr.getAttributes().getAll(); while (null != attrs && attrs.hasMoreElements()) { Attribute objAttrs = attrs.nextElement(); - _logger.trace("attribute {} : {}" ,objAttrs.getID(), objAttrs.get()); + _logger.trace("attribute {} : {}" , + objAttrs.getID(), + ActiveDirectoryUtils.getAttrStringValue(objAttrs) + ); attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs); } diff --git a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java index 85e748db6..b11071fc4 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java @@ -72,7 +72,10 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService NamingEnumeration attrs = sr.getAttributes().getAll(); while (null != attrs && attrs.hasMoreElements()) { Attribute objAttrs = attrs.nextElement(); - _logger.trace("attribute {} : {}" ,objAttrs.getID(), objAttrs.get()); + _logger.trace("attribute {} : {}" , + objAttrs.getID(), + ActiveDirectoryUtils.getAttrStringValue(objAttrs) + ); attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs); } diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java index 54fbb0d0b..355552a98 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java @@ -71,7 +71,10 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem NamingEnumeration attrs = sr.getAttributes().getAll(); while (null != attrs && attrs.hasMoreElements()) { Attribute objAttrs = attrs.nextElement(); - _logger.trace("attribute "+objAttrs.getID() + " : " + objAttrs.get()); + _logger.trace("attribute {} : {}" , + objAttrs.getID(), + LdapUtils.getAttrStringValue(objAttrs) + ); attributeMap.put(objAttrs.getID().toLowerCase(), objAttrs); } diff --git a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java index ccb3b48db..825472080 100644 --- a/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java +++ b/maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java @@ -65,7 +65,10 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS NamingEnumeration attrs = sr.getAttributes().getAll(); while (null != attrs && attrs.hasMoreElements()) { Attribute objAttrs = attrs.nextElement(); - _logger.trace("attribute "+objAttrs.getID() + " , " + objAttrs.get()); + _logger.trace("attribute {} : {}" , + objAttrs.getID(), + LdapUtils.getAttrStringValue(objAttrs) + ); attributeMap.put(objAttrs.getID(), objAttrs); }