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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jun 29 11:41:12 2014
New Revision: 6186

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6186&view=rev
Log:
IDP-379 Use getAttributeValueAsManagedList where appropriate

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/RegistrationAuthorityRuleParser.java Sun Jun 29 11:41:12 2014
@@ -17,18 +17,17 @@
 
 package net.shibboleth.idp.attribute.filter.spring.saml;
 
-import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.RegistrationAuthorityPolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 
 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.ParserContext;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
@@ -66,7 +65,7 @@
 
         final Attr attr = element.getAttributeNodeNS(null, REGISTRARS_ATTR_NAME);
         if (attr != null) {
-            final List<String> issuers = AttributeSupport.getAttributeValueAsList(attr);
+            final ManagedList<String> issuers = SpringSupport.getAttributeValueAsManagedList(attr);
             log.debug("Registration Authority Filter: Issuers = {}", issuers);
             builder.addPropertyValue("issuers", issuers);
         }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java Sun Jun 29 11:41:12 2014
@@ -22,10 +22,10 @@
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal;
 import net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@
     public SAML2BrowserSSOProfileParser() {
         setArtifactAware(true);
     }
-    
+
     /** {@inheritDoc} */
     @Override protected Class<? extends BrowserSSOProfileConfiguration> getBeanClass(Element element) {
         return BrowserSSOProfileConfiguration.class;
@@ -104,11 +104,8 @@
         }
 
         if (parent.hasAttributeNS(null, "nameIDFormatPrecedence")) {
-            final List<String> nameIDs =
-                    AttributeSupport.getAttributeValueAsList(parent.getAttributeNodeNS(null, "nameIDFormatPrecedence"));
-            final List<String> managedNameIds = new ManagedList<>(nameIDs.size());
-            managedNameIds.addAll(nameIDs);
-            builder.addPropertyValue("nameIDFormatPrecedence", managedNameIds);
+            builder.addPropertyValue("nameIDFormatPrecedence", SpringSupport.getAttributeValueAsManagedList(parent
+                    .getAttributeNodeNS(null, "nameIDFormatPrecedence")));
         }
     }