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

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Aug 13 14:55:46 2011
New Revision: 4013

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4013&view=rev
Log:
Use ComponentSupport class to help propagate destroy, initialize, validate calls

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4013&r1=4012&r2=4013&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Sat Aug 13 14:55:46 2011
@@ -28,9 +28,9 @@
 import org.opensaml.util.collections.CollectionSupport;
 import org.opensaml.util.component.AbstractIdentifiedInitializableComponent;
 import org.opensaml.util.component.ComponentInitializationException;
+import org.opensaml.util.component.ComponentSupport;
 import org.opensaml.util.component.ComponentValidationException;
 import org.opensaml.util.component.DestructableComponent;
-import org.opensaml.util.component.InitializableComponent;
 import org.opensaml.util.component.UnmodifiableComponent;
 import org.opensaml.util.component.UnmodifiableComponentException;
 import org.opensaml.util.component.ValidatableComponent;
@@ -122,9 +122,7 @@
 
     /** {@inheritDoc} */
     public void validate() throws ComponentValidationException {
-        if (activationCriteria instanceof ValidatableComponent) {
-            ((ValidatableComponent) activationCriteria).validate();
-        }
+        ComponentSupport.validate(activationCriteria);
 
         for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {
             valuePolicy.validate();
@@ -133,9 +131,7 @@
 
     /** {@inheritDoc} */
     public synchronized void destroy() {
-        if (activationCriteria instanceof DestructableComponent) {
-            ((DestructableComponent) activationCriteria).destroy();
-        }
+        ComponentSupport.destory(activationCriteria);
         activationCriteria = StaticResponseEvaluableCriterion.FALSE_RESPONSE;
 
         for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {
@@ -217,9 +213,7 @@
         if (activationCriteria == null) {
             activationCriteria = StaticResponseEvaluableCriterion.FALSE_RESPONSE;
         } else {
-            if (activationCriteria instanceof InitializableComponent) {
-                ((InitializableComponent) activationCriteria).initialize();
-            }
+            ComponentSupport.initialize(activationCriteria);
         }
 
         for (AttributeValueFilterPolicy valuePolicy : valuePolicies) {

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java?rev=4013&r1=4012&r2=4013&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java Sat Aug 13 14:55:46 2011
@@ -24,6 +24,7 @@
 
 import org.opensaml.util.StringSupport;
 import org.opensaml.util.component.ComponentInitializationException;
+import org.opensaml.util.component.ComponentSupport;
 import org.opensaml.util.component.ComponentValidationException;
 import org.opensaml.util.component.DestructableComponent;
 import org.opensaml.util.component.InitializableComponent;
@@ -149,25 +150,19 @@
             throw new ComponentInitializationException("No value matching rule specified");
         }
 
-        if (valueMatchingRule instanceof InitializableComponent) {
-            ((InitializableComponent) valueMatchingRule).initialize();
-        }
+        ComponentSupport.initialize(valueMatchingRule);
 
         initialized = true;
     }
 
     /** {@inheritDoc} */
     public synchronized void destroy() {
-        if (valueMatchingRule instanceof DestructableComponent) {
-            ((DestructableComponent) valueMatchingRule).destroy();
-        }
+        ComponentSupport.destory(valueMatchingRule);
     }
 
     /** {@inheritDoc} */
     public void validate() throws ComponentValidationException {

[... 55 lines stripped ...]