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

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Mar 22 13:29:24 2012
New Revision: 197

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=197&view=rev
Log:
Make some helper methods a bit more generic and switch over to using them

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomElementItem.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SimplePipeline.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemMetadataSupport.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomElementItem.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomElementItem.java?rev=197&r1=196&r2=197&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomElementItem.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DomElementItem.java Thu Mar 22 13:29:24 2012
@@ -22,7 +22,6 @@
 import net.jcip.annotations.ThreadSafe;
 import net.shibboleth.metadata.AbstractItem;
 import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.metadata.util.ItemMetadataSupport;
 import net.shibboleth.utilities.java.support.logic.Assert;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -83,7 +82,7 @@
     /** {@inheritDoc} */
     public Item<Element> copy() {
         final DomElementItem clone = new DomElementItem(unwrap());
-        ItemMetadataSupport.addToAll(clone, getItemMetadata().values().toArray(new ItemMetadata[] {}));
+        ItemMetadataSupport.addAll(clone, getItemMetadata().values());
         return clone;
     }
 }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java?rev=197&r1=196&r2=197&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStage.java Thu Mar 22 13:29:24 2012
@@ -29,7 +29,6 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
-import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.util.ItemMetadataSupport;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -72,8 +71,7 @@
                 transformedElements = ElementSupport.getChildElements(result.getNode());
                 for (Element transformedElement : transformedElements) {
                     DomElementItem newItem = new DomElementItem(transformedElement);
-                    ItemMetadataSupport.addToAll(newItem,
-                            domItem.getItemMetadata().values().toArray(new ItemMetadata[] {}));
+                    ItemMetadataSupport.addAll(newItem, domItem.getItemMetadata().values());
                     newItems.add(newItem);
                 }
             }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java?rev=197&r1=196&r2=197&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XSLTransformationStage.java Thu Mar 22 13:29:24 2012
@@ -28,7 +28,6 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 
-import net.shibboleth.metadata.ItemMetadata;
 import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.metadata.util.ItemMetadataSupport;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -67,8 +66,7 @@
 
                 // Create the result Item and copy across the input's ItemMetadata objects.
                 final DomElementItem newItem = new DomElementItem(newDocument);

[... 123 lines stripped ...]