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

sbabcoc · Jun 1, 2024 · 9cca930 · 9cca930
1 parent bbc81e8
commit 9cca930
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 47 deletions.
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.
  */