[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: Mon Feb 24 05:32:25 2014
New Revision: 5458

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5458&view=rev
Log:
IDP-370 Remove cascading of initialize/destroy from attribute-filter-api

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilteringEngineTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/complex/TargettedAttributeValueFilterTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/complex/UntargettedAttributeValueFilterTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java Mon Feb 24 05:32:25 2014
@@ -174,20 +174,6 @@
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         logPrefix = null;
-
-        for (AttributeFilterPolicy policy : filterPolicies) {
-            policy.initialize();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void doDestroy() {
-        final List<AttributeFilterPolicy> policies = getFilterPolicies();
-        for (AttributeFilterPolicy policy : policies) {
-            policy.destroy();
-        }
-
-        super.doDestroy();
     }
 
     /**

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java Mon Feb 24 05:32:25 2014
@@ -175,24 +175,7 @@
     /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
-
-        ComponentSupport.initialize(rule);
-
-        for (AttributeRule valuePolicy : valuePolicies) {
-            valuePolicy.initialize();
-        }
         logPrefix = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void doDestroy() {
-        ComponentSupport.destroy(rule);
-
-        for (AttributeRule valuePolicy : valuePolicies) {
-            valuePolicy.destroy();
-        }
-
-        super.doDestroy();
     }
 
     /**

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java?rev=5458&r1=5457&r2=5458&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java Mon Feb 24 05:32:25 2014
@@ -191,12 +191,6 @@
     }
 
     /** {@inheritDoc} */
-    @Override protected void doDestroy() {
-        ComponentSupport.destroy(matcher);
-        super.doDestroy();
-    }
-
-    /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         logPrefix = null;
@@ -209,8 +203,6 @@
         if (matcher == null) {
             throw new ComponentInitializationException(getLogPrefix() + " Must have a permit rule or a deny rule");
         }
-

[... 314 lines stripped ...]