[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:21:22 2013
New Revision: 4479

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4479&view=rev
Log:
IDP 208 Further refactoring the Filter-API to link better between Schema types and Java Classes.  Part 4 of n.  Clean up method names for <AttributeFileterPolicy/>

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

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=4479&r1=4478&r2=4479&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:21:22 2013
@@ -74,30 +74,30 @@
      * 
      * @param policyId unique ID of this policy
      * @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
+     * @param attributeRules value filtering policies employed if this policy is active
      */
     public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nonnull MatchFunctor requirementRule,
-            @Nullable Collection<AttributeRule> policies) {
+            @Nullable Collection<AttributeRule> attributeRules) {
         setId(policyId);
 
         policyRequirementRule =
                 Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
 
         ArrayList<AttributeRule> checkedPolicies = new ArrayList<AttributeRule>();
-        CollectionSupport.addIf(checkedPolicies, policies, Predicates.notNull());
-        if (null != policies) {
-            valuePolicies = ImmutableList.copyOf(Iterables.filter(policies, Predicates.notNull()));
+        CollectionSupport.addIf(checkedPolicies, attributeRules, Predicates.notNull());
+        if (null != attributeRules) {
+            valuePolicies = ImmutableList.copyOf(Iterables.filter(attributeRules, Predicates.notNull()));
         } else {
             valuePolicies = Collections.EMPTY_LIST;
         }
     }
 
     /**
-     * Gets the criteria that must be met for this policy to be active for a given request.
-     * 
-     * @return criteria that must be met for this policy to be active for a given request
-     */
-    @Nonnull public MatchFunctor getActivationCriteria() {
+     * Gets the MatchFunctor that must be met for this policy to be active for a given request.
+     * 
+     * @return MatchFunctor that must be met for this policy to be active for a given request
+     */
+    @Nonnull public MatchFunctor getPolicyRequirementRule() {
         return policyRequirementRule;
     }
 
@@ -106,7 +106,7 @@
      * 
      * @return attribute rules that are in effect if this policy is in effect
      */
-    @Nonnull @NonnullElements @Unmodifiable public List<AttributeRule> getAttributeValuePolicies() {
+    @Nonnull @NonnullElements @Unmodifiable public List<AttributeRule> getAttributeRules() {
         return valuePolicies;
     }
 

Modified: trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java?rev=4479&r1=4478&r2=4479&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java (original)
+++ trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java Tue May 21 12:21:22 2013
@@ -62,13 +62,13 @@
     @Test public void testPostConstructionState() {
         AttributeFilterPolicy policy = new AttributeFilterPolicy(ID, policyMatcher, Arrays.asList(valuePolicy));
         Assert.assertEquals(policy.getId(), ID);
-        Assert.assertEquals(policy.getActivationCriteria(), policyMatcher);
-        Assert.assertTrue(policy.getAttributeValuePolicies().contains(valuePolicy));
+        Assert.assertEquals(policy.getPolicyRequirementRule(), policyMatcher);
+        Assert.assertTrue(policy.getAttributeRules().contains(valuePolicy));
 
         policy = new AttributeFilterPolicy(ID, policyMatcher, null);
         Assert.assertEquals(policy.getId(), ID);
-        Assert.assertEquals(policy.getActivationCriteria(), policyMatcher);
-        Assert.assertTrue(policy.getAttributeValuePolicies().isEmpty());

[... 37 lines stripped ...]