Juan Hernandez has uploaded a new change for review. Change subject: core: Remove RHDSSimpleLdapQueryExecutionFormatter ......................................................................
core: Remove RHDSSimpleLdapQueryExecutionFormatter Now that LDAP queries are generated from templates this class is no longer needed. Change-Id: I726497d265d305296295effefc5728cd113a973a Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSSimpleLdapQueryExecutionFormatter.java 2 files changed, 9 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/14838/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 f708e8e..ce1ca3d 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 @@ -255,63 +255,63 @@ new RHDSGroupContextMapper(), SearchControls.OBJECT_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getGroupByGuid, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getGroupByGuid, new RHDSGroupContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getUserByGuid, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getUserByGuid, new RHDSUserContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getGroupByName, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getGroupByName, new RHDSGroupContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getUserByName, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getUserByName, new RHDSUserContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getUserByPrincipalName, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getUserByPrincipalName, new RHDSUserContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.rootDSE, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.rootDSE, new RHDSRootDSEContextMapper(), SearchControls.OBJECT_SCOPE, RHDSRootDSEContextMapper.ROOTDSE_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getGroupsByGroupNames, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getGroupsByGroupNames, new RHDSGroupContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSGroupContextMapper.GROUP_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); dsHashMap.put(LdapQueryType.getUsersByUserGuids, new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.getUsersByUserGuids, new RHDSUserContextMapper(), SearchControls.SUBTREE_SCOPE, RHDSUserContextMapper.USERS_ATTRIBUTE_FILTER, - new RHDSSimpleLdapQueryExecutionFormatter())); + new SimpleLdapQueryExecutionFormatter())); LdapQueryMetadataImpl rhdsSearchUsersMetadata = new LdapQueryMetadataImpl( LdapProviderType.rhds, LdapQueryType.searchUsers, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSSimpleLdapQueryExecutionFormatter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSSimpleLdapQueryExecutionFormatter.java deleted file mode 100644 index 45c3fec..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/RHDSSimpleLdapQueryExecutionFormatter.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.core.bll.adbroker; - -import org.apache.log4j.Logger; -import org.ovirt.engine.core.utils.templates.Template; -import org.ovirt.engine.core.utils.templates.TemplateEngine; -import org.ovirt.engine.core.utils.templates.TemplateException; - -public class RHDSSimpleLdapQueryExecutionFormatter extends SimpleLdapQueryExecutionFormatter { - // The log: - private static final Logger log = Logger.getLogger(RHDSSimpleLdapQueryExecutionFormatter.class); - - // In DS the guid is a readable String as well, but it is different then our guid, so we need to show the encoded - // parameters - @Override - protected String getDisplayFilter(LdapQueryMetadata queryMetadata) { - try { - Template filterTemplate = TemplateEngine.getInstance().compile( - queryMetadata.getFilter() - ); - return filterTemplate.eval( - queryMetadata.getQueryData().getParameters()); - } - catch (TemplateException exception) { - log.error("Error evaluating template.", exception); - return null; - } - } - -} -- To view, visit http://gerrit.ovirt.org/14838 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I726497d265d305296295effefc5728cd113a973a 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
