issue #200: createMergedModule fails with synthetic Service Providers

beryx · Oct 20, 2021 · 4d93b09 · 4d93b09
1 parent 467b9b6
commit 4d93b09
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/data/ModuleInfo.groovy b/src/main/groovy/org/beryx/jlink/data/ModuleInfo.groovy
@@ -150,7 +150,7 @@ class ModuleInfo implements Serializable {
         final String service
 
         UsesBuilder(String service) {
-            this.service = service.replace('$', '.')
+            this.service = adjustQualifiedName(service)
         }
 
         @Override
@@ -185,12 +185,12 @@ class ModuleInfo implements Serializable {
         final TreeSet<String> implementations = new TreeSet<>()
 
         ProvidesBuilder(String service) {
-            this.service = service.replace('$', '.')
+            this.service = adjustQualifiedName(service)
         }
 
         ProvidesBuilder with(String... implementations) {
             for(s in implementations) {
-                this.implementations.add(s.replace('$', '.'))
+                this.implementations.add(adjustQualifiedName(s))
             }
             this
         }
@@ -241,4 +241,12 @@ class ModuleInfo implements Serializable {
         for(builder in providesBuilders) { entries << blanks + builder.toString(language)}
         entries.join('\n')
     }
+
+    private static String adjustQualifiedName(String s) {
+        int idx = s.indexOf('.$')
+        String notAdjusted = (idx < 0) ? '' : s.substring(idx)
+        String toAdjust =  (idx < 0) ? s : s.substring(0, idx)
+        String adjusted = toAdjust.replaceAll('([^.])\\$', '$1.')
+        return adjusted + notAdjusted
+    }
 }