Juan Hernandez has uploaded a new change for review. Change subject: core: Make GUID encoders singletons ......................................................................
core: Make GUID encoders singletons The GUID encoders used in LDAP operations are stateless and can be reused, so we don't need to create a new instance each time we need them. This patch makes them singletons. Change-Id: If8683e90ac3a2a6c0ed129686c9e06ccb47ad82d Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPALdapGuidEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSLdapGuidEncoder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapGuidEncoder.java 5 files changed, 80 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/14263/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java index e0df20a..24c82b0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java @@ -4,6 +4,15 @@ import org.ovirt.engine.core.utils.GuidUtils; public class ADLdapGuidEncoder implements LdapGuidEncoder { + private static final ADLdapGuidEncoder instance = new ADLdapGuidEncoder(); + + public static ADLdapGuidEncoder getInstance() { + return instance; + } + + private ADLdapGuidEncoder() { + // Empty on purpouse. + } @Override public String encodeGuid(Guid guid) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPALdapGuidEncoder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPALdapGuidEncoder.java index 4e4af04..0b03077 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPALdapGuidEncoder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/IPALdapGuidEncoder.java @@ -3,6 +3,15 @@ import org.ovirt.engine.core.compat.Guid; public class IPALdapGuidEncoder implements LdapGuidEncoder { + private static IPALdapGuidEncoder instance = new IPALdapGuidEncoder(); + + public static IPALdapGuidEncoder getInstance() { + return instance; + } + + private IPALdapGuidEncoder() { + // Empty on purpouse. + } @Override public String encodeGuid(Guid guid) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSLdapGuidEncoder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSLdapGuidEncoder.java index e0a4bce..0044e7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSLdapGuidEncoder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ITDSLdapGuidEncoder.java @@ -3,6 +3,15 @@ import org.ovirt.engine.core.compat.Guid; public class ITDSLdapGuidEncoder implements LdapGuidEncoder { + private static final ITDSLdapGuidEncoder instance = new ITDSLdapGuidEncoder(); + + public static ITDSLdapGuidEncoder getInstance() { + return instance; + } + + private ITDSLdapGuidEncoder() { + // Empty on purpose. + } @Override public String encodeGuid(Guid guid) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java index e24fe1b..1c7721e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java @@ -82,7 +82,7 @@ SearchControls.OBJECT_SCOPE, ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getUserByGuid, new LdapQueryMetadataImpl( "(objectGUID=%1$s)", "", @@ -90,7 +90,7 @@ SearchControls.SUBTREE_SCOPE, ADUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getGroupByGuid, new LdapQueryMetadataImpl( "(objectGUID=%1$s)", "", @@ -98,7 +98,7 @@ SearchControls.SUBTREE_SCOPE, ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( "(&(ObjectCategory=Group)(name=%1$s))", "", @@ -106,7 +106,7 @@ SearchControls.SUBTREE_SCOPE, ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(&(sAMAccountType=805306368)(userPrincipalName=%1$s))", "", @@ -114,7 +114,7 @@ SearchControls.SUBTREE_SCOPE, ADUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( "(&(sAMAccountType=805306368)(sAMAccountName=%1$s))", "", @@ -122,7 +122,7 @@ SearchControls.SUBTREE_SCOPE, ADUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( "(objectClass=*)", "", @@ -130,7 +130,7 @@ SearchControls.OBJECT_SCOPE, ADRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( "(&(ObjectCategory=Group)(name=%1$s))", "", @@ -138,7 +138,7 @@ SearchControls.SUBTREE_SCOPE, ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); adHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(objectGUID=%1$s)", "", @@ -146,7 +146,7 @@ SearchControls.SUBTREE_SCOPE, ADUserContextMapper.USERS_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new ADLdapGuidEncoder())); + ADLdapGuidEncoder.getInstance())); LdapQueryMetadataImpl searchUsersMetadata = new LdapQueryMetadataImpl("this string is overrided by user input meta-query", @@ -155,7 +155,7 @@ SearchControls.SUBTREE_SCOPE, ADUserContextMapper.USERS_ATTRIBUTE_FILTER, new SearchQueryFotmatter(activeDirectorySearchSyntaxMap), - new ADLdapGuidEncoder()); + ADLdapGuidEncoder.getInstance()); adHashMap.put(LdapQueryType.searchUsers, searchUsersMetadata); LdapQueryMetadataImpl searchGroupsMetadata = @@ -165,7 +165,7 @@ SearchControls.SUBTREE_SCOPE, ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SearchQueryFotmatter(activeDirectorySearchSyntaxMap), - new ADLdapGuidEncoder()); + ADLdapGuidEncoder.getInstance()); adHashMap.put(LdapQueryType.searchGroups, searchGroupsMetadata); return adHashMap; } @@ -179,7 +179,7 @@ SearchControls.OBJECT_SCOPE, IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getGroupByGuid, new LdapQueryMetadataImpl( "(ipaUniqueID=%1$s)", "", @@ -187,7 +187,7 @@ SearchControls.SUBTREE_SCOPE, IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getUserByGuid, new LdapQueryMetadataImpl( "(ipaUniqueID=%1$s)", "", @@ -195,7 +195,7 @@ SearchControls.SUBTREE_SCOPE, IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( "(&(objectClass=ipaUserGroup)(cn=%1$s))", "", @@ -203,7 +203,7 @@ SearchControls.SUBTREE_SCOPE, IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(&(objectClass=krbPrincipalAux)(krbPrincipalName=%1$s))", "", @@ -211,7 +211,7 @@ SearchControls.SUBTREE_SCOPE, IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( "(&(objectClass=posixAccount)(objectClass=krbPrincipalAux)(uid=%1$s))", "", @@ -219,7 +219,7 @@ SearchControls.SUBTREE_SCOPE, IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( "(objectClass=*)", "", @@ -227,7 +227,7 @@ SearchControls.OBJECT_SCOPE, IPARootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( "(&(objectClass=ipaUserGroup)(cn=%1$s))", "", @@ -235,7 +235,7 @@ SearchControls.SUBTREE_SCOPE, IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); ipaHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(ipaUniqueID=%1$s)", "", @@ -243,7 +243,7 @@ SearchControls.SUBTREE_SCOPE, IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new IPALdapGuidEncoder())); + IPALdapGuidEncoder.getInstance())); LdapQueryMetadataImpl ipaSearchUsersMetadata = new LdapQueryMetadataImpl( "this string is replaced by user input meta-query", "", @@ -251,7 +251,7 @@ SearchControls.SUBTREE_SCOPE, IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new SearchQueryFotmatter(ipaSearchSyntaxMap), - new IPALdapGuidEncoder()); + IPALdapGuidEncoder.getInstance()); ipaHashMap.put(LdapQueryType.searchUsers, ipaSearchUsersMetadata); LdapQueryMetadataImpl ipaSearchGroupsMetadata = new LdapQueryMetadataImpl( @@ -261,7 +261,7 @@ SearchControls.SUBTREE_SCOPE, IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SearchQueryFotmatter(ipaSearchSyntaxMap), - new IPALdapGuidEncoder()); + IPALdapGuidEncoder.getInstance()); ipaHashMap.put(LdapQueryType.searchGroups, ipaSearchGroupsMetadata); return ipaHashMap; @@ -277,7 +277,7 @@ SearchControls.OBJECT_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getGroupByGuid, new LdapQueryMetadataImpl( "(nsuniqueid=%1$s)", "", @@ -285,7 +285,7 @@ SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getUserByGuid, new LdapQueryMetadataImpl( "(nsuniqueid=%1$s)", "", @@ -293,7 +293,7 @@ SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( "(&(objectClass=groupofuniquenames)(cn=%1$s))", "", @@ -301,7 +301,7 @@ SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( "(&(objectClass=person)(uid=%1$s))", "", @@ -309,7 +309,7 @@ SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); // In RHDS there is no UPN, so we do the same query as getUserByName, using a formatter that will adjust the filter // to contain the user name instead of the UPN dsHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( @@ -319,7 +319,7 @@ SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new RHDSUPNLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( "(objectClass=*)", "", @@ -327,7 +327,7 @@ SearchControls.OBJECT_SCOPE, RHDSRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( "(&(objectClass=groupofuniquenames)(cn=%1$s))", "", @@ -335,7 +335,7 @@ SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new RHDSMultipleLdapQueryExecutionFormatter("(|", ")"), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); dsHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(nsuniqueid=%1$s)", "", @@ -343,7 +343,7 @@ SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new RHDSMultipleLdapQueryExecutionFormatter("(|", ")"), - new RHDSLdapGuidEncoder())); + RHDSLdapGuidEncoder.getInstance())); LdapQueryMetadataImpl rhdsSearchUsersMetadata = new LdapQueryMetadataImpl( "this string is replaced by user input meta-query", "", @@ -351,7 +351,7 @@ SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SearchQueryFotmatter(dsSearchSyntaxMap), - new RHDSLdapGuidEncoder()); + RHDSLdapGuidEncoder.getInstance()); dsHashMap.put(LdapQueryType.searchUsers, rhdsSearchUsersMetadata); LdapQueryMetadataImpl rhdsSearchGroupsMetadata = new LdapQueryMetadataImpl( @@ -361,7 +361,7 @@ SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SearchQueryFotmatter(dsSearchSyntaxMap), - new RHDSLdapGuidEncoder()); + RHDSLdapGuidEncoder.getInstance()); dsHashMap.put(LdapQueryType.searchGroups, rhdsSearchGroupsMetadata); return dsHashMap; @@ -377,7 +377,7 @@ SearchControls.OBJECT_SCOPE, ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getGroupByGuid, new LdapQueryMetadataImpl( "(uniqueIdentifier=%1$s)", "", @@ -385,7 +385,7 @@ SearchControls.SUBTREE_SCOPE, ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getUserByGuid, new LdapQueryMetadataImpl( "(uniqueIdentifier=%1$s)", "", @@ -393,7 +393,7 @@ SearchControls.SUBTREE_SCOPE, ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( "(&(objectClass=groupofuniquenames)(cn=%1$s))", "", @@ -401,7 +401,7 @@ SearchControls.SUBTREE_SCOPE, ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(principalName=%1$s))", "", @@ -409,7 +409,7 @@ SearchControls.SUBTREE_SCOPE, ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( "(uid=%1$s))", "", @@ -417,7 +417,7 @@ SearchControls.SUBTREE_SCOPE, ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( "(objectClass=*)", "", @@ -425,7 +425,7 @@ SearchControls.OBJECT_SCOPE, ITDSRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( "(&(objectClass=groupofuniquenames)(cn=%1$s))", "", @@ -433,7 +433,7 @@ SearchControls.SUBTREE_SCOPE, ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); itdsHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(uid=%1$s)", "", @@ -441,7 +441,7 @@ SearchControls.SUBTREE_SCOPE, ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new MultipleLdapQueryExecutionFormatter("(|", ")"), - new ITDSLdapGuidEncoder())); + ITDSLdapGuidEncoder.getInstance())); LdapQueryMetadataImpl itdsSearchUsersMetadata = new LdapQueryMetadataImpl( "this string is replaced by user input meta-query", "", @@ -449,7 +449,7 @@ SearchControls.SUBTREE_SCOPE, ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SearchQueryFotmatter(itdsSearchSyntaxMap), - new ITDSLdapGuidEncoder()); + ITDSLdapGuidEncoder.getInstance()); itdsHashMap.put(LdapQueryType.searchUsers, itdsSearchUsersMetadata); LdapQueryMetadataImpl itdsSearchGroupsMetadata = new LdapQueryMetadataImpl( @@ -459,7 +459,7 @@ SearchControls.SUBTREE_SCOPE, ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SearchQueryFotmatter(itdsSearchSyntaxMap), - new ITDSLdapGuidEncoder()); + ITDSLdapGuidEncoder.getInstance()); itdsHashMap.put(LdapQueryType.searchGroups, itdsSearchGroupsMetadata); return itdsHashMap; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapGuidEncoder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapGuidEncoder.java index 1b1b157..30d7cd9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapGuidEncoder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSLdapGuidEncoder.java @@ -3,6 +3,15 @@ import org.ovirt.engine.core.compat.Guid; public class RHDSLdapGuidEncoder implements LdapGuidEncoder { + private static final RHDSLdapGuidEncoder instance = new RHDSLdapGuidEncoder(); + + public static RHDSLdapGuidEncoder getInstance() { + return instance; + } + + private RHDSLdapGuidEncoder() { + // Empty on purpose. + } private String getNsUniqueIdFromGuidString(String guidString) { // 12345678-1234-5678-1234-567812345678 --> -- To view, visit http://gerrit.ovirt.org/14263 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8683e90ac3a2a6c0ed129686c9e06ccb47ad82d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
