add module inference when plugin is not modular

Author: jdconrad

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

@@ -15,6 +15,7 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
 import org.objectweb.asm.ClassReader;
@@ -54,6 +55,10 @@ public GenerateTestBuildInfoTask() {
         setDescription(DESCRIPTION);
     }
 
+    @Input
+    @Optional
+    public abstract Property<String> getModuleName();
+
     @Input
     public abstract Property<String> getComponentName();
 
@@ -205,7 +210,6 @@ private String extractModuleNameFromJar(File file, JarFile jarFile) throws IOExc
     private void extractFromDirectory(File file, Map<String, String> classesToModules) throws IOException {
         String className = extractClassNameFromDirectory(file);
         String moduleName = extractModuleNameFromDirectory(file);
-        getLogger().lifecycle("DIRECTORY: " + className + " -> " + moduleName);
         if (className != null && moduleName != null) {
             classesToModules.put(className, moduleName);
         }
@@ -215,7 +219,6 @@ 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
@@ -234,7 +237,6 @@ 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)) {
@@ -245,7 +247,7 @@ private String extractModuleNameFromDirectory(File file) throws IOException {
                 }
             }
         }
-        return null;
+        return getModuleName().isPresent() ? getModuleName().get() : null;
     }
 
     private String extractModuleNameFromModuleInfo(InputStream inputStream) throws IOException {

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

@@ -16,6 +16,7 @@
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
+import org.gradle.jvm.tasks.Jar;
 import org.gradle.language.jvm.tasks.ProcessResources;
 
 import javax.inject.Inject;
@@ -55,6 +56,14 @@ public void apply(final Project project) {
         });
 
         project.getTasks().withType(GenerateTestBuildInfoTask.class).named("generateTestBuildInfo").configure(task -> {
+            var jarTask = project.getTasks().withType(Jar.class).named("jar").get();
+            String moduleName = (String)jarTask.getManifest().getAttributes().get("Automatic-Module-Name");
+            if (moduleName == null) {
+                moduleName = jarTask.getArchiveBaseName().getOrNull();
+            }
+            if (moduleName != null) {
+                task.getModuleName().set(moduleName);
+            }
             var propertiesExtension = project.getExtensions().getByType(PluginPropertiesExtension.class);
             task.getComponentName().set(providerFactory.provider(propertiesExtension::getName));
             task.getOutputFileName().set("plugin-test-build-info.json");