Handle duplicated module names in 'extra-module-info' bridge

jjohannes · jjohannes · commit e31f08268dac · 2024-02-22T09:49:10.000+01:00
Fixes #91
diff --git a/src/main/java/org/gradlex/javamodule/dependencies/internal/bridges/ExtraJavaModuleInfoBridge.java b/src/main/java/org/gradlex/javamodule/dependencies/internal/bridges/ExtraJavaModuleInfoBridge.java
@@ -29,7 +29,7 @@ public class ExtraJavaModuleInfoBridge {
     public static void autoRegisterPatchedModuleMappings(Project project, JavaModuleDependenciesExtension javaModuleDependencies) {
         ExtraJavaModuleInfoPluginExtension extraJavaModuleInfo = project.getExtensions().getByType(ExtraJavaModuleInfoPluginExtension.class);
         javaModuleDependencies.getModuleNameToGA().putAll(extraJavaModuleInfo.getModuleSpecs().map(
-                moduleSpecs -> moduleSpecs.entrySet().stream().collect(Collectors.toMap(ExtraJavaModuleInfoBridge::moduleNameKey, Map.Entry::getKey))));
+                moduleSpecs -> moduleSpecs.entrySet().stream().collect(Collectors.toMap(ExtraJavaModuleInfoBridge::moduleNameKey, Map.Entry::getKey, (a, b) -> b))));
     }
 
     private static String moduleNameKey(Map.Entry<String, ModuleSpec> entry) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class ExtraJavaModuleInfoBridge {`
`29`	`29`	`public static void autoRegisterPatchedModuleMappings(Project project, JavaModuleDependenciesExtension javaModuleDependencies) {`
`30`	`30`	`ExtraJavaModuleInfoPluginExtension extraJavaModuleInfo = project.getExtensions().getByType(ExtraJavaModuleInfoPluginExtension.class);`
`31`	`31`	`javaModuleDependencies.getModuleNameToGA().putAll(extraJavaModuleInfo.getModuleSpecs().map(`
`32`		`- moduleSpecs -> moduleSpecs.entrySet().stream().collect(Collectors.toMap(ExtraJavaModuleInfoBridge::moduleNameKey, Map.Entry::getKey))));`
	`32`	`+ moduleSpecs -> moduleSpecs.entrySet().stream().collect(Collectors.toMap(ExtraJavaModuleInfoBridge::moduleNameKey, Map.Entry::getKey, (a, b) -> b))));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`private static String moduleNameKey(Map.Entry<String, ModuleSpec> entry) {`