[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: Mon Aug 15 15:40:31 2011
New Revision: 4016

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4016&view=rev
Log:
Move the String and Regex matchers (and their testers) to be set by methods, not constructors.  

Make them both Initializable and Unmodifable Components so as to save the synchronization pain.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueStringMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/BaseRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/BaseStringMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/TestAttributeScopeRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/TestAttributeScopeStringMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/TestAttributeValueRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/matcher/TestAttributeValueStringMatcher.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java Mon Aug 15 15:40:31 2011
@@ -40,15 +40,6 @@
 @ThreadSafe
 public class AttributeScopeRegexMatcher extends BaseRegexMatcher implements AttributeValueMatcher {
 
-    /**
-     * Constructor.
-     * 
-     * @param regex the pattern
-     */
-    protected AttributeScopeRegexMatcher(String regex) {
-        super(regex);
-    }
-
     /** {@inheritDoc} */
     public Collection<ScopedAttributeValue> getMatchingValues(final Attribute<?> attribute,
             final AttributeFilterContext filterContext) throws AttributeFilteringException {

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java Mon Aug 15 15:40:31 2011
@@ -40,16 +40,6 @@
 @ThreadSafe
 public class AttributeScopeStringMatcher extends BaseStringMatcher implements AttributeValueMatcher {
 
-    /**
-     * Constructor.
-     * 
-     * @param match what to compare against.
-     * @param isCaseSensitive whether comparison is case sensitive.
-     */
-    protected AttributeScopeStringMatcher(String match, boolean isCaseSensitive) {
-        super(match, isCaseSensitive);
-    }
-
     /** {@inheritDoc} */
     public Collection<ScopedAttributeValue> getMatchingValues(final Attribute<?> attribute,
             final AttributeFilterContext filterContext) throws AttributeFilteringException {

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java Mon Aug 15 15:40:31 2011

[... 639 lines stripped ...]