[java-support] branch master updated: IDP-1516 reduce dependency on guava

[Rod Widdowson]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  b13ebe8   IDP-1516 reduce dependency on guava
b13ebe8 is described below

commit b13ebe88c5b27b1b3d41e55def638f930c744d3e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Nov 1 11:22:52 2019 +0000

    IDP-1516 reduce dependency on guava
    
    https://issues.shibboleth.net/jira/browse/IDP-1516
---
 .../utilities/java/support/primitive/StringSupport.java           | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
index f41ec0d..53168b8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/primitive/StringSupport.java
@@ -29,18 +29,15 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.logic.TrimOrNullStringFunction;
 
 /** String utility methods. */
 public final class StringSupport {
@@ -179,8 +176,7 @@ public final class StringSupport {
             return Collections.emptySet();
         }
         
-        return Collections2.filter(Collections2.transform(values, TrimOrNullStringFunction.INSTANCE::apply),
-                Predicates.notNull());
+        return values.stream().map(StringSupport::trimOrNull).filter(e->e != null).collect(Collectors.toSet());
     }
 
     /** Null/empty preserving conversion from xs:boolean to {@link Boolean}.

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