[java-metadata-aggregator COMMIT] in /trunk/aggregator-web-service/src: main/java/net/shibboleth/metadata/query/Entit...

[noreply at shibboleth.net]

Author: iay
Date: Fri Feb 14 10:39:30 2014
New Revision: 339

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=339&view=rev
Log:
Resuscitate remainder of the neglected code.

Added:
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/MockItem.java
      - copied, changed from r317, trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/MockMetadata.java
Modified:
    trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java
    trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/MetadataSerializerViewAdapter.java
    trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/QueryController.java
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/CountingStage.java
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/EntityIdTransformStageTest.java
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/MockMetadata.java
    trunk/aggregator-web-service/src/test/java/net/shibboleth/metadata/query/QueryControllerTest.java

Modified: trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java?rev=339&r1=338&r2=339&view=diff
==============================================================================
--- trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java (original)
+++ trunk/aggregator-web-service/src/main/java/net/shibboleth/metadata/query/EntityIdTransformStage.java Fri Feb 14 10:39:30 2014
@@ -21,16 +21,19 @@
 import java.util.Collection;
 import java.util.List;
 
-import net.jcip.annotations.ThreadSafe;
-import net.shibboleth.metadata.EntityIdInfo;
-import net.shibboleth.metadata.Metadata;
+import javax.annotation.Nonnull;
+import javax.annotation.concurrent.ThreadSafe;
+
+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.metadata.util.MetadataInfoHelper;
+import net.shibboleth.utilities.java.support.collection.CollectionSupport;
+import net.shibboleth.utilities.java.support.collection.LazyList;
 
-import org.opensaml.util.collections.CollectionSupport;
-import org.opensaml.util.collections.LazyList;
 import org.springframework.core.convert.converter.Converter;
+
+import com.google.common.base.Predicates;
 
 import edu.vt.middleware.crypt.digest.MD5;
 import edu.vt.middleware.crypt.digest.SHA1;
@@ -40,12 +43,14 @@
  * A pipeline stage that, if present, takes each {@link EntityIdInfo} associated with a metadata element, transforms it
  * value using a set of registered transformers, and associates an additional {@link EntityIdInfo} (whose value is the
  * result of the transform) with the element.
+ * 
+ * @param <T> type of metadata this stage operates upon
  */
 @ThreadSafe
-public class EntityIdTransformStage extends BaseIteratingStage<Metadata<?>> {
+public class EntityIdTransformStage<T> extends BaseIteratingStage<T> {
 
     /** Transformers used on IDs. */
-    private Collection<Converter<String, String>> idTransformers = new LazyList<Converter<String, String>>();
+    private Collection<Converter<String, String>> idTransformers = new LazyList<>();
 
     /**
      * Gets the transforms used to produce the transformed entity IDs.
@@ -65,22 +70,22 @@
         if (isInitialized()) {
             return;
         }
-        idTransformers = CollectionSupport.addNonNull(transformers, new LazyList<Converter<String, String>>());
+        CollectionSupport.addIf(idTransformers, transformers, Predicates.notNull());
     }
 
     /** {@inheritDoc} */
-    protected boolean doExecute(final Metadata<?> metadata) throws StageProcessingException {
-        List<EntityIdInfo> ids = metadata.getMetadataInfo().get(EntityIdInfo.class);
+    @Override
+    protected boolean doExecute(@Nonnull final Item<T> item) throws StageProcessingException {
+        final List<ItemId> ids = item.getItemMetadata().get(ItemId.class);
 
-        final List<EntityIdInfo> transformedIds = new ArrayList<EntityIdInfo>();
-        String transformedId;
-        for (EntityIdInfo id : ids) {
+        final List<ItemId> transformedIds = new ArrayList<>();
+        for (ItemId id : ids) {
             for (Converter<String, String> idTransform : idTransformers) {
-                transformedId = idTransform.convert(id.getEntityId());
-                transformedIds.add(new EntityIdInfo(transformedId));
+                final String transformedId = idTransform.convert(id.getId());
+                transformedIds.add(new ItemId(transformedId));
             }
         }
-        MetadataInfoHelper.addToAll(metadata, transformedIds.toArray(new EntityIdInfo[] {}));
+        item.getItemMetadata().putAll(transformedIds);
         

[... 649 lines stripped ...]