[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: Wed Mar 21 16:31:22 2012
New Revision: 4130

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4130&view=rev
Log:
Further test coverage

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngineTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4130&r1=4129&r2=4130&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Wed Mar 21 16:31:22 2012
@@ -19,9 +19,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.SortedSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -46,7 +46,6 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 
 //TODO(lajoie) performance metrics
@@ -78,7 +77,7 @@
      * @param criterion criterion used to determine if this policy is active for a given request
      * @param policies value filtering policies employed if this policy is active
      */
-    public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nullable Predicate criterion,
+    public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nonnull Predicate criterion,
             @Nullable Collection<AttributeValueFilterPolicy> policies) {
         setId(policyId);
 
@@ -87,7 +86,11 @@
 
         ArrayList<AttributeValueFilterPolicy> checkedPolicies = new ArrayList<AttributeValueFilterPolicy>();
         CollectionSupport.addIf(checkedPolicies, policies, Predicates.notNull());
-        valuePolicies = ImmutableList.copyOf(Iterables.filter(policies, Predicates.notNull()));
+        if (null != policies) {
+            valuePolicies = ImmutableList.copyOf(Iterables.filter(policies, Predicates.notNull()));
+        } else {
+            valuePolicies = Collections.EMPTY_LIST;
+        }
     }
 
     /**
@@ -127,7 +130,8 @@
      * 
      * @throws AttributeFilteringException thrown if there is a problem evaluating this filter's requirement rule
      */
-    public boolean isApplicable(@Nonnull final AttributeFilterContext filterContext) throws AttributeFilteringException {
+    public boolean isApplicable(@Nonnull final AttributeFilterContext filterContext) 
+            throws AttributeFilteringException {
         assert filterContext != null : "Attribute filter context can not be null";
 
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java?rev=4130&r1=4129&r2=4130&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java Wed Mar 21 16:31:22 2012
@@ -21,8 +21,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -50,7 +48,6 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Iterables;
 
 //TODO(lajoie) perf metrics

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java

[... 185 lines stripped ...]