[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-impl/src: main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug 17 14:53:38 2011
New Revision: 4021

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4021&view=rev
Log:
StringValue and Regexp Criteria move from being contructor initialized to using setters.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AndCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeRegexCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeStringCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeValueRegexCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeValueStringCriterion.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/BaseRegexCompare.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/BaseStringCompare.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/OrCriterion.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAttributeScopeRegex.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAttributeScopeString.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAttributeValueRegex.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/policy/TestAttributeValueString.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AndCriterion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AndCriterion.java?rev=4021&r1=4020&r2=4021&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AndCriterion.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AndCriterion.java Wed Aug 17 14:53:38 2011
@@ -76,7 +76,7 @@
     /** Mark the object as initialized having initialized any children. {@inheritDoc}. */
     public synchronized void initialize() throws ComponentInitializationException {
         if (initialized) {
-            throw new ComponentInitializationException("And Matcher being initialized multiple times");
+            throw new ComponentInitializationException("And Criterion being initialized multiple times");
         }
 
         for (EvaluableCriterion<AttributeFilterContext> criterion : criteria) {
@@ -150,7 +150,7 @@
         // NOTE capture the criteria to avoid race with setSubCriterion.
         // Do this before the test on destruction to avoid race with destroy code.
         List<EvaluableCriterion<AttributeFilterContext>> theCriteria = criteria;
-        
+
         if (destroyed) {
             throw new EvaluationException("And Criterion has been destroyed");
         }

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeRegexCriterion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeRegexCriterion.java?rev=4021&r1=4020&r2=4021&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeRegexCriterion.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeRegexCriterion.java Wed Aug 17 14:53:38 2011
@@ -23,9 +23,8 @@
 import net.shibboleth.idp.attribute.ScopedAttributeValue;
 import net.shibboleth.idp.attribute.filtering.AttributeFilterContext;
 
-import org.opensaml.util.Assert;
-import org.opensaml.util.StringSupport;
 import org.opensaml.util.criteria.EvaluableCriterion;
+import org.opensaml.util.criteria.EvaluationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,44 +39,18 @@
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AttributeScopeRegexCriterion.class);
 
-    /** The name of the target attribute. */
-    private final String attributeName;
-
     /**
-     * Constructor.
+     * {@inheritDoc}
      * 
-     * @param regex the regex we are testing against.
-     * @param attribute the name of the attribute
+     * @throws EvaluationException if the attribute name could not be found.
      */
-    public AttributeScopeRegexCriterion(final String regex, final String attribute) {

[... 1096 lines stripped ...]