[java-metadata-aggregator COMMIT] in /trunk: aggregator-parent/doc/RELEASE-NOTES.txt aggregator-pipeline/src/main/jav...

[noreply at shibboleth.net]

Author: iay
Date: Sun Jun  8 09:23:54 2014
New Revision: 374

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=374&view=rev
Log:
MDA-139: add stage implementing ItemId transformations for metadata query

Added:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
      - copied, changed from r373, trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQueryMD5ItemIdTransformer.java   (with props)
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MDQuerySHA1ItemIdTransformer.java   (with props)
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemIdTransformStageTest.java
      - copied, changed from r373, trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/EntityIdTransformStageTest.java
Modified:
    trunk/aggregator-parent/doc/RELEASE-NOTES.txt
    trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/EntityIdTransformStageTest.java

Modified: trunk/aggregator-parent/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-parent/doc/RELEASE-NOTES.txt?rev=374&r1=373&r2=374&view=diff
==============================================================================
--- trunk/aggregator-parent/doc/RELEASE-NOTES.txt (original)
+++ trunk/aggregator-parent/doc/RELEASE-NOTES.txt Sun Jun  8 09:23:54 2014
@@ -107,6 +107,10 @@
     * ItemSerializer#serialize now takes Item<T> instead of Collection<Item<T>>
     * DomDocumentFactoryBean is now DOMDocumentFactoryBean
     * DOMDocumentFactoryBean documentResource property is now resource
+    * New classes supporting the Metadata Query Protocol:
+        * ItemIdTransformStage
+        * MDQueryMD5ItemIdTransformer
+        * MDQuerySAML1ItemIdTransformer
 
 ** Bug
     * [MDA-130] - NPE in DOMResourceStage if resource reading fails
@@ -114,6 +118,7 @@
 ** New Feature
     * [JSE-1] - change factory beans to operate on resources, not files
     * [MDA-132] - generic conditional execution of stages
+    * [MDA-139] - add stage implementing ItemId transformations for metadata query
 
 ** Improvements
     * [JSE-4] - DomDocumentFactoryBean should be renamed

Copied: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java (from r373, trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java)
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java?p2=trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java&p1=trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java&r1=373&r2=374&rev=374&view=diff
==============================================================================
--- trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java Sun Jun  8 09:23:54 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.metadata.query;
+package net.shibboleth.metadata.pipeline;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,27 +26,23 @@
 
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
-import net.shibboleth.metadata.pipeline.StageProcessingException;
 import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.collection.LazyList;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.cryptacular.util.CodecUtil;
-import org.cryptacular.util.HashUtil;
 import org.springframework.core.convert.converter.Converter;
 
 import com.google.common.base.Predicates;
 
 /**
- * A pipeline stage that, if present, takes each {@link ItemId} associated with a metadata element, transforms it
+ * A pipeline stage that, takes each {@link ItemId} associated with an {@link Item}, transforms its
  * value using a set of registered transformers, and associates an additional {@link ItemId} (whose value is the
  * result of the transform) with the element.
  * 
- * @param <T> type of metadata this stage operates upon
+ * @param <T> type of {@link Item} this stage operates upon
  */
 @ThreadSafe
-public class EntityIdTransformStage<T> extends BaseIteratingStage<T> {
+public class ItemIdTransformStage<T> extends BaseIteratingStage<T> {
 
     /** Transformers used on IDs. */
     private Collection<Converter<String, String>> idTransformers = new LazyList<>();
@@ -66,9 +62,9 @@

[... 140 lines stripped ...]