[java-shib-shared] branch main updated: Removing additional Guava dependencies.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-shared.

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

The following commit(s) were added to refs/heads/main by this push:
     new ba1e921b Removing additional Guava dependencies.
ba1e921b is described below

commit ba1e921b5dbaa8a5bf77abc849bd3a3c581255e2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 20 09:15:26 2023 -0400

    Removing additional Guava dependencies.
---
 .../spring/servlet/impl/CharacterEncodingFilter.java      | 15 ++++++++-------
 .../shared/spring/config/BooleanToPredicateConverter.java |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
index e6d6a29a..8ec9b94e 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/CharacterEncodingFilter.java
@@ -22,27 +22,27 @@ import java.util.function.Predicate;
 
 import javax.annotation.Nonnull;
 
-import com.google.common.base.Predicates;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.logic.PredicateSupport;
 import net.shibboleth.shared.spring.servlet.ChainableFilter;
 
 /**
  * Adapts Spring filter into a chainable/conditional one.
  */
-public class CharacterEncodingFilter extends org.springframework.web.filter.CharacterEncodingFilter implements ChainableFilter {
+public class CharacterEncodingFilter extends org.springframework.web.filter.CharacterEncodingFilter
+        implements ChainableFilter {
 
     /** Whether filter should run or not. */
     @Nonnull private Predicate<ServletRequest> activationCondition;
 
     /** Constructor. */
     public CharacterEncodingFilter() {
-        activationCondition = Predicates.alwaysTrue();
+        activationCondition = PredicateSupport.alwaysTrue();
     }
 
     /**
@@ -59,7 +59,7 @@ public class CharacterEncodingFilter extends org.springframework.web.filter.Char
      * 
      * @param condition run condition
      */
-    public void setActivationCondition(@Nonnull Predicate<ServletRequest> condition) {
+    public void setActivationCondition(@Nonnull final Predicate<ServletRequest> condition) {
         activationCondition = Constraint.isNotNull(condition, "Run condition cannot be null");
     }
 
@@ -71,8 +71,9 @@ public class CharacterEncodingFilter extends org.springframework.web.filter.Char
 
     /** {@inheritDoc} */
     @Override
-    protected void doFilterInternal(final HttpServletRequest request, final HttpServletResponse response,
-            final FilterChain filterChain) throws ServletException, IOException {
+    protected void doFilterInternal(@Nonnull final HttpServletRequest request,
+            @Nonnull final HttpServletResponse response, @Nonnull final FilterChain filterChain)
+                    throws ServletException, IOException {
         
         if (!activationCondition.test(request)) {
             filterChain.doFilter(request, response);
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
index e7ab28e7..3b95d279 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
 
 import org.springframework.core.convert.converter.Converter;
 
-import com.google.common.base.Predicates;
+import net.shibboleth.shared.logic.PredicateSupport;
 
 /**
  * Allows setting of fixed {@link Predicate} properties using a boolean value.
@@ -33,7 +33,7 @@ public class BooleanToPredicateConverter implements Converter<Boolean,Predicate<
 
     /** {@inheritDoc} */
     @Nullable public Predicate<?> convert(@Nonnull final Boolean source) {
-        return source ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
+        return source ? PredicateSupport.alwaysTrue() : PredicateSupport.alwaysFalse();
     }
     
 }
\ No newline at end of file

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