[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: Tue May 21 12:16:33 2013
New Revision: 4478

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4478&view=rev
Log:
IDP 208 Further refactoring the Filter-API to link better between Schema types and Java Classes.  Part 3 of n.  AttributeValueFilterPolicy gets exploded out into AttributeRule PermitRule and DenyRule
Again filter-impl compiles and passes tests, but more work needed.

Added:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeRule.java
      - copied, changed from r4477, trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/DenyValueRule.java   (with props)
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/PermitValueRule.java   (with props)
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/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
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicyTest.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
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.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=4478&r1=4477&r2=4478&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 Tue May 21 12:16:33 2013
@@ -67,7 +67,7 @@
     private final MatchFunctor policyRequirementRule;
 
     /** Filters to be used on attribute values. */
-    private final List<AttributeValueFilterPolicy> valuePolicies;
+    private final List<AttributeRule> valuePolicies;
 
     /**
      * Constructor.
@@ -77,13 +77,13 @@
      * @param policies value filtering policies employed if this policy is active
      */
     public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nonnull MatchFunctor requirementRule,
-            @Nullable Collection<AttributeValueFilterPolicy> policies) {
+            @Nullable Collection<AttributeRule> policies) {
         setId(policyId);
 
         policyRequirementRule =
                 Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
 
-        ArrayList<AttributeValueFilterPolicy> checkedPolicies = new ArrayList<AttributeValueFilterPolicy>();
+        ArrayList<AttributeRule> checkedPolicies = new ArrayList<AttributeRule>();
         CollectionSupport.addIf(checkedPolicies, policies, Predicates.notNull());
         if (null != policies) {
             valuePolicies = ImmutableList.copyOf(Iterables.filter(policies, Predicates.notNull()));
@@ -106,7 +106,7 @@
      * 
      * @return attribute rules that are in effect if this policy is in effect
      */
-    @Nonnull @NonnullElements @Unmodifiable public List<AttributeValueFilterPolicy> getAttributeValuePolicies() {
+    @Nonnull @NonnullElements @Unmodifiable public List<AttributeRule> getAttributeValuePolicies() {
         return valuePolicies;
     }
 
@@ -114,7 +114,7 @@
     public void validate() throws ComponentValidationException {
         ComponentSupport.validate(policyRequirementRule);
 
-        for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {
+        for (AttributeRule valuePolicy : valuePolicies) {
             valuePolicy.validate();
         }
     }
@@ -169,7 +169,7 @@
                 attributes.keySet());
 
         Attribute attribute;
-        for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {
+        for (AttributeRule valuePolicy : valuePolicies) {
             attribute = attributes.get(valuePolicy.getAttributeId());
             if (attribute != null) {
                 if (!attribute.getValues().isEmpty()) {
@@ -191,7 +191,7 @@
 
         ComponentSupport.initialize(policyRequirementRule);
 
-        for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {

[... 767 lines stripped ...]