[java-metadata-aggregator COMMIT] /trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 11:13:20 2014
New Revision: 349

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=349&view=rev
Log:
JSPT-43 Teach  Aggregator about the new Abstract Class

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.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=349&r1=348&r2=349&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 11:13:20 2014
@@ -26,8 +26,7 @@
 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.component.AbstractIdentifiedInitializableComponent;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializeableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 /**
@@ -36,13 +35,7 @@
  * @param <T> type of item this stage operates upon
  */
 @ThreadSafe
-public abstract class BaseStage<T> extends
-        AbstractIdentifiedInitializableComponent implements Stage<T> {
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setId(@Nonnull @NotEmpty final String componentId) {
-        super.setId(componentId);
-    }
+public abstract class BaseStage<T> extends AbstractIdentifiableInitializeableComponent implements Stage<T> {
 
     /**
      * Creates an {@link ComponentInfo}, delegates actual work on the collection to {@link #doExecute(Collection)}, adds