[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: Fri May 17 10:11:06 2013
New Revision: 4474

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4474&view=rev
Log:
IDP 208 Start refactoring the Filter-API code so there is a more recognizable link between Schema types and Java Classes.  Part 2 of n.  The Predicate "criterion" becomes a MatchFunctor called " policyRequirement rule (as per the schema)

Added:
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockMatchFunctor.java
      - copied, changed from r4472, trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockAttributeValueMatcher.java
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.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
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockAttributeValueMatcher.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockPredicate.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/TargettedAttributeValueFilterTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/complex/UntargettedAttributeValueFilterTest.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=4474&r1=4473&r2=4474&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 Fri May 17 10:11:06 2013
@@ -43,7 +43,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -65,7 +64,7 @@
     private final Logger log = LoggerFactory.getLogger(AttributeFilterPolicy.class);
 
     /** Criterion that must be met for this policy to be active for a given request. */
-    private final Predicate<AttributeFilterContext> activationCriteria;
+    private final MatchFunctor policyRequirementRule;
 
     /** Filters to be used on attribute values. */
     private final List<AttributeValueFilterPolicy> valuePolicies;
@@ -74,15 +73,15 @@
      * Constructor.
      * 
      * @param policyId unique ID of this policy
-     * @param criterion criterion used to determine if this policy is active for a given request
+     * @param requirementRule 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, @Nonnull Predicate criterion,
+    public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nonnull MatchFunctor requirementRule,
             @Nullable Collection<AttributeValueFilterPolicy> policies) {
         setId(policyId);
 
-        activationCriteria =
-                Constraint.isNotNull(criterion, "Attribute filter policy activiation criterion can not be null");
+        policyRequirementRule =
+                Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
 
         ArrayList<AttributeValueFilterPolicy> checkedPolicies = new ArrayList<AttributeValueFilterPolicy>();
         CollectionSupport.addIf(checkedPolicies, policies, Predicates.notNull());
@@ -98,8 +97,8 @@
      * 
      * @return criteria that must be met for this policy to be active for a given request
      */
-    @Nonnull public Predicate<AttributeFilterContext> getActivationCriteria() {
-        return activationCriteria;
+    @Nonnull public MatchFunctor getActivationCriteria() {
+        return policyRequirementRule;
     }
 
     /**
@@ -113,7 +112,7 @@
 
     /** {@inheritDoc} */
     public void validate() throws ComponentValidationException {
-        ComponentSupport.validate(activationCriteria);
+        ComponentSupport.validate(policyRequirementRule);
 
         for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {
             valuePolicy.validate();
@@ -139,13 +138,7 @@
 
         log.debug("Checking if attribute filter policy '{}' is active", getId());
 
-        boolean isActive;
-        try {

[... 644 lines stripped ...]