Add 'findExecutable...' method; eliminate Guava (#34)

Author: sbabcoc

pom.xml

@@ -32,7 +32,6 @@
     <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <source-plugin.version>3.2.1</source-plugin.version>
     <javadoc-plugin.version>3.4.0</javadoc-plugin.version>
-    <guava.version>31.1-jre</guava.version>
     <gpg-plugin.version>3.0.1</gpg-plugin.version>
     <staging-plugin.version>1.6.13</staging-plugin.version>
     <release-plugin.version>3.0.0-M6</release-plugin.version>
@@ -70,11 +69,6 @@
         <artifactId>derby</artifactId>
         <version>${apache-derby.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -89,10 +83,6 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

src/main/java/com/nordstrom/common/file/PathUtils.java

@@ -61,6 +61,10 @@ private PathUtils() {
 
     private static final String SUREFIRE_PATH = "surefire-reports";
     private static final String FAILSAFE_PATH = "failsafe-reports";
+    private static final List<String> ENDINGS =
+            OSInfo.getDefault().getType() == OSInfo.OSType.WINDOWS
+                  ? Arrays.asList("", ".cmd", ".exe", ".com", ".bat")
+                  : Collections.singletonList("");
 
     /**
      * This enumeration contains methods to help build proxy subclass names and select reports directories.
@@ -251,6 +255,30 @@ public String getNewName() {
         }
     }
 
+    /**
+     * Search for the specified executable file on the system file path.
+     * <p>
+     * <b>NOTE</b>: On Windows, this method automatically checks for files of the specified name/path with
+     *              the standard executable file extensions ({@code .cmd"}, {@code ".exe"}, {@code ".com"},
+     *              and {@code ".bat"}), so these can be omitted for cross-platform compatibility.
+     * 
+     * @param nameOrPath name/path of executable to find
+     * @return absolute path of located executable; {@code null} if not found
+     */
+    public static String findExecutableOnSystemPath(final String nameOrPath) {
+        List<String> paths = getSystemPathList();
+        paths.add(0, "");
+        for (String path : paths) {
+            for (String ending : ENDINGS) {
+                File file = new File(path, nameOrPath + ending);
+                if (canExecute(file)) {
+                    return file.getAbsolutePath();
+                }
+            }
+        }
+        return null;
+    }
+    
     /**
      * Get the system file path as a path-delimited string.
      * <p>
@@ -261,10 +289,23 @@ public String getNewName() {
      * @return system file path as a path-delimited string
      */
     public static String getSystemPath() {
+        return String.join(File.pathSeparator, getSystemPathList());
+    }
+    
+    /**
+     * Get the system file path as a list of path items.
+     * <p>
+     * <b>NOTE</b>: The initial items in the returned path list are derived from {@link System#getenv()}.
+     *              When running on {@code Mac OS X}, additional items are acquired from {@code /etc/paths}
+     *              and the files found in the {@code /etc/paths.d} folder.
+     * 
+     * @return system file path as a path-delimited string
+     */
+    public static List<String> getSystemPathList() {
         List<String> pathList = new ArrayList<>();
         addSystemPathList(pathList);
         addMacintoshPathList(pathList);
-        return String.join(File.pathSeparator, pathList);
+        return pathList;
     }
 
     /**
@@ -369,6 +410,10 @@ public static String[] append(String suffix, String... strings) {
         return temp;
     }
 
+    private static boolean canExecute(File file) {
+        return file.exists() && !file.isDirectory() && file.canExecute();
+    }
+
     /**
      * Classes that implement this interface are called to supply additional elements for the path returned by
      * {@link ReportsDirectory#getPathForObject(Object)}. This enables the implementing class to partition artifacts

src/main/java/com/nordstrom/common/jar/JarUtils.java

@@ -14,7 +14,6 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import com.google.common.base.Joiner;
 import com.nordstrom.common.base.UncheckedThrow;
 
 /**
@@ -63,7 +62,7 @@ public static String getClasspath(final String[] dependencyContexts) {
             return classPath;
         } else {
             // classpath plus tab-delimited list of agent paths 
-            return classPath + "\n" + Joiner.on("\t").join(contextPaths);
+            return classPath + "\n" + String.join("\t", contextPaths);
         }
     }
 
@@ -111,7 +110,7 @@ private static List<String> getContextPaths(final boolean prefixAgents, final St
             }
         }
         // add assembled classpath string
-        contextPaths.add(Joiner.on(File.pathSeparator).join(pathList));
+        contextPaths.add(String.join(File.pathSeparator, pathList));
         // add Java agent paths
         contextPaths.addAll(agentList);
         return contextPaths;

src/main/java/com/nordstrom/common/params/Params.java

@@ -3,8 +3,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
-import com.google.common.base.Optional;
+import java.util.Optional;
 
 /**
  * This interface enables implementers to provide methods to support for concisely-defined parameters.
@@ -66,7 +65,7 @@ public Object getVal() {
          */
         public static Optional<Map<String, Object>> mapOf(Param... params) {
             if ((params == null) || (params.length == 0)) {
-                return Optional.absent();
+                return Optional.empty();
             }
             Map<String, Object> paramMap = new HashMap<>();
             for (Param param : params) {

src/test/java/com/nordstrom/common/file/PathUtilsTest.java

@@ -2,6 +2,7 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -138,6 +139,12 @@ public void testNullExtenstion() throws IOException {
     public void testEmptyExtension() throws IOException {
         PathUtils.getNextPath(getOutputPath(), "test", "");
     }
+    
+    @Test
+    public void testFindExecutableOnSystemPath() {
+        String path = PathUtils.findExecutableOnSystemPath("java");
+        assertNotNull(path);
+    }
 
     @Test
     public void testGetSystemPath() {

src/test/java/com/nordstrom/common/file/VolumeInfoTest.java

@@ -5,7 +5,6 @@
 
 import org.testng.annotations.Test;
 
-import com.google.common.base.Joiner;
 import com.nordstrom.common.file.VolumeInfo.VolumeProps;
 
 public class VolumeInfoTest {
@@ -16,7 +15,7 @@ public void test() throws IOException {
         for (VolumeProps thisProps : propsList.values()) {
             System.out.println("file: " + thisProps.getFile());
             System.out.println("type: " + thisProps.getType());
-            System.out.println("opts: " + Joiner.on(",").join(thisProps.getOpts()));
+            System.out.println("opts: " + String.join(",", thisProps.getOpts()));
             System.out.println("size: " + thisProps.getSize());
             System.out.println("free: " + thisProps.getFree());
             System.out.println("");

src/test/java/com/nordstrom/common/jar/JarUtilsTest.java

@@ -9,7 +9,7 @@
 public class JarUtilsTest {
 
     private static final String[] CONTEXTS = { "org.testng.annotations.Test", "com.beust.jcommander.JCommander",
-            "org.apache.derby.jdbc.EmbeddedDriver", "com.google.common.base.Charsets" };
+            "org.apache.derby.jdbc.EmbeddedDriver", "org.slf4j.Logger" };
 
     @Test
     public void testClasspath() {

src/test/java/com/nordstrom/common/params/ParamTest.java

@@ -5,11 +5,10 @@
 import static org.testng.Assert.assertTrue;
 
 import java.util.Map;
+import java.util.Optional;
 
 import org.testng.annotations.Test;
 
-import com.google.common.base.Optional;
-
 public class ParamTest implements Params {
 
     @Test