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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  5 08:50:20 2011
New Revision: 4052

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4052&view=rev
Log:
Refactor prior to https://issues.shibboleth.net/jira/browse/IDP-44 and others.

Separate attribute handling from Base[String|Regexp]Compare and put it into BaseTargetted[String|Regexp]Compare.  This allows us to derive the principal/entitID/entityGroup filters from base, whilst the current filters now derive fron BaseTarettedXXX (just like 2.X)

This change has also provoked a cascaded initialize (as per the OpenSAML helper class which we cannot extend).

Added:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/BaseTargetedRegexCompare.java   (with props)
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/BaseTargetedStringCompare.java   (with props)
Modified:
    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

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=4052&r1=4051&r2=4052&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 Mon Sep  5 08:50:20 2011
@@ -33,7 +33,7 @@
  * 
  * If the supplied attribute name has any value with a scope which matches the provided regex then we return true.
  */
-public class AttributeScopeRegexCriterion extends BaseRegexCompare implements
+public class AttributeScopeRegexCriterion extends BaseTargetedRegexCompare implements
         EvaluableCriterion<AttributeFilterContext> {
 
     /** Class logger. */

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeStringCriterion.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/AttributeScopeStringCriterion.java?rev=4052&r1=4051&r2=4052&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeStringCriterion.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeScopeStringCriterion.java Mon Sep  5 08:50:20 2011
@@ -36,7 +36,7 @@
  * provided case sensitivity criterion) then we return true.
  */
 @ThreadSafe
-public class AttributeScopeStringCriterion extends BaseStringCompare implements
+public class AttributeScopeStringCriterion extends BaseTargetedStringCompare implements
         EvaluableCriterion<AttributeFilterContext> {
 
     /** Class logger. */

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeValueRegexCriterion.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/AttributeValueRegexCriterion.java?rev=4052&r1=4051&r2=4052&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeValueRegexCriterion.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/policy/AttributeValueRegexCriterion.java Mon Sep  5 08:50:20 2011
@@ -34,7 +34,7 @@
  * If the supplied attribute name has any value which matches the provided regex then we return true.
  */
 @ThreadSafe
-public class AttributeValueRegexCriterion extends BaseRegexCompare implements
+public class AttributeValueRegexCriterion extends BaseTargetedRegexCompare implements
         EvaluableCriterion<AttributeFilterContext> {
 
     /** Class logger. */


[... 185 lines stripped ...]