[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: dfisher
Date: Mon Jul 22 22:56:57 2013
New Revision: 4609

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4609&view=rev
Log:
Add implementation for TemplatedExecutableSearchFilterBuilder.
Create abstract class to encapsulate common functionality in Templated and Parameterized implementations.

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/AbstractExecutableSearchFilterBuilder.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnectorTest.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java?rev=4609&r1=4608&r2=4609&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ParameterizedExecutableSearchFilterBuilder.java Mon Jul 22 22:56:57 2013
@@ -19,26 +19,20 @@
 
 import javax.annotation.Nonnull;
 
-import org.ldaptive.ConnectionFactory;
-import org.ldaptive.LdapException;
-import org.ldaptive.Response;
-import org.ldaptive.SearchExecutor;
 import org.ldaptive.SearchFilter;
-import org.ldaptive.SearchResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.attribute.resolver.AttributeRecipientContext;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.impl.dc.ExecutableSearchBuilder;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
  * An {@link ExecutableSearchFilterBuilder} that generates the search filter to be executed by evaluating a
  * parameterized filter string against the currently resolved attributes within a {@link AttributeResolutionContext}.
  */
-public class ParameterizedExecutableSearchFilterBuilder implements ExecutableSearchBuilder<ExecutableSearchFilter> {
+public class ParameterizedExecutableSearchFilterBuilder extends AbstractExecutableSearchFilterBuilder {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(ParameterizedExecutableSearchFilterBuilder.class);
@@ -59,28 +53,9 @@
     public ExecutableSearchFilter build(@Nonnull final AttributeResolutionContext resolutionContext)
             throws ResolutionException {
         final AttributeRecipientContext subContext = resolutionContext.getSubcontext(AttributeRecipientContext.class);
+        log.trace("Creating search filter using context {}", subContext);
         final SearchFilter sf = new SearchFilter(searchFilter);
         sf.setParameter("principalName", subContext.getPrincipal());
-
-        return new ExecutableSearchFilter() {
-
-            /** {@inheritDoc} */
-            @Nonnull public String getResultCacheKey() {
-                return String.valueOf(sf.hashCode());
-            }
-
-            /** {@inheritDoc} */
-            @Nonnull public SearchResult execute(@Nonnull final SearchExecutor executor,
-                    @Nonnull final ConnectionFactory factory) throws LdapException {
-                final Response<SearchResult> response = executor.search(factory, sf);
-                log.trace("Search returned response {}", response);
-                return response.getResult();
-            }
-
-            /** {@inheritDoc} */
-            public String toString() {
-                return sf.toString();
-            }
-        };
+        return super.build(sf);
     }
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java?rev=4609&r1=4608&r2=4609&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedExecutableSearchFilterBuilder.java (original)

[... 204 lines stripped ...]