Get more known modules from 'java-module-dependencies' if possible

Author: jjohannes

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoPlugin.java

@@ -33,18 +33,24 @@
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFile;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.plugins.HelpTasksPlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.util.GradleVersion;
 import org.gradlex.javamodule.moduleinfo.tasks.ModuleDescriptorRecommendation;
 
+import java.io.CharArrayReader;
 import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -198,12 +204,40 @@ private void registerTransform(String fileExtension, Project project, ExtraJavaM
                                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (k1, k2) -> k1)).entrySet().stream()
                                 .collect(Collectors.toMap(Map.Entry::getKey, c -> new PublishedMetadata(c.getKey(), c.getValue(), project)))
                 ));
+
+                p.getAdditionalKnownModules().set(extractFromModuleDependenciesPlugin(project));
             });
             t.getFrom().attribute(artifactType, fileExtension).attribute(javaModule, false);
             t.getTo().attribute(artifactType, fileExtension).attribute(javaModule, true);
         });
     }
 
+    private Provider<Map<String, String>> extractFromModuleDependenciesPlugin(Project project) {
+        return project.provider(() -> {
+            Object javaModuleDependencies = project.getExtensions().findByName("javaModuleDependencies");
+            if (javaModuleDependencies == null) {
+                return Collections.emptyMap();
+            }
+            try {
+                Method getModulesProperties = javaModuleDependencies.getClass().getMethod("getModulesProperties");
+                RegularFileProperty file = (RegularFileProperty) getModulesProperties.invoke(javaModuleDependencies);
+                return project.getProviders().fileContents(file).getAsText().map(c -> {
+                    Properties p = new Properties();
+                    try {
+                        p.load(new CharArrayReader(c.toCharArray()));
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                    @SuppressWarnings({"rawtypes", "unchecked"})
+                    Map<String, String> result = (Map) p;
+                    return result;
+                }).getOrElse(Collections.emptyMap());
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
     private Stream<Map.Entry<String, Configuration>> existingComponentsOfInterest(Configuration resolvable, ExtraJavaModuleInfoPluginExtension extension) {
         Set<String> componentsOfInterest = componentsOfInterest(extension);
         if (componentsOfInterest.isEmpty()) {

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

@@ -110,6 +110,9 @@ public interface Parameter extends TransformParameters {
 
         @Input
         MapProperty<String, PublishedMetadata> getRequiresFromMetadata();
+
+        @Input
+        MapProperty<String, String> getAdditionalKnownModules();
     }
 
     @InputArtifact
@@ -493,6 +496,12 @@ private String gaToModuleName(String ga) {
 
     @Nullable
     private String moduleNameFromSharedMapping(String ga) {
+        Optional<String> foundInCustom = getParameters().getAdditionalKnownModules().get().entrySet().stream().filter(
+                e -> e.getValue().equals(ga)).map(Map.Entry::getKey).findFirst();
+        if (foundInCustom.isPresent()) {
+            return foundInCustom.get();
+        }
+
         try {
             Class<?> sharedMappings = Class.forName("org.gradlex.javamodule.dependencies.SharedMappings");
             @SuppressWarnings("unchecked")