[java-metadata-aggregator] branch master updated: MDA-227 Stop using ColelctionSupport

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=cd3904c04246d648e26738f783b2cbdc044a9135

The following commit(s) were added to refs/heads/master by this push:
       new  cd3904c   MDA-227 Stop using ColelctionSupport
cd3904c is described below

commit cd3904c04246d648e26738f783b2cbdc044a9135
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 2 11:31:48 2019 +0000

    MDA-227 Stop using ColelctionSupport
    
    https://issues.shibboleth.net/jira/browse/MDA-227
---
 aggregator-cli/.project                                           | 5 -----
 aggregator-pipeline/.project                                      | 5 -----
 .../net/shibboleth/metadata/pipeline/ItemIdTransformStage.java    | 7 +++----
 .../net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java | 8 ++------
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/aggregator-cli/.project b/aggregator-cli/.project
index bfd5db6..7ecc4fb 100644
--- a/aggregator-cli/.project
+++ b/aggregator-cli/.project
@@ -16,11 +16,6 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
diff --git a/aggregator-pipeline/.project b/aggregator-pipeline/.project
index 7aac275..acf4334 100644
--- a/aggregator-pipeline/.project
+++ b/aggregator-pipeline/.project
@@ -16,11 +16,6 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
index 28d218f..c108653 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
@@ -20,16 +20,15 @@ package net.shibboleth.metadata.pipeline;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 
 import com.google.common.base.Function;
-import com.google.common.base.Predicates;
 
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemId;
-import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.collection.LazyList;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -63,8 +62,8 @@ public class ItemIdTransformStage<T> extends AbstractIteratingStage<T> {
     public synchronized void setIdTransformers(final Collection<Function<String, String>> transformers) {
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-
-        CollectionSupport.addIf(idTransformers, transformers, Predicates.notNull());
+        
+        idTransformers.addAll(transformers.stream().filter(e -> e!=null).collect(Collectors.toList()));
     }
 
     @Override
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
index 9a20289..cb140c0 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
@@ -18,19 +18,17 @@
 package net.shibboleth.metadata.pipeline;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemMetadata;
-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 net.shibboleth.utilities.java.support.logic.Constraint;
 
-import com.google.common.base.Predicates;
-
 /**
  * A pipeline stage that adds a collection of {@link ItemMetadata} objects to each {@link Item}'s item metadata.
  * 
@@ -62,9 +60,7 @@ public class ItemMetadataAddingStage<T> extends AbstractIteratingStage<T> {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         Constraint.isNotNull(metadata, "additional metadata collection must not be null");
-
-        additionalItemMetadata = new LazyList<>();
-        CollectionSupport.addIf(additionalItemMetadata, metadata, Predicates.notNull());
+        additionalItemMetadata = metadata.stream().filter(e -> e!=null).collect(Collectors.toList());
     }
 
     @Override

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.