[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: Fri Feb 21 08:42:44 2014
New Revision: 5433

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5433&view=rev
Log:
IDP-370 Use of #setInitMethod on all attribute-filter related parsers.  Since this is not selective (like default-init is) it then becomes more sensible to make all the attribute filter objects Initializable.

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterPolicyGroupParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java?rev=5433&r1=5432&r2=5433&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java Fri Feb 21 08:42:44 2014
@@ -30,10 +30,11 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
+import net.shibboleth.utilities.java.support.component.InitializableComponent;
 
 /** Java definition of MatchFunctorType as applied to value filtering. */
 @ThreadSafe
-public interface Matcher extends IdentifiableComponent {
+public interface Matcher extends IdentifiableComponent, InitializableComponent {
 
     /** A {@link Matcher} that returns true/all attribute values as matched. */
     public static final Matcher MATCHES_ALL = new Matcher() {
@@ -46,6 +47,13 @@
 
         @Override @Nullable public String getId() {
             return "MATCHES_ALL";
+        }
+
+        @Override public void initialize() {
+        }
+
+        @Override public boolean isInitialized() {
+            return true;
         }
     };
 
@@ -61,6 +69,13 @@
         @Override @Nullable public String getId() {
             return "MATCHES_NONE";
         }
+
+        @Override public void initialize() {
+        }
+
+        @Override public boolean isInitialized() {
+            return true;
+        }
     };
 
     /** A {@link Matcher} that fails. targetted primarily at testing, but also at odd corners of parsing. */
@@ -75,6 +90,13 @@
         @Override @Nullable public String getId() {
             return "MATCHER_FAILS";
         }
+
+        @Override public void initialize() {
+        }
+
+        @Override public boolean isInitialized() {
+            return true;
+        }
     };
 
     /**

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java?rev=5433&r1=5432&r2=5433&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java Fri Feb 21 08:42:44 2014
@@ -22,28 +22,29 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
+import net.shibboleth.utilities.java.support.component.InitializableComponent;
 
 /**
  * Java definition of PolicyRequirementRule.
  * 
  * This is a specific mapping of a MatchFunctor as used in an {@link AttributeFilterPolicy}
- *
- * All function can return {@link Tristate#TRUE} or {@link Tristate#FALSE} (as expected), 
- * but if something odd happens during enumeration (like not being able to find something
- * in the context) then they return {@link Tristate#FAIL}.
+ * 
+ * All function can return {@link Tristate#TRUE} or {@link Tristate#FALSE} (as expected), but if something odd happens
+ * during enumeration (like not being able to find something in the context) then they return {@link Tristate#FAIL}.
  */
 @ThreadSafe

[... 197 lines stripped ...]