Upgrade to latest Java-Utils; eliminate Guava usage (#133)

sbabcoc · web-flow · commit 9cca9302269d · 2024-05-31T18:59:39.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>8</maven.compiler.release>
-    <java-utils.version>3.1.1</java-utils.version>
+    <java-utils.version>3.2.0</java-utils.version>
     <settings.version>3.0.5</settings.version>
     <junit.version>4.13.2</junit.version>
     <testng.version>7.5</testng.version>
diff --git a/src/main/java/com/nordstrom/automation/junit/ArtifactCollector.java b/src/main/java/com/nordstrom/automation/junit/ArtifactCollector.java
@@ -5,12 +5,12 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 import org.junit.runner.Description;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.nordstrom.common.file.PathUtils;
 
 /**
@@ -68,12 +68,12 @@ public void failed(Throwable e, Description description) {
      */
     public Optional<Path> captureArtifact(Throwable reason) {
         if (! provider.canGetArtifact(getInstance())) {
-            return Optional.absent();
+            return Optional.empty();
         }
         
         byte[] artifact = provider.getArtifact(getInstance(), reason);
         if ((artifact == null) || (artifact.length == 0)) {
-            return Optional.absent();
+            return Optional.empty();
         }
         
         Path collectionPath = getCollectionPath();
@@ -85,7 +85,7 @@ public Optional<Path> captureArtifact(Throwable reason) {
                     String messageTemplate = "Unable to create collection directory ({}); no artifact was captured";
                     provider.getLogger().warn(messageTemplate, collectionPath, e);
                 }
-                return Optional.absent();
+                return Optional.empty();
             }
         }
         
