[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: Sat Jul 13 03:56:41 2013
New Revision: 4561

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4561&view=rev
Log:
IDP-287 Start to clean up old style tristating.  No more MatcherException

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherException.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java?rev=4561&r1=4560&r2=4561&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java Sat Jul 13 03:56:41 2013
@@ -19,7 +19,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -134,28 +133,23 @@
         log.debug("{} beginning process of filtering the following {} attributes: {}", new Object[] {getLogPrefix(),
                 prefilteredAttributes.size(), prefilteredAttributes.keySet(),});
 
-        try {
-            final List<AttributeFilterPolicy> policies = getFilterPolicies();
-            for (AttributeFilterPolicy policy : policies) {
-                policy.apply(filterContext);
+        final List<AttributeFilterPolicy> policies = getFilterPolicies();
+        for (AttributeFilterPolicy policy : policies) {
+            policy.apply(filterContext);
+        }
+
+        Attribute filteredAttribute;
+        for (String attributeId : filterContext.getPrefilteredAttributes().keySet()) {
+            final Collection filteredAttributeValues = getFilteredValues(attributeId, filterContext);
+            if (null != filteredAttributeValues && !filteredAttributeValues.isEmpty()) {
+                try {
+                    filteredAttribute = prefilteredAttributes.get(attributeId).clone();
+                } catch (CloneNotSupportedException e) {
+                    throw new AttributeFilterException(e);
+                }
+                filteredAttribute.setValues(filteredAttributeValues);
+                filterContext.getFilteredAttributes().put(filteredAttribute.getId(), filteredAttribute);
             }
-
-            Attribute filteredAttribute;
-            for (String attributeId : filterContext.getPrefilteredAttributes().keySet()) {
-                final Collection filteredAttributeValues = getFilteredValues(attributeId, filterContext);
-                if (null != filteredAttributeValues && !filteredAttributeValues.isEmpty()) {
-                    try {
-                        filteredAttribute = prefilteredAttributes.get(attributeId).clone();
-                    } catch (CloneNotSupportedException e) {
-                        throw new AttributeFilterException(e);
-                    }
-                    filteredAttribute.setValues(filteredAttributeValues);
-                    filterContext.getFilteredAttributes().put(filteredAttribute.getId(), filteredAttribute);
-                }
-            }
-        } catch (MatcherException e) {
-            log.error("{} filtering failed {}", getLogPrefix(), e);
-            filterContext.setFilteredAttributes(Collections.EMPTY_SET);
         }
     }
 

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java?rev=4561&r1=4560&r2=4561&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java (original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java Sat Jul 13 03:56:41 2013
@@ -100,7 +100,7 @@
     /** {@inheritDoc} */
     public Tristate matches(@Nonnull AttributeFilterContext filterContext) throws AttributeFilterException {
         if (fails) {
-            throw new MatcherException("oops");
+            return Tristate.FAIL;
         }
         contextUsed = filterContext;
         return retVal;