Juan Hernandez has uploaded a new change for review. Change subject: core: Remove unused LDAP query types ......................................................................
core: Remove unused LDAP query types The "getGroupByName" and "getGroupsByGroupNames" LDAP queries are not used, so they can be removed. Change-Id: I4efcb067e23e9eefcc3a54f8790d8488dea71cf3 Signed-off-by: Juan Hernandez <[email protected]> --- 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/LdapQueryType.java 2 files changed, 0 insertions(+), 66 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/14330/1 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..4694196 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 @@ -99,14 +99,6 @@ ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), new ADLdapGuidEncoder())); - adHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( - "(&(ObjectCategory=Group)(name=%1$s))", - "", - new ADGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); adHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(&(sAMAccountType=805306368)(userPrincipalName=%1$s))", "", @@ -130,14 +122,6 @@ SearchControls.OBJECT_SCOPE, ADRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ADLdapGuidEncoder())); - adHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( - "(&(ObjectCategory=Group)(name=%1$s))", - "", - new ADGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - ADGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new MultipleLdapQueryExecutionFormatter("(|", ")"), new ADLdapGuidEncoder())); adHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(objectGUID=%1$s)", @@ -196,14 +180,6 @@ IPAUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), new IPALdapGuidEncoder())); - ipaHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( - "(&(objectClass=ipaUserGroup)(cn=%1$s))", - "", - new IPAGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); ipaHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(&(objectClass=krbPrincipalAux)(krbPrincipalName=%1$s))", "", @@ -227,14 +203,6 @@ SearchControls.OBJECT_SCOPE, IPARootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new IPALdapGuidEncoder())); - ipaHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( - "(&(objectClass=ipaUserGroup)(cn=%1$s))", - "", - new IPAGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - IPAGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new MultipleLdapQueryExecutionFormatter("(|", ")"), new IPALdapGuidEncoder())); ipaHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(ipaUniqueID=%1$s)", @@ -294,14 +262,6 @@ RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), new RHDSLdapGuidEncoder())); - dsHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( - "(&(objectClass=groupofuniquenames)(cn=%1$s))", - "", - new RHDSGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); dsHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( "(&(objectClass=person)(uid=%1$s))", "", @@ -327,14 +287,6 @@ SearchControls.OBJECT_SCOPE, RHDSRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new RHDSSimpleLdapQueryExecutionFormatter(), - new RHDSLdapGuidEncoder())); - dsHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( - "(&(objectClass=groupofuniquenames)(cn=%1$s))", - "", - new RHDSGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSMultipleLdapQueryExecutionFormatter("(|", ")"), new RHDSLdapGuidEncoder())); dsHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(nsuniqueid=%1$s)", @@ -394,14 +346,6 @@ ITDSUserContextMapper.USERS_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), new ITDSLdapGuidEncoder())); - itdsHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( - "(&(objectClass=groupofuniquenames)(cn=%1$s))", - "", - new ITDSGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); itdsHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( "(principalName=%1$s))", "", @@ -425,14 +369,6 @@ SearchControls.OBJECT_SCOPE, ITDSRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, new SimpleLdapQueryExecutionFormatter(), - new ITDSLdapGuidEncoder())); - itdsHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( - "(&(objectClass=groupofuniquenames)(cn=%1$s))", - "", - new ITDSGroupContextMapper(), - SearchControls.SUBTREE_SCOPE, - ITDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new MultipleLdapQueryExecutionFormatter("(|", ")"), new ITDSLdapGuidEncoder())); itdsHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( "(uid=%1$s)", diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryType.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryType.java index b897118..924eed9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryType.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryType.java @@ -5,10 +5,8 @@ getUserByGuid, getGroupByGuid, getGroupByDN, - getGroupByName, getUserByPrincipalName, getUserByName, - getGroupsByGroupNames, getUsersByUserGuids, searchUsers, searchGroups -- To view, visit http://gerrit.ovirt.org/14330 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4efcb067e23e9eefcc3a54f8790d8488dea71cf3 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
