[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jul  5 09:50:38 2014
New Revision: 6228

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6228&view=rev
Log:
Add a helper function to SpringSupport to convert a list of elements to a ManagedList<String>

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java?rev=6228&r1=6227&r2=6228&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParser.java Sat Jul  5 09:50:38 2014
@@ -21,6 +21,7 @@
 
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.MetadataNamespaceHandler;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
@@ -28,7 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -61,12 +61,7 @@
 
             log.warn("Use of <ExtensionSchema> elements is deprecated."
                     + "  Inject a customer SAMLSchemaBuilder identified as 'shibboleth.SchemaBuilder'");
-
-            List<String> schemaNames = new ManagedList<>(schemaNameElements.size());
-            for (Element schemaElement : schemaNameElements) {
-                schemaNames.add(schemaElement.getTextContent());
-            }
-            builder.addConstructorArgValue(schemaNames);
+            builder.addConstructorArgValue(SpringSupport.getElementTextContentAsManagedList(schemaNameElements));
         }
     }
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java?rev=6228&r1=6227&r2=6228&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAML2ProfileConfigurationParser.java Sat Jul  5 09:50:38 2014
@@ -19,11 +19,10 @@
 
 import java.util.List;
 
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
@@ -44,14 +43,7 @@
         List<Element> audienceElems =
                 ElementSupport.getChildElementsByTagNameNS(element, RelyingPartySAMLNamespaceHandler.NAMESPACE,
                         "ProxyAudience");
-        List<String> result = new ManagedList<>(audienceElems.size());
-        for (Element audienceElement : audienceElems) {
-            final String audience = StringSupport.trimOrNull(audienceElement.getTextContent());
-            if (null != audience) {
-                result.add(audience);
-            }
-        }
-        return result;
+        return SpringSupport.getElementTextContentAsManagedList(audienceElems);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileConfigurationParser.java

[... 99 lines stripped ...]