Convert PATH crawlers to new process API

Author: dmlloyd

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildLocalRunner.java

@@ -1,12 +1,13 @@
 package io.quarkus.deployment.pkg.steps;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.SystemUtils;
 
+import io.smallrye.common.process.ProcessUtil;
+
 public class NativeImageBuildLocalRunner extends NativeImageBuildRunner {
 
     private final String nativeImageExecutable;
@@ -43,23 +44,7 @@ protected boolean objcopyExists() {
         if (!SystemUtils.IS_OS_LINUX) {
             return false;
         }
-
-        // System path
-        String systemPath = System.getenv("PATH");
-        if (systemPath != null) {
-            String[] pathDirs = systemPath.split(File.pathSeparator);
-            for (String pathDir : pathDirs) {
-                File dir = new File(pathDir);
-                if (dir.isDirectory()) {
-                    File file = new File(dir, "objcopy");
-                    if (file.exists()) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
+        return ProcessUtil.pathOfCommand(Path.of("objcopy")).isPresent();
     }
 
     private String[] buildCommand(List<String> args) {

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java

@@ -59,6 +59,7 @@
 import io.quarkus.sbom.ApplicationManifestConfig;
 import io.smallrye.common.os.OS;
 import io.smallrye.common.process.ProcessBuilder;
+import io.smallrye.common.process.ProcessUtil;
 
 public class NativeImageBuildStep {
 
@@ -75,11 +76,6 @@ public class NativeImageBuildStep {
      */
     private static final String JAVA_HOME_ENV = "JAVA_HOME";
 
-    /**
-     * The name of the environment variable containing the system path.
-     */
-    private static final String PATH = "PATH";
-
     private static final int OOM_ERROR_VALUE = 137;
     private static final String QUARKUS_XMX_PROPERTY = "quarkus.native.native-image-xmx";
     public static final String CONTAINER_BUILD_VOLUME_PATH = "/project";
@@ -547,22 +543,9 @@ private static NativeImageBuildLocalRunner getNativeImageBuildLocalRunner(Native
             }
         }
 
-        // System path
-        String systemPath = System.getenv(PATH);
-        if (systemPath != null) {
-            String[] pathDirs = systemPath.split(File.pathSeparator);
-            for (String pathDir : pathDirs) {
-                File dir = new File(pathDir);
-                if (dir.isDirectory()) {
-                    File file = new File(dir, executableName);
-                    if (file.exists()) {
-                        return new NativeImageBuildLocalRunner(file.getAbsolutePath());
-                    }
-                }
-            }
-        }
-
-        return null;
+        return ProcessUtil.pathOfCommand(Path.of(executableName))
+                .map(value -> new NativeImageBuildLocalRunner(value.toString()))
+                .orElse(null);
     }
 
     private static String getNativeImageExecutableName() {

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java

@@ -3,6 +3,7 @@
 import static io.quarkus.deployment.pkg.steps.LinuxIDUtil.getLinuxID;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -24,16 +25,12 @@
 import io.quarkus.deployment.util.FileUtil;
 import io.smallrye.common.process.AbnormalExitException;
 import io.smallrye.common.process.ProcessBuilder;
+import io.smallrye.common.process.ProcessUtil;
 
 public class UpxCompressionBuildStep {
 
     private static final Logger log = Logger.getLogger(UpxCompressionBuildStep.class);
 
-    /**
-     * The name of the environment variable containing the system path.
-     */
-    private static final String PATH = "PATH";
-
     @BuildStep(onlyIf = NativeBuild.class)
     public void compress(NativeConfig nativeConfig, NativeImageRunnerBuildItem nativeImageRunner,
             NativeImageBuildItem image,
@@ -174,21 +171,8 @@ private String getCompressionLevel(int level) {
     }
 
     private Optional<File> getUpxFromSystem() {
-        String exec = getUpxExecutableName();
-        String systemPath = System.getenv(PATH);
-        if (systemPath != null) {
-            String[] pathDirs = systemPath.split(File.pathSeparator);
-            for (String pathDir : pathDirs) {
-                File dir = new File(pathDir);
-                if (dir.isDirectory()) {
-                    File file = new File(dir, exec);
-                    if (file.exists()) {
-                        return Optional.of(file);
-                    }
-                }
-            }
-        }
-        return Optional.empty();
+        return ProcessUtil.pathOfCommand(Path.of(getUpxExecutableName()))
+                .map(Path::toFile);
     }
 
     private static String getUpxExecutableName() {

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/exec/Executable.java

@@ -2,12 +2,10 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.smallrye.common.os.OS;
+import io.smallrye.common.process.ProcessUtil;
 
 public class Executable {
 
@@ -32,9 +30,7 @@ public static File findExecutableFile(String base) {
     }
 
     public static String findExecutable(String exec) {
-        return Stream.of(System.getenv("PATH").split(Pattern.quote(File.pathSeparator))).map(Paths::get)
-                .map(path -> path.resolve(exec).toFile()).filter(File::exists).findFirst().map(File::getParent)
-                .orElse(null);
+        return ProcessUtil.pathOfCommand(Path.of(exec)).map(Object::toString).orElse(null);
     }
 
     public static File findExecutable(String name, String errorMessage, MessageWriter output) {

independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/update/rewrite/QuarkusUpdateCommand.java

@@ -30,6 +30,7 @@
 import io.quarkus.qute.Qute;
 import io.smallrye.common.os.OS;
 import io.smallrye.common.process.ProcessBuilder;
+import io.smallrye.common.process.ProcessUtil;
 
 public class QuarkusUpdateCommand {
 
@@ -308,9 +309,7 @@ private static Path findWrapperOrBinary(Path baseDir, String wrapper, String cmd
      * @return A Path to the executable, if found, null otherwise
      */
     public static Path searchPath(String cmd) {
-        String envPath = System.getenv("PATH");
-        envPath = envPath != null ? envPath : "";
-        return searchPath(cmd, envPath);
+        return ProcessUtil.pathOfCommand(Path.of(cmd)).orElse(null);
     }
 
     /**