Merge remote-tracking branch 'origin/eut2' into eut2

Author: jdconrad

build-tools/src/integTest/groovy/org/elasticsearch/gradle/test/TestBuildInfoPluginFuncTest.groovy

@@ -57,7 +57,7 @@ class TestBuildInfoPluginFuncTest extends AbstractGradleFuncTest{
             "component", "example-component",
             "locations", List.of(location)
         )
-        expectedOutput == new ObjectMapper().readValue(output, Map.class)
+        new ObjectMapper().readValue(output, Map.class) == expectedOutput
 
     }
 }

build-tools/src/main/java/org/elasticsearch/gradle/plugin/GenerateTestBuildInfoTask.java

@@ -23,6 +23,7 @@
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
+import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ModuleVisitor;
@@ -34,8 +35,11 @@
 import java.io.InputStream;
 import java.lang.module.ModuleFinder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -47,6 +51,9 @@
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 
+import static java.nio.file.FileVisitResult.CONTINUE;
+import static java.nio.file.FileVisitResult.TERMINATE;
+
 /**
  * This task generates a file with a class to module mapping
  * used to imitate modular behavior during unit tests so
@@ -249,9 +256,9 @@ private String extractModuleNameFromJar(File file, JarFile jarFile) throws IOExc
     /**
      * find the first class and module when the class path entry is a directory
      */
-    private void extractLocationsFromDirectory(File directory, List<Location> locations) throws IOException {
-        String className = extractClassNameFromDirectory(directory);
-        String moduleName = extractModuleNameFromDirectory(directory);
+    private void extractLocationsFromDirectory(File dir, List<Location> locations) throws IOException {
+        String className = extractClassNameFromDirectory(dir);
+        String moduleName = extractModuleNameFromDirectory(dir);
 
         if (className != null && moduleName != null) {
             locations.add(new Location(moduleName, className));
@@ -262,22 +269,22 @@ private void extractLocationsFromDirectory(File directory, List<Location> locati
      * look through the directory to find the first unique class that isn't
      * module-info.class (which may not be unique) and avoid anonymous classes
      */
-    private String extractClassNameFromDirectory(File directory) throws IOException {
-        List<File> files = new ArrayList<>(List.of(directory));
-        while (files.isEmpty() == false) {
-            File find = files.removeFirst();
-            if (find.exists()) {
-                if (find.getName().endsWith(".class")
-                    && find.getName().equals("module-info.class") == false
-                    && find.getName().contains("$") == false) {
-                    return find.getAbsolutePath().substring(directory.getAbsolutePath().length() + 1);
-                } else if (find.isDirectory()) {
-                    files.addAll(Arrays.asList(find.listFiles()));
+    private String extractClassNameFromDirectory(File dir) throws IOException {
+        var visitor = new SimpleFileVisitor<Path>() {
+            String result = null;
+            @Override
+            public @NotNull FileVisitResult visitFile(@NotNull Path candidate, @NotNull BasicFileAttributes attrs) {
+                String name = candidate.getFileName().toString(); // Just the part after the last dir separator
+                if (name.endsWith(".class") && (name.equals("module-info.class") || name.contains("$")) == false) {
+                    result = candidate.toAbsolutePath().toString().substring(dir.getAbsolutePath().length() + 1);
+                    return TERMINATE;
+                } else {
+                    return CONTINUE;
                 }
             }
-
-        }
-        return null;
+        };
+        Files.walkFileTree(dir.toPath(), visitor);
+        return visitor.result;
     }
 
     /**