[java-identity-provider COMMIT] in /trunk: idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Sep 21 11:47:38 2013
New Revision: 4789

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4789&view=rev
Log:
IDP-264 Summon up a ReqeustedAttributesMapper from a ResolutionEngine

Added:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest-attributes.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/mapperTest.xml   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AttributeMapperFactory.java   (with props)
Modified:
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributesMapper.java
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AttributeMapper.java
    trunk/idp-attribute-mapper-impl/pom.xml
    trunk/idp-attribute-mapper-impl/src/main/java/net/shibboleth/idp/attribute/mapper/impl/RequestedAttributeMapper.java
    trunk/idp-attribute-mapper-impl/src/main/java/net/shibboleth/idp/attribute/mapper/impl/RequestedAttributesMapper.java
    trunk/idp-attribute-mapper-impl/src/test/java/net/shibboleth/idp/attribute/mapper/impl/RequestedAttributesMapperTest.java
    trunk/idp-attribute-mapper-impl/src/test/resources/data/net/shibboleth/idp/attribute/mapper/impl/attributesMapper.xml
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
    trunk/idp-saml-api/pom.xml
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2NameIDEncoderTest.java
    trunk/idp-saml-impl/pom.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ByteAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ScopedStringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoder.java

Modified: trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributesMapper.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributesMapper.java?rev=4789&r1=4788&r2=4789&view=diff
==============================================================================
--- trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributesMapper.java (original)
+++ trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributesMapper.java Sat Sep 21 11:47:38 2013
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.attribute.mapper;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +30,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.slf4j.Logger;
@@ -55,7 +57,7 @@
     private final Logger log = LoggerFactory.getLogger(AbstractSAMLAttributesMapper.class);
 
     /** The mappers we can apply. */
-    private List<AbstractSAMLAttributeMapper<InType, OutType>> mappers = Collections.EMPTY_LIST;
+    private Collection<AttributeMapper<InType, OutType>> mappers = Collections.EMPTY_LIST;
 
     /** The String used to prefix log message. */
     private String logPrefix;
@@ -65,7 +67,7 @@
      * 
      * @return Returns the mappers.
      */
-    @Nonnull public List<AbstractSAMLAttributeMapper<InType, OutType>> getMappers() {
+    @Nonnull public Collection<AttributeMapper<InType, OutType>> getMappers() {
         return mappers;
     }
 
@@ -74,7 +76,7 @@
      * 
      * @param theMappers The mappers to set.
      */
-    public void setMappers(@Nonnull List<AbstractSAMLAttributeMapper<InType, OutType>> theMappers) {
+    public void setMappers(@Nonnull Collection<AttributeMapper<InType, OutType>> theMappers) {
         mappers = Constraint.isNotNull(theMappers, "mappers list must be non null");
     }
 
@@ -95,7 +97,7 @@
         Multimap<String, OutType> result = ArrayListMultimap.create();
 
         for (InType prototype : prototypes) {

[... 630 lines stripped ...]