[java-support] branch master updated: IDP-1516 - Reduce Guava dependence

[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=a00e237ae29581c3bba0877286a5abdb5c86bc7d

The following commit(s) were added to refs/heads/master by this push:
       new  a00e237   IDP-1516 - Reduce Guava dependence
a00e237 is described below

commit a00e237ae29581c3bba0877286a5abdb5c86bc7d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 4 12:54:33 2019 -0500

    IDP-1516 - Reduce Guava dependence
    
    https://issues.shibboleth.net/jira/browse/IDP-1516
    
    Clean up Optional save for one internal usage.
---
 .../utilities/java/support/logic/TransformAndCheckFunction.java       | 4 ++--
 .../shibboleth/utilities/java/support/collection/CollectionTest.java  | 2 +-
 .../utilities/java/support/logic/TransformAndCheckFunctionTest.java   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
index cb74ff5..0515997 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
@@ -18,13 +18,13 @@
 package net.shibboleth.utilities.java.support.logic;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
 
 /**
  * A {@link Function} that receives an input, runs it through a pre-processor and checks the result against a
@@ -76,7 +76,7 @@ public class TransformAndCheckFunction<T> implements Function<T, Optional<? exte
             throw new IllegalArgumentException(input + " does not meet constraint");
         }
         
-        return Optional.absent();
+        return Optional.empty();
     }
 
     /** {@inheritDoc} */
diff --git a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
index 0af968d..4dd4deb 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/collection/CollectionTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Optional;
 import java.util.function.Function;
 
 import net.shibboleth.utilities.java.support.logic.TransformAndCheckFunction;
@@ -29,7 +30,6 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Functions;
-import com.google.common.base.Optional;
 import com.google.common.base.Predicates;
 
 /**
diff --git a/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java b/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
index bd7f737..a97a711 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunctionTest.java
@@ -19,12 +19,11 @@ package net.shibboleth.utilities.java.support.logic;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
-
 /**
  * Test for {@link TransformAndCheckFunction}.
  */

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