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

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Oct 29 12:04:56 2011
New Revision: 155

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=155&view=rev
Log:
Add stages that logs status messages and terminates processing based on attached item metadata

Added:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java   (with props)
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java   (contents, props changed)
      - copied, changed from r153, trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java   (with props)
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java   (with props)
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java   (contents, props changed)
      - copied, changed from r153, trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java   (with props)
Removed:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStageTest.java

Copied: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java (from r153, trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStage.java)
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java?p2=trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java&p1=trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStage.java&r1=153&r2=155&rev=155&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataFilterStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java Sat Oct 29 12:04:56 2011
@@ -18,63 +18,36 @@
 package net.shibboleth.metadata.pipeline;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemMetadata;
 
-import org.opensaml.util.collections.CollectionSupport;
-import org.opensaml.util.collections.LazyList;
-
 /**
- * A {@link Stage} that filters out Items if they have a specific type of {@link ItemMetadata} attached to them.
+ * A {@link Stage} that filters out {@link Item} if they have a specific type of {@link ItemMetadata} attached to them.
  * 
  * This is useful, for example, in removing all {@link Item} elements which have an associated
  * {@link net.shibboleth.metadata.ErrorStatus}.
  */
-public class StatusMetadataFilterStage extends BaseStage<Item<?>> {
+public class ItemMetadataFilterStage extends AbstractItemMetadataSelectionStage {
 
-    /** {@link ItemMetadata} classes that, if a {@link Item} contains, will be filtered out. */
-    private Collection<Class<ItemMetadata>> filterRequirements = Collections.emptyList();
-
-    /**
-     * Gets the {@link ItemMetadata} classes that, if a {@link Item} contains, will be filtered out.
-     * 
-     * @return {@link ItemMetadata} classes that, if a {@link Item} contains, will be filtered out, never null nor
-     *         containing null elements
-     */
-    public Collection<Class<ItemMetadata>> getFilterRequirements() {
-        return filterRequirements;
-    }
-
-    /**
-     * Sets the {@link ItemMetadata} classes that, if a {@link Item} contains, will be filtered out.
-     * 
-     * @param requirements {@link ItemMetadata} classes that, if a {@link Item} contains, will be filtered out, may be
-     *            null or contain null elements
-     */
-    public synchronized void setFilterRequirements(Collection<Class<ItemMetadata>> requirements) {
-        if (isInitialized()) {
-            return;
-        }
-        filterRequirements =
-                Collections.unmodifiableList(CollectionSupport.addNonNull(requirements,
-                        new LazyList<Class<ItemMetadata>>()));
-    }
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(ItemMetadataFilterStage.class);
 
     /** {@inheritDoc} */
-    protected void doExecute(Collection<Item<?>> itemCollection) throws StageProcessingException {
-        Item<?> item;
-        Iterator<Item<?>> itemIterator = itemCollection.iterator();

[... 93 lines stripped ...]