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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 11 21:19:53 2014
New Revision: 6882

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6882&view=rev
Log:
IDP-418 - add parallel support for AttributeDesignator -> IdPAttribute mapping

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AttributeDesignatorMapperProcessor.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeDesignatorMapper.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeDesignatorsMapper.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorMapper.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AttributeMapperProcessor.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AbstractSAMLAttributeMapper.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/mapping/AttributeMapper.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributeMapper.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributeMapper.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java?rev=6882&r1=6881&r2=6882&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java Tue Nov 11 21:19:53 2014
@@ -24,6 +24,7 @@
 import net.shibboleth.idp.attribute.AttributeEncodingException;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.saml.attribute.mapping.AbstractSAMLAttributeDesignatorMapper;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -46,8 +47,9 @@
  * 
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
-public abstract class AbstractSAML1AttributeEncoder<EncodedType extends IdPAttributeValue> extends
-        AbstractSAMLAttributeEncoder<Attribute, EncodedType> implements SAML1AttributeEncoder<EncodedType> {
+public abstract class AbstractSAML1AttributeEncoder<EncodedType extends IdPAttributeValue>
+        extends AbstractSAMLAttributeEncoder<Attribute, EncodedType>
+        implements SAML1AttributeEncoder<EncodedType>, AttributeDesignatorMapperProcessor<IdPAttribute> {
 
     /** Builder used to construct {@link Attribute} objects. */
     @Nonnull private final SAMLObjectBuilder<Attribute> attributeBuilder;
@@ -111,6 +113,15 @@
 
         return samlAttribute;
     }
+    
+    /** {@inheritDoc} */
+    @Override
+    @Nonnull public void populateAttributeMapper(
+            @Nonnull final AbstractSAMLAttributeDesignatorMapper<IdPAttribute> mapper) {
+        mapper.setAttributeNamespace(getNamespace());
+        mapper.setId(getMapperId());
+        mapper.setSAMLName(getName());
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -134,4 +145,14 @@
         return Objects.hashCode(super.hashCode(), getNamespace());
     }
 
+    /**
+     * Generate an Id suitable for the mapper.
+     * 
+     * @return a suitable Id for the mapper
+     */
+    @Nonnull @NotEmpty private String getMapperId() {
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        return "MapperForAttribute" + getName();
+    }
+    
 }

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java?rev=6882&r1=6881&r2=6882&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java Tue Nov 11 21:19:53 2014
@@ -141,7 +141,7 @@
         if (null != getFriendlyName()) {

[... 304 lines stripped ...]