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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun 16 10:47:02 2014
New Revision: 6091

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6091&view=rev
Log:
IDP-376 Location of the (mapped) requested Attributes is now entirely done by injected strategies.  The Filter Contexts loose the explicit requested Attributes.

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRule.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeInMetadataPolicyRuleTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java?rev=6091&r1=6090&r2=6091&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.java Mon Jun 16 10:47:02 2014
@@ -27,7 +27,6 @@
 import javax.annotation.concurrent.NotThreadSafe;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPRequestedAttribute;
 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.NullableElements;
@@ -40,7 +39,6 @@
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.collect.MapConstraints;
-import com.google.common.collect.Multimap;
 
 /** A context supplying input to the {@link net.shibboleth.idp.attribute.filter.AttributeFilter} interface. */
 @NotThreadSafe
@@ -48,9 +46,6 @@
 
     /** Attributes which are to be filtered. */
     private Map<String, IdPAttribute> prefilteredAttributes;
-
-    /** The requested Attributes (from the metadata for this request). */
-    private Multimap<String, IdPRequestedAttribute> requestedAttributes;
 
     /** Attributes which have been filtered. */
     private Map<String, IdPAttribute> filteredAttributes;
@@ -137,29 +132,6 @@
     }
 
     /**
-     * Get the attributes requested in the ACS.<br/>
-     * Note that a null requested attribute means that the attribute existed, but that no values could be converted.
-     * This is distinct from the attribute existing and having no values (an non null requested attribute, but an empty
-     * {@link IdPAttribute#getValues()})
-     * 
-     * @return Returns the requestedAttributes.
-     */
-    @NullableElements @Nonnull public Multimap<String, IdPRequestedAttribute> getRequestedIdPAttributes() {
-        return requestedAttributes;
-    }
-
-    /**
-     * Set the attributes requested by the ACS.
-     * 
-     * @param attributes The requestedAttributes to set.
-     */
-    public void setRequestedAttributes(
-            @Nullable @NullableElements final Multimap<String, IdPRequestedAttribute> attributes) {
-
-        requestedAttributes = attributes;
-    }
-
-    /**
      * Sets the principal associated with the filtering.
      * 
      * @return Returns the principal.

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java?rev=6091&r1=6090&r2=6091&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java (original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java Mon Jun 16 10:47:02 2014
@@ -24,9 +24,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
 
 /** Unit test for {@link AttributeFilterContext}. */
 public class AttributeFilterContextTest {
@@ -169,12 +167,4 @@
         Assert.assertNotNull(context.getFilteredIdPAttributes());
         Assert.assertTrue(context.getFilteredIdPAttributes().isEmpty());
     }
-
-   
-    @Test public void testRequestedAttributes() {
-        AttributeFilterContext context = new AttributeFilterContext();

[... 122 lines stripped ...]