[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl:...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov 12 18:18:12 2014
New Revision: 6889

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

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapper.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapper.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapper.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapper.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapper.java?rev=6889&r1=6888&r2=6889&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapper.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/RequestedAttributesMapper.java Wed Nov 12 18:18:12 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.saml.attribute.mapping.impl;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.idp.attribute.IdPRequestedAttribute;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.saml.attribute.mapping.AbstractSAMLAttributeMapper;
@@ -29,26 +31,18 @@
 /**
  * This class conceptually represents the content of a attribute-map file, hence it describes (and then does) the
  * mappings from a {@link java.util.List} of SAML2 {@link RequestedAttribute} into a
- * {@link com.google.common.collect.Multimap} going from (SAML2) attributeId to {@link IdPRequestedAttribute}s (or null
- * if the mapping failed for type reasons).
+ * {@link com.google.common.collect.Multimap} going from (SAML2) attributeId to {@link IdPRequestedAttribute}s.
  * 
  */
 public class RequestedAttributesMapper extends AbstractSAMLAttributesMapper<RequestedAttribute, IdPRequestedAttribute> {
 
     /**
-     * Default Constructor.
-     * 
-     */
-    public RequestedAttributesMapper() {
-    }
-
-    /**
      * Generate a specific mapper to go from {@link RequestedAttribute} to {@link IdPRequestedAttribute} by inverting
      * the function of the mappers in the profiled {@link AttributeResolver}.
      * 
-     * @param resolver The resolver to invert.
+     * @param resolver resolver to invert
      */
-    public RequestedAttributesMapper(AttributeResolver resolver) {
+    public RequestedAttributesMapper(@Nonnull final AttributeResolver resolver) {
         super(resolver, "RequestedMapper<" + resolver.getId() + ">",
                 new Supplier<AbstractSAMLAttributeMapper<RequestedAttribute, IdPRequestedAttribute>>() {
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapper.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapper.java?rev=6889&r1=6888&r2=6889&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapper.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapper.java Wed Nov 12 18:18:12 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.saml.attribute.mapping.impl;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.saml.attribute.mapping.AbstractSAMLAttributeMapper;
@@ -29,25 +31,18 @@
 /**
  * This class conceptually represents the content of a attribute-map file, hence it describes (and then does) the
  * mappings from a {@link java.util.List} of SAML2 {@link Attribute} into a {@link com.google.common.collect.Multimap}
- * going from (SAML2) attributeId to {@link IdPAttribute}s (or null if the mapping failed for type reasons).
+ * going from (SAML2) attributeId to {@link IdPAttribute}s.
  * 
  */
 public class SAML2AttributesMapper extends AbstractSAMLAttributesMapper<Attribute, IdPAttribute> {
 
     /**
-     * Default Constructor.
-     * 
-     */
-    public SAML2AttributesMapper() {
-    }
-
-    /**
      * Generate a specific mapper to go from {@link Attribute} to {@link IdPAttribute} by inverting
      * the function of the mappers in the profiled {@link AttributeResolver}.
      * 
-     * @param resolver The resolver to invert.
+     * @param resolver resolver to invert
      */
-    public SAML2AttributesMapper(AttributeResolver resolver) {
+    public SAML2AttributesMapper(@Nonnull final AttributeResolver resolver) {

[... 4 lines stripped ...]