@@ -99,7 +99,7 @@ public Optional<Path> captureArtifact(Throwable reason) {
             if (provider.getLogger() != null) {
                 provider.getLogger().warn("Unable to get output path; no artifact was captured", e);
             }
-            return Optional.absent();
+            return Optional.empty();
         }
         
         try {
@@ -111,7 +111,7 @@ public Optional<Path> captureArtifact(Throwable reason) {
             if (provider.getLogger() != null) {
                 provider.getLogger().warn("I/O error saving to ({}); no artifact was captured", artifactPath, e);
             }
-            return Optional.absent();
+            return Optional.empty();
         }
         
         recordArtifactPath(artifactPath);
@@ -163,7 +163,7 @@ private void recordArtifactPath(Path artifactPath) {
      */
     public Optional<List<Path>> retrieveArtifactPaths() {
         if (artifactPaths.isEmpty()) {
-            return Optional.absent();
+            return Optional.empty();
         } else {
             return Optional.of(artifactPaths);
         }
@@ -197,7 +197,7 @@ public T getArtifactProvider() {
                 }
             }
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 
     /**
diff --git a/src/main/java/com/nordstrom/automation/junit/AtomIdentity.java b/src/main/java/com/nordstrom/automation/junit/AtomIdentity.java
@@ -1,12 +1,11 @@
 package com.nordstrom.automation.junit;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import com.google.common.base.Optional;
-
 /**
  * This is the base class for test watchers that need access to the test class instance for the current atomic test.
  * For test classes that implement the {@link ArtifactParams} interface, instance parameters can be retrieved via the
@@ -63,7 +62,7 @@ public Optional<Map<String, Object>> getParameters() {
         if (instance instanceof ArtifactParams) {
             return ((ArtifactParams) instance).getParameters();
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 
 }
diff --git a/src/main/java/com/nordstrom/automation/junit/CreateTest.java b/src/main/java/com/nordstrom/automation/junit/CreateTest.java
@@ -7,13 +7,12 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 import org.junit.runners.model.FrameworkMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-
 import net.bytebuddy.implementation.bind.annotation.Argument;
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
diff --git a/src/main/java/com/nordstrom/automation/junit/LifecycleHooks.java b/src/main/java/com/nordstrom/automation/junit/LifecycleHooks.java
@@ -6,18 +6,18 @@
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 import org.apache.commons.lang3.reflect.MethodUtils;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunListener;
 import org.junit.runners.model.TestClass;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
 import com.nordstrom.common.base.UncheckedThrow;
 import com.nordstrom.common.file.PathUtils.ReportsDirectory;
 
@@ -418,7 +418,7 @@ public static <T extends JUnitWatcher> Optional<T> getAttachedWatcher(Class<T> w
                 return Optional.of((T) watcher);
             }
         }
-        return Optional.absent();
+        return Optional.empty();
     }
     
     /**
@@ -481,7 +481,7 @@ private static <T extends RunListener> Optional<T> findListener(Class<T> type, L
                 return Optional.of((T) listener);
             }
         }
-        return Optional.absent();
+        return Optional.empty();
     }
     
     /**
diff --git a/src/main/java/com/nordstrom/automation/junit/MethodBlock.java b/src/main/java/com/nordstrom/automation/junit/MethodBlock.java
@@ -6,10 +6,11 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
+
 import org.junit.experimental.theories.Theories.TheoryAnchor;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
-import com.google.common.base.Function;
 
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
 import net.bytebuddy.implementation.bind.annotation.This;
diff --git a/src/main/java/com/nordstrom/automation/junit/RuleChainWalker.java b/src/main/java/com/nordstrom/automation/junit/RuleChainWalker.java
@@ -2,11 +2,11 @@
 
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 
-import com.google.common.base.Optional;
 import com.nordstrom.common.base.UncheckedThrow;
 
 /**
@@ -38,7 +38,7 @@ public static <T extends TestRule> Optional<T> getAttachedRule(RuleChain ruleCha
                 return Optional.of((T) rule);
             }
         }
-        return Optional.absent();
+        return Optional.empty();
     }
     
     /**
diff --git a/src/main/java/com/nordstrom/automation/junit/Run.java b/src/main/java/com/nordstrom/automation/junit/Run.java
@@ -12,15 +12,14 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.function.Function;
 
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
-
 import net.bytebuddy.implementation.bind.annotation.Argument;
 import net.bytebuddy.implementation.bind.annotation.SuperCall;
 import net.bytebuddy.implementation.bind.annotation.This;
diff --git a/src/main/java/com/nordstrom/automation/junit/RunReflectiveCall.java b/src/main/java/com/nordstrom/automation/junit/RunReflectiveCall.java
@@ -4,14 +4,14 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
 
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.runner.Description;
 import org.junit.runners.model.FrameworkMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
 import com.nordstrom.common.base.UncheckedThrow;
 
 import net.bytebuddy.implementation.bind.annotation.RuntimeType;
diff --git a/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorJUnitParams.java b/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorJUnitParams.java
@@ -3,15 +3,14 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 
-import com.google.common.base.Optional;
-
 @RunWith(JUnitParamsRunner.class)
 public class ArtifactCollectorJUnitParams extends TestBase {
 
@@ -44,7 +43,7 @@ public Optional<Map<String, Object>> getParameters() {
             // return params map as Optional
             return Param.mapOf(namedParams);
         } catch (IllegalAccessException | NoSuchFieldException e) {
-            return Optional.absent();
+            return Optional.empty();
         }
     }
     
diff --git a/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorParameterized.java b/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorParameterized.java
@@ -3,14 +3,13 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.base.Optional;
-
 @RunWith(Parameterized.class)
 public class ArtifactCollectorParameterized extends TestBase {
     
diff --git a/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorTest.java b/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorTest.java
@@ -8,6 +8,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
@@ -16,7 +17,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.JUnitConfig.JUnitSettings;
 import com.nordstrom.automation.junit.UnitTestArtifact.CaptureState;
 import com.nordstrom.automation.junit.UnitTestWatcher.Notification;
diff --git a/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorTheories.java b/src/test/java/com/nordstrom/automation/junit/ArtifactCollectorTheories.java
@@ -3,14 +3,14 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.junit.experimental.theories.DataPoints;
 import org.junit.experimental.theories.PotentialAssignment.CouldNotGenerateValueException;
 import org.junit.experimental.theories.internal.Assignments;
 import org.junit.experimental.theories.Theories;
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
-import com.google.common.base.Optional;
 
 @RunWith(Theories.class)
 public class ArtifactCollectorTheories extends TestBase {
@@ -39,7 +39,7 @@ public Optional<Map<String, Object>> getParameters() {
             // return params map as Optional
             return Param.mapOf(namedParams);
         } catch (IllegalAccessException | NoSuchFieldException | CouldNotGenerateValueException e) {
-            return Optional.absent();
+            return Optional.empty();
         }
     }
 
diff --git a/src/test/java/com/nordstrom/automation/junit/AutomaticRetryTest.java b/src/test/java/com/nordstrom/automation/junit/AutomaticRetryTest.java
@@ -6,14 +6,14 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.JUnitConfig.JUnitSettings;
 import com.nordstrom.automation.junit.UnitTestWatcher.Notification;
 
diff --git a/src/test/java/com/nordstrom/automation/junit/BeforeClassFailureTest.java b/src/test/java/com/nordstrom/automation/junit/BeforeClassFailureTest.java
@@ -6,13 +6,13 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
 import com.nordstrom.automation.junit.UnitTestWatcher.Notification;
 
 public class BeforeClassFailureTest {
diff --git a/src/test/java/com/nordstrom/automation/junit/HookInstallationTest.java b/src/test/java/com/nordstrom/automation/junit/HookInstallationTest.java
@@ -2,12 +2,12 @@
 
 import static org.testng.Assert.assertTrue;
 
+import java.util.Optional;
+
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
-
 public class HookInstallationTest {
     
     @Test
diff --git a/src/test/java/com/nordstrom/automation/junit/ReferenceTracker.java b/src/test/java/com/nordstrom/automation/junit/ReferenceTracker.java
@@ -1,6 +1,6 @@
 package com.nordstrom.automation.junit;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 
 public class ReferenceTracker implements RunnerWatcher {
     
diff --git a/src/test/java/com/nordstrom/automation/junit/RunListenerAdapter.java b/src/test/java/com/nordstrom/automation/junit/RunListenerAdapter.java
@@ -3,14 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.junit.runner.Description;
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
-import com.google.common.base.Optional;
-
 /**
  * This run listener tracks the results of executed tests.
  */
diff --git a/src/test/java/com/nordstrom/automation/junit/TestBase.java b/src/test/java/com/nordstrom/automation/junit/TestBase.java
diff --git a/src/test/java/com/nordstrom/automation/junit/UnitTestCapture.java b/src/test/java/com/nordstrom/automation/junit/UnitTestCapture.java
diff --git a/src/test/java/com/nordstrom/automation/junit/UnitTestWatcher.java b/src/test/java/com/nordstrom/automation/junit/UnitTestWatcher.java

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`import java.nio.file.Path;`
`6`	`6`	`import java.util.ArrayList;`
`7`	`7`	`import java.util.List;`
	`8`	`+import java.util.Optional;`
`8`	`9`	`import java.util.concurrent.ConcurrentHashMap;`
	`10`	`+import java.util.function.Function;`
`9`	`11`
`10`	`12`	`import org.junit.runner.Description;`
`11`	`13`
`12`		`-import com.google.common.base.Function;`
`13`		`-import com.google.common.base.Optional;`
`14`	`14`	`import com.nordstrom.common.file.PathUtils;`
`15`	`15`
`16`	`16`	`/**`
`@@ -68,12 +68,12 @@ public void failed(Throwable e, Description description) {`
`68`	`68`	`*/`
`69`	`69`	`public Optional<Path> captureArtifact(Throwable reason) {`
`70`	`70`	`if (! provider.canGetArtifact(getInstance())) {`
`71`		`- return Optional.absent();`
	`71`	`+ return Optional.empty();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`byte[] artifact = provider.getArtifact(getInstance(), reason);`
`75`	`75`	`if ((artifact == null) \|\| (artifact.length == 0)) {`
`76`		`- return Optional.absent();`
	`76`	`+ return Optional.empty();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`Path collectionPath = getCollectionPath();`
`@@ -85,7 +85,7 @@ public Optional<Path> captureArtifact(Throwable reason) {`
`85`	`85`	`String messageTemplate = "Unable to create collection directory ({}); no artifact was captured";`
`86`	`86`	`provider.getLogger().warn(messageTemplate, collectionPath, e);`
`87`	`87`	`}`
`88`		`- return Optional.absent();`
	`88`	`+ return Optional.empty();`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`@@ -99,7 +99,7 @@ public Optional<Path> captureArtifact(Throwable reason) {`
`99`	`99`	`if (provider.getLogger() != null) {`
`100`	`100`	`provider.getLogger().warn("Unable to get output path; no artifact was captured", e);`
`101`	`101`	`}`
`102`		`- return Optional.absent();`
	`102`	`+ return Optional.empty();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`try {`
`@@ -111,7 +111,7 @@ public Optional<Path> captureArtifact(Throwable reason) {`
`111`	`111`	`if (provider.getLogger() != null) {`
`112`	`112`	`provider.getLogger().warn("I/O error saving to ({}); no artifact was captured", artifactPath, e);`
`113`	`113`	`}`
`114`		`- return Optional.absent();`
	`114`	`+ return Optional.empty();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`recordArtifactPath(artifactPath);`
`@@ -163,7 +163,7 @@ private void recordArtifactPath(Path artifactPath) {`
`163`	`163`	`*/`
`164`	`164`	`public Optional<List<Path>> retrieveArtifactPaths() {`
`165`	`165`	`if (artifactPaths.isEmpty()) {`
`166`		`- return Optional.absent();`
	`166`	`+ return Optional.empty();`
`167`	`167`	`} else {`
`168`	`168`	`return Optional.of(artifactPaths);`
`169`	`169`	`}`
`@@ -197,7 +197,7 @@ public T getArtifactProvider() {`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`- return Optional.absent();`
	`200`	`+ return Optional.empty();`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`package com.nordstrom.automation.junit;`
`2`	`2`
`3`	`3`	`import java.util.Map;`
	`4`	`+import java.util.Optional;`
`4`	`5`
`5`	`6`	`import org.junit.rules.TestWatcher;`
`6`	`7`	`import org.junit.runner.Description;`
`7`	`8`
`8`		`-import com.google.common.base.Optional;`
`9`		`-`
`10`	`9`	`/**`
`11`	`10`	`* This is the base class for test watchers that need access to the test class instance for the current atomic test.`
`12`	`11`	`* For test classes that implement the {@link ArtifactParams} interface, instance parameters can be retrieved via the`
`@@ -63,7 +62,7 @@ public Optional<Map<String, Object>> getParameters() {`
`63`	`62`	`if (instance instanceof ArtifactParams) {`
`64`	`63`	`return ((ArtifactParams) instance).getParameters();`
`65`	`64`	`}`
`66`		`- return Optional.absent();`
	`65`	`+ return Optional.empty();`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,18 @@`
`6`	`6`	`import java.util.AbstractList;`
`7`	`7`	`import java.util.ArrayList;`
`8`	`8`	`import java.util.List;`
	`9`	`+import java.util.Optional;`
`9`	`10`	`import java.util.ServiceLoader;`
`10`	`11`	`import java.util.concurrent.Callable;`
`11`	`12`	`import java.util.concurrent.ConcurrentMap;`
	`13`	`+import java.util.function.Function;`
`12`	`14`
`13`	`15`	`import org.apache.commons.lang3.reflect.MethodUtils;`
`14`	`16`	`import org.junit.internal.runners.model.ReflectiveCallable;`
`15`	`17`	`import org.junit.runner.Description;`
`16`	`18`	`import org.junit.runner.notification.RunListener;`
`17`	`19`	`import org.junit.runners.model.TestClass;`
`18`	`20`
`19`		`-import com.google.common.base.Function;`
`20`		`-import com.google.common.base.Optional;`
`21`	`21`	`import com.nordstrom.common.base.UncheckedThrow;`
`22`	`22`	`import com.nordstrom.common.file.PathUtils.ReportsDirectory;`
`23`	`23`
`@@ -418,7 +418,7 @@ public static <T extends JUnitWatcher> Optional<T> getAttachedWatcher(Class<T> w`
`418`	`418`	`return Optional.of((T) watcher);`
`419`	`419`	`}`
`420`	`420`	`}`
`421`		`- return Optional.absent();`
	`421`	`+ return Optional.empty();`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`/**`
`@@ -481,7 +481,7 @@ private static <T extends RunListener> Optional<T> findListener(Class<T> type, L`
`481`	`481`	`return Optional.of((T) listener);`
`482`	`482`	`}`
`483`	`483`	`}`
`484`		`- return Optional.absent();`
	`484`	`+ return Optional.empty();`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`import java.lang.reflect.Field;`
`4`	`4`	`import java.util.List;`
	`5`	`+import java.util.Optional;`
`5`	`6`
`6`	`7`	`import org.junit.rules.RuleChain;`
`7`	`8`	`import org.junit.rules.TestRule;`
`8`	`9`
`9`		`-import com.google.common.base.Optional;`
`10`	`10`	`import com.nordstrom.common.base.UncheckedThrow;`
`11`	`11`
`12`	`12`	`/**`
`@@ -38,7 +38,7 @@ public static <T extends TestRule> Optional<T> getAttachedRule(RuleChain ruleCha`
`38`	`38`	`return Optional.of((T) rule);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`- return Optional.absent();`
	`41`	`+ return Optional.empty();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`