[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src: main/java/net/shibboleth/metadata/pipeline/BaseS...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 09:34:04 2014
New Revision: 348

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=348&view=rev
Log:
JSPT-40 Our Abstract Initializable components become Destructable as well.  Allows us to remove two base classes.

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java?rev=348&r1=347&r2=348&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java Sat Feb 22 09:34:04 2014
@@ -27,7 +27,7 @@
 import net.shibboleth.metadata.util.ItemMetadataSupport;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 /**
@@ -37,7 +37,7 @@
  */
 @ThreadSafe
 public abstract class BaseStage<T> extends
-        AbstractDestructableIdentifiedInitializableComponent implements Stage<T> {
+        AbstractIdentifiedInitializableComponent implements Stage<T> {
 
     /** {@inheritDoc} */
     @Override public synchronized void setId(@Nonnull @NotEmpty final String componentId) {

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java?rev=348&r1=347&r2=348&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java Sat Feb 22 09:34:04 2014
@@ -29,7 +29,7 @@
 import net.shibboleth.metadata.Item;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
-import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -40,7 +40,7 @@
  * @param <T> type of metadata this stage, and its composed stages, operate upon
  */
 @ThreadSafe
-public class CompositeStage<T> extends AbstractDestructableIdentifiedInitializableComponent
+public class CompositeStage<T> extends AbstractIdentifiedInitializableComponent
         implements Stage<T> {
 
     /** Stages which compose this stage. */

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java?rev=348&r1=347&r2=348&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java Sat Feb 22 09:34:04 2014
@@ -29,7 +29,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -43,7 +43,7 @@
  * @param <T> the type of item upon which this stage operates
  */
 @ThreadSafe
-public class SimplePipeline<T> extends AbstractDestructableIdentifiedInitializableComponent

[... 24 lines stripped ...]