[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 Jul  1 05:43:33 2013
New Revision: 4544

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4544&view=rev
Log:
IDP-287 review comments. Matcher implementations should reflect the annotations

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/AbstractComparisonMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/saml/AttributeInMetadataMatcher.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java?rev=4544&r1=4543&r2=4544&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java Mon Jul  1 05:43:33 2013
@@ -49,7 +49,7 @@
         /** {@inheritDoc} */
         public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext)
                 throws AttributeFilterException {
-            return attribute.getValues();
+            return Collections.unmodifiableSet(attribute.getValues());
         }
 
         public boolean matches(@Nonnull AttributeFilterContext filterContext)

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/AbstractComparisonMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/AbstractComparisonMatcher.java?rev=4544&r1=4543&r2=4544&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/AbstractComparisonMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/AbstractComparisonMatcher.java Mon Jul  1 05:43:33 2013
@@ -152,7 +152,7 @@
             }
         }
 
-        return matchedValues;
+        return Collections.unmodifiableSet(matchedValues);
     }
 
     /**

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java?rev=4544&r1=4543&r2=4544&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java Mon Jul  1 05:43:33 2013
@@ -19,6 +19,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -93,7 +94,7 @@
 
         Iterator<Matcher> matcherItr = currentMatchers.iterator();
 
-        Set<AttributeValue> matchingValues = matcherItr.next().getMatchingValues(attribute, filterContext);
+        Set<AttributeValue> matchingValues = new HashSet(matcherItr.next().getMatchingValues(attribute, filterContext));
         while (matcherItr.hasNext()) {
             matchingValues.retainAll(matcherItr.next().getMatchingValues(attribute, filterContext));
             if (matchingValues.isEmpty()) {

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/saml/AttributeInMetadataMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/saml/AttributeInMetadataMatcher.java?rev=4544&r1=4543&r2=4544&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/saml/AttributeInMetadataMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/saml/AttributeInMetadataMatcher.java Mon Jul  1 05:43:33 2013
@@ -73,7 +73,7 @@
             log.debug("{} The peer's metadata did not have appropriate requested attributes available",
                     getLogPrefix());
             if (matchIfMetadataSilent) {
-                return attribute.getValues();
+                return Collections.unmodifiableSet(attribute.getValues());
             } else {

[... 3 lines stripped ...]