[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: Sat Feb 22 10:38:18 2014
New Revision: 5448

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5448&view=rev
Log:
JSPT-40 IDO-370 Add calls to the setDestroyMethodName when parisng the (now) detroyable beans.  Clean up the static Matchers and PolicyRules and their parsing so that they do not need to carry initialibilioty or destructability.

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/basic/AnyParser.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/AbstractPrincipalConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/CryptoTransientConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.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=5448&r1=5447&r2=5448&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 Sat Feb 22 10:38:18 2014
@@ -30,11 +30,10 @@
 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.IdentifiedComponent;
-import net.shibboleth.utilities.java.support.component.InitializableComponent;
 
 /** Java definition of MatchFunctorType as applied to value filtering. */
 @ThreadSafe
-public interface Matcher extends IdentifiedComponent, InitializableComponent {
+public interface Matcher extends IdentifiedComponent {
 
     /** A {@link Matcher} that returns true/all attribute values as matched. */
     public static final Matcher MATCHES_ALL = new Matcher() {
@@ -49,12 +48,6 @@
             return "MATCHES_ALL";
         }
 
-        @Override public void initialize() {
-        }
-
-        @Override public boolean isInitialized() {
-            return true;
-        }
     };
 
     /** A {@link Matcher} that returns false/no attribute values as matched. */
@@ -70,12 +63,6 @@
             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. */
@@ -91,12 +78,6 @@
             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=5448&r1=5447&r2=5448&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java (original)

[... 400 lines stripped ...]