[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: Sun Oct 20 09:53:43 2013
New Revision: 4882

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4882&view=rev
Log:
IDP-321 Change the internal requested attribute class name from RequestedAttribute to IdPRequestedAttribute.  Some checkstyle clearup as a result thereof

Added:
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/IdPRequestedAttribute.java
      - copied, changed from r4880, trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/RequestedAttribute.java
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterContext.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRule.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/saml/AttributeInMetadataPolicyRuleTest.java
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AbstractSAMLAttributeMapper.java
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/AttributeMapper.java
    trunk/idp-attribute-mapper-api/src/main/java/net/shibboleth/idp/attribute/mapper/RequestedAttribute.java
    trunk/idp-attribute-mapper-api/src/test/java/net/shibboleth/idp/attribute/mapper/RequestedAttributeTest.java
    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/RequestedAttributeMapperTest.java
    trunk/idp-attribute-mapper-impl/src/test/java/net/shibboleth/idp/attribute/mapper/impl/RequestedAttributesMapperTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
    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/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-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterContext.java?rev=4882&r1=4881&r2=4882&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterContext.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterContext.java Sun Oct 20 09:53:43 2013
@@ -31,7 +31,7 @@
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.AttributeValue;
-import net.shibboleth.idp.attribute.mapper.RequestedAttribute;
+import net.shibboleth.idp.attribute.mapper.IdPRequestedAttribute;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -61,7 +61,7 @@
     private Map<String, Set<AttributeValue>> deniedValues;
 
     /** The requested Attributes (from the metadata for this request). */
-    private Multimap<String, RequestedAttribute> requestedAttributes;
+    private Multimap<String, IdPRequestedAttribute> requestedAttributes;
 
     /** Attributes which have been filtered. */
     private Map<String, IdPAttribute> filteredAttributes;
@@ -238,7 +238,7 @@
      * 
      * @return Returns the requestedAttributes.
      */
-    @NullableElements @Nonnull public Multimap<String, RequestedAttribute> getRequestedAttributes() {
+    @NullableElements @Nonnull public Multimap<String, IdPRequestedAttribute> getRequestedAttributes() {
         return requestedAttributes;
     }
 
@@ -247,8 +247,8 @@
      * 
      * @param attributes The requestedAttributes to set.
      */
-    public void
-            setRequestedAttributes(@Nullable @NullableElements final Multimap<String, RequestedAttribute> attributes) {
+    public void setRequestedAttributes(@Nullable @NullableElements final Multimap<String, 
+            IdPRequestedAttribute> attributes) {
 
         requestedAttributes = attributes;
     }


[... 623 lines stripped ...]