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

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Mar 19 00:44:02 2015
New Revision: 7432

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7432&view=rev
Log:
IDP-654
Update LDAPDataConnectorParser to support property replacement for the ReturnAttribu
tes element.
Update unit tests accordingly.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-spring-props-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-attribute-resolver-v2.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v2.properties
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/ldap-v3.properties

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java?rev=7432&r1=7431&r2=7432&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java Thu Mar 19 00:44:02 2015
@@ -36,6 +36,7 @@
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.utilities.java.support.xml.XMLConstants;
 
 import org.ldaptive.BindConnectionInitializer;
 import org.ldaptive.ConnectionConfig;
@@ -383,15 +384,14 @@
             handlers.addConstructorArgValue(lowercaseAttributeNames);
             searchExecutor.addPropertyValue("searchEntryHandlers", handlers.getBeanDefinition());
 
-            List<String> returnAttrs = null;
             final Element returnAttrsElement =
                     ElementSupport.getFirstChildElement(configElement, new QName(
                             DataConnectorNamespaceHandler.NAMESPACE, "ReturnAttributes"));
             if (returnAttrsElement != null) {
-                returnAttrs = ElementSupport.getElementContentAsList(returnAttrsElement);
-                if (returnAttrs != null && !returnAttrs.isEmpty()) {
-                    searchExecutor.addPropertyValue("returnAttributes", returnAttrs);
-                }
+                final BeanDefinitionBuilder returnAttrs =
+                        BeanDefinitionBuilder.rootBeanDefinition(V2Parser.class, "buildStringList");
+                returnAttrs.addConstructorArgValue(ElementSupport.getElementContentAsString(returnAttrsElement));
+                searchExecutor.addPropertyValue("returnAttributes", returnAttrs.getBeanDefinition());
             }
 
             final Element filterElement =
@@ -618,6 +618,17 @@
         }
 
         /**
+         * Converts the supplied value to a list of strings delimited by {@link XMLConstants#LIST_DELIMITERS}.
+         *
+         * @param value to convert to a list
+         *
+         * @return list of strings
+         */
+        @Nonnull public static List<String> buildStringList(final String value) {
+            return StringSupport.stringToList(value, XMLConstants.LIST_DELIMITERS);
+        }
+
+        /**
          * Returns a soft limit connection pool if blockWhenEmpty is false, otherwise return a blocking connection pool.
          * 
          * @param blockWhenEmpty boolean string indicating the type of blocking connection pool

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java?rev=7432&r1=7431&r2=7432&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java Thu Mar 19 00:44:02 2015

[... 104 lines stripped ...]