add module info for directory

Author: jdconrad

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

@@ -23,12 +23,14 @@
 import org.objectweb.asm.Opcodes;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -126,24 +128,23 @@ private void extractFromJar(File file, Map<String, String> classesToModules) thr
     private String extractClassNameFromJar(JarFile jarFile) {
         return jarFile.stream()
             .filter(
-                    je -> je.getName().startsWith("META-INF") == false
-                            && je.getName().equals("module-info.class") == false
-                            && je.getName().endsWith(".class")
+                je -> je.getName().startsWith("META-INF") == false
+                    && je.getName().equals("module-info.class") == false
+                    && je.getName().endsWith(".class")
             )
-            .findFirst().map(ZipEntry::getName).orElse(null);
+            .findFirst()
+            .map(ZipEntry::getName)
+            .orElse(null);
     }
 
     private String extractModuleNameFromJar(File file, JarFile jarFile) throws IOException {
         String moduleName = null;
 
         if (jarFile.isMultiRelease()) {
             List<Integer> versions = jarFile.stream()
-                    .filter(
-                            je -> je.getName().startsWith("META-INF/versions/")
-                                    && je.getName().endsWith("/module-info.class")
-                    )
-                    .map(je -> Integer.parseInt(je.getName().substring(18, je.getName().length() - 18)))
-                    .toList();
+                .filter(je -> je.getName().startsWith("META-INF/versions/") && je.getName().endsWith("/module-info.class"))
+                .map(je -> Integer.parseInt(je.getName().substring(18, je.getName().length() - 18)))
+                .toList();
             versions = new ArrayList<>(versions);
             versions.sort(Integer::compareTo);
             versions = versions.reversed();
@@ -201,10 +202,10 @@ private String extractModuleNameFromJar(File file, JarFile jarFile) throws IOExc
         return moduleName;
     }
 
-    private void extractFromDirectory(File file, Map<String, String> classesToModules) {
+    private void extractFromDirectory(File file, Map<String, String> classesToModules) throws IOException {
         String className = extractClassNameFromDirectory(file);
-        String moduleName = null;
-
+        String moduleName = extractModuleNameFromDirectory(file);
+        getLogger().lifecycle("DIRECTORY: " + className + " -> " + moduleName);
         if (className != null && moduleName != null) {
             classesToModules.put(className, moduleName);
         }
@@ -214,9 +215,33 @@ private String extractClassNameFromDirectory(File file) {
         List<File> files = new ArrayList<>(List.of(file));
         while (files.isEmpty() == false) {
             File find = files.removeFirst();
+            getLogger().lifecycle("FIND: " + find.getAbsolutePath());
             if (find.exists()) {
-                if (find.getName().endsWith(".class") && find.getName().equals("module-info.class") == false && find.getName().contains("$") == false) {
+                if (find.getName().endsWith(".class")
+                    && find.getName().equals("module-info.class") == false
+                    && find.getName().contains("$") == false) {
                     return find.getAbsolutePath().substring(file.getAbsolutePath().length() + 1);
+                } else if (find.isDirectory()) {
+                    files.addAll(Arrays.asList(find.listFiles()));
+                }
+            }
+
+        }
+        return null;
+    }
+
+    private String extractModuleNameFromDirectory(File file) throws IOException {
+        List<File> files = new ArrayList<>(List.of(file));
+        while (files.isEmpty() == false) {
+            File find = files.removeFirst();
+            getLogger().lifecycle("FIND: " + find.getAbsolutePath());
+            if (find.exists()) {
+                if (find.getName().equals("module-info.class")) {
+                    try (InputStream inputStream = new FileInputStream(find)) {
+                        return extractModuleNameFromModuleInfo(inputStream);
+                    }
+                } else if (find.isDirectory()) {
+                    files.addAll(Arrays.asList(find.listFiles()));
                 }
             }
         }