[java-support] branch master updated: Clean unnecessary Guava usage.

[Scott Cantor]

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

scantor 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=a4ee325475ea01ef362e56a2ed05e6fe0f88abe4

The following commit(s) were added to refs/heads/master by this push:
       new  a4ee325   Clean unnecessary Guava usage.
a4ee325 is described below

commit a4ee325475ea01ef362e56a2ed05e6fe0f88abe4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 24 19:18:42 2019 -0400

    Clean unnecessary Guava usage.
---
 .../utilities/java/support/net/DynamicResponseHeaderFilter.java    | 7 ++-----
 .../utilities/java/support/security/impl/IPRangeAccessControl.java | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java b/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
index 738fa83..10bc9da 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/net/DynamicResponseHeaderFilter.java
@@ -19,10 +19,10 @@ package net.shibboleth.utilities.java.support.net;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -39,9 +39,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-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.collection.Pair;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -93,7 +90,7 @@ public class DynamicResponseHeaderFilter implements Filter {
     public void setCallbacks(@Nullable @NonnullElements
             final Collection<Function<Pair<HttpServletRequest,HttpServletResponse>,Boolean>> theCallbacks) {
         if (theCallbacks != null) {
-            callbacks = new ArrayList<>(Collections2.filter(theCallbacks, Predicates.notNull()));
+            callbacks = List.copyOf(theCallbacks);
         } else {
             callbacks = Collections.emptyList();
         }
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
index e9077ee..18fa2c8 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
@@ -17,9 +17,9 @@
 
 package net.shibboleth.utilities.java.support.security.impl;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -35,8 +35,6 @@ import net.shibboleth.utilities.java.support.security.AccessControl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 import com.google.common.net.InetAddresses;
 
 /**
@@ -67,7 +65,7 @@ public class IPRangeAccessControl extends AbstractIdentifiableInitializableCompo
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         Constraint.isNotNull(ranges, "IPRange collection cannot be null");
         
-        allowedRanges = new ArrayList<>(Collections2.filter(ranges, Predicates.notNull()));
+        allowedRanges = List.copyOf(ranges);
     }
 
     /** {@inheritDoc} */

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