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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 27 03:25:43 2014
New Revision: 350

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=350&view=rev
Log:
JSPT-40.  Missed checkin.  remove now redundant setId.

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

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=350&r1=349&r2=350&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 Thu Feb 27 03:25:43 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.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializeableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -40,17 +40,13 @@
  * @param <T> type of metadata this stage, and its composed stages, operate upon
  */
 @ThreadSafe
-public class CompositeStage<T> extends AbstractIdentifiedInitializableComponent
+public class CompositeStage<T> extends AbstractIdentifiableInitializeableComponent
         implements Stage<T> {
 
     /** Stages which compose this stage. */
     private List<Stage<T>> composedStages = Collections.emptyList();
 
-    /** {@inheritDoc} */
-    @Override public synchronized void setId(String componentId) {
-        super.setId(componentId);
-    }
-    
+
     /**
      * Gets an unmodifiable list the stages that 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=350&r1=349&r2=350&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 Thu Feb 27 03:25:43 2014
@@ -27,9 +27,8 @@
 import net.shibboleth.metadata.Item;
 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.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializeableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -43,16 +42,11 @@
  * @param <T> the type of item upon which this stage operates
  */
 @ThreadSafe
-public class SimplePipeline<T> extends AbstractIdentifiedInitializableComponent
+public class SimplePipeline<T> extends AbstractIdentifiableInitializeableComponent
         implements Pipeline<T> {
 
     /** Stages for this pipeline. */
     private List<Stage<T>> pipelineStages = Collections.emptyList();
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setId(@Nonnull @NotEmpty String componentId) {
-        super.setId(componentId);
-    }
 
     /** {@inheritDoc} */
     @Override @Nonnull @NonnullElements @Unmodifiable public List<Stage<T>> getStages() {