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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 19 21:12:15 2014
New Revision: 5407

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5407&view=rev
Log:
Remove entityID term from doc.

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContext.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=5407&r1=5406&r2=5407&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 Wed Feb 19 21:12:15 2014
@@ -58,20 +58,21 @@
     /** The principal associated with the filtering. */
     private String principal;
 
-    /** The local entityID. */
+    /** The attribute source identity. */
     @Nullable private String attributeIssuerID;
 
-    /** The other entityID. */
+    /** The attribute recipient identity. */
     @Nullable private String attributeRecipientID;
 
     /** How was the principal Authenticated? */
     @Nullable private String principalAuthenticationMethod;
 
     /** Cache of the metadata context. */
-    private SAMLMetadataContext requesterMetadataContext;
+    @Nullable private SAMLMetadataContext requesterMetadataContext;
 
     /** How to get from hus to the SP metadata context. */
-    private Function<AttributeFilterContext, SAMLMetadataContext> requesterMetadataContextLookupStrategy;
+    @NonnullAfterInit
+    private Function<AttributeFilterContext,SAMLMetadataContext> requesterMetadataContextLookupStrategy;
 
     /** Constructor. */
     public AttributeFilterContext() {
@@ -96,14 +97,14 @@
      * @param attributes attributes which are to be filtered
      */
     public void setPrefilteredIdPAttributes(@Nullable @NullableElements final Collection<IdPAttribute> attributes) {
-        Collection<IdPAttribute> checkedAttributes = new ArrayList<IdPAttribute>();
+        Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
         CollectionSupport.addIf(checkedAttributes, attributes, Predicates.notNull());
 
         prefilteredAttributes =
                 MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(checkedAttributes.size()),
                         MapConstraints.notNull());
 
-        for (IdPAttribute attribute : checkedAttributes) {
+        for (final IdPAttribute attribute : checkedAttributes) {
             prefilteredAttributes.put(attribute.getId(), attribute);
         }
     }
@@ -123,14 +124,14 @@
      * @param attributes attributes that have been filtered
      */
     public void setFilteredIdPAttributes(@Nullable @NullableElements final Collection<IdPAttribute> attributes) {
-        Collection<IdPAttribute> checkedAttributes = new ArrayList<IdPAttribute>();
+        Collection<IdPAttribute> checkedAttributes = new ArrayList<>();
         CollectionSupport.addIf(checkedAttributes, attributes, Predicates.notNull());
 
         filteredAttributes =
                 MapConstraints.constrainedMap(new HashMap<String, IdPAttribute>(checkedAttributes.size()),
                         MapConstraints.notNull());
 
-        for (IdPAttribute attribute : checkedAttributes) {
+        for (final IdPAttribute attribute : checkedAttributes) {
             filteredAttributes.put(attribute.getId(), attribute);
         }
     }
@@ -190,7 +191,7 @@
      * 
      * @param value the attribute issuer associated with this resolution.
      */
-    @Nullable public void setAttributeIssuerID(@Nullable String value) {
+    @Nullable public void setAttributeIssuerID(@Nullable final String value) {
         attributeIssuerID = value;
     }
 
@@ -208,7 +209,7 @@
      * 
      * @param value the attribute recipient associated with this resolution.
      */
-    @Nullable public void setAttributeRecipientID(@Nullable String value) {
+    @Nullable public void setAttributeRecipientID(@Nullable final String value) {
         attributeRecipientID = value;
     }
 
@@ -226,7 +227,7 @@
      * 
      * @param method The principalAuthenticationMethod to set.
      */
-    public void setPrincipalAuthenticationMethod(@Nullable String method) {
+    public void setPrincipalAuthenticationMethod(@Nullable final String method) {
         principalAuthenticationMethod = method;
     }
 
@@ -246,7 +247,7 @@
      * @param strategy The requesterMetadataContextLookupStrategy to set.
      */
     public void setRequesterMetadataContextLookupStrategy(
-            @Nonnull Function<AttributeFilterContext, SAMLMetadataContext> strategy) {
+            @Nonnull final Function<AttributeFilterContext, SAMLMetadataContext> strategy) {
         requesterMetadataContextLookupStrategy =

[... 9 lines stripped ...]