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

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Mar  5 23:25:20 2013
New Revision: 4301

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4301&view=rev
Log:
Update LdapDataConnector to use a SearchExecutor internally.
  - provides a convenient container for search request and operation properties.
  - assumes the filter is the single varible for attribute resolution
  - add validate filter property to improve connector validation
  - make the StringAttributeValueMappingStrategy the default
Add ldap data connector unit test, leverages UnboundID in-memory server.
Refactor SearchRequestBuilder to SearchFilterBuilder.
Fixes IDP-270.

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/SearchFilterBuilder.java   (contents, props changed)
      - copied, changed from r4299, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/SearchRequestBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedSearchFilterBuilder.java   (contents, props changed)
      - copied, changed from r4299, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedSearchRequestBuilder.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif
Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/SearchRequestBuilder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/StringAttributeValueMappingStrategy.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedSearchRequestBuilder.java

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4301&r1=4300&r2=4301&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Tue Mar  5 23:25:20 2013
@@ -83,7 +83,13 @@
             <scope>test</scope>
         </dependency>
         
-
+        <dependency>
+            <groupId>com.unboundid</groupId>
+            <artifactId>unboundid-ldapsdk</artifactId>
+            <version>2.3.1</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     
 </project>

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnector.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/LdapDataConnector.java?rev=4301&r1=4300&r2=4301&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnector.java Tue Mar  5 23:25:20 2013
@@ -23,8 +23,8 @@
 
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.idp.attribute.resolver.AttributeResolutionContext;
+import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
-import net.shibboleth.idp.attribute.resolver.BaseDataConnector;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.component.ComponentValidationException;
@@ -33,8 +33,9 @@
 import org.ldaptive.Connection;
 import org.ldaptive.ConnectionFactory;
 import org.ldaptive.LdapException;
-import org.ldaptive.SearchOperation;
-import org.ldaptive.SearchRequest;
+import org.ldaptive.Response;
+import org.ldaptive.SearchExecutor;
+import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,12 +43,6 @@
 import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 
-//TODO(lajoie): log messages need to log plugin ID
-//TODO(lajoie): need to review to ensure code meets coding standards

[... 421 lines stripped ...]