Merge pull request #10 from iherasymenko/master

Polishing

Author: jjohannes

README.md

@@ -16,7 +16,7 @@ plugins {
     id("de.jjohannes.extra-java-module-info") version "0.5"
 }
 
-// add module information for all direct and transitive depencies that are not modules
+// add module information for all direct and transitive dependencies that are not modules
 extraJavaModuleInfo {
     // failOnMissingModuleInfo.set(false)
     module("commons-beanutils-1.9.4.jar", "org.apache.commons.beanutils", "1.9.4") {
@@ -80,3 +80,7 @@ configurations {
     }
 }
 ```
+
+## How do I add `provides ... with ...` declarations to the `module-info.class` descriptor?
+
+The plugin will automatically retrofit all the available `META-INF/services/*` descriptors into `module-info.class` for you. The `META-INF/services/*` descriptors will be preserved so that a transformed JAR will continue to work if it is placed on the classpath.

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoTransform.java

@@ -33,12 +33,9 @@
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.jar.*;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 
 /**
@@ -144,7 +141,7 @@ private static void addAutomaticModuleName(File originalJar, File moduleJar, Str
     private static void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo moduleInfo) {
         try (JarInputStream inputStream = new JarInputStream(new FileInputStream(originalJar))) {
             try (JarOutputStream outputStream = newJarOutputStream(new FileOutputStream(moduleJar), inputStream.getManifest())) {
-                Map<String, Set<String>> providers = copyAndExtractProviders(inputStream, outputStream);
+                Map<String, String[]> providers = copyAndExtractProviders(inputStream, outputStream);
                 outputStream.putNextEntry(new JarEntry("module-info.class"));
                 outputStream.write(addModuleInfo(moduleInfo, providers));
                 outputStream.closeEntry();
@@ -158,9 +155,9 @@ private static JarOutputStream newJarOutputStream(OutputStream out, Manifest man
         return manifest == null ? new JarOutputStream(out) : new JarOutputStream(out, manifest);
     }
 
-    private static Map<String, Set<String>> copyAndExtractProviders(JarInputStream inputStream, JarOutputStream outputStream) throws IOException {
+    private static Map<String, String[]> copyAndExtractProviders(JarInputStream inputStream, JarOutputStream outputStream) throws IOException {
         JarEntry jarEntry = inputStream.getNextJarEntry();
-        Map<String, Set<String>> providers = new LinkedHashMap<>();
+        Map<String, String[]> providers = new LinkedHashMap<>();
         while (jarEntry != null) {
             byte[] content = inputStream.readAllBytes();
             String entryName = jarEntry.getName();
@@ -175,17 +172,18 @@ private static Map<String, Set<String>> copyAndExtractProviders(JarInputStream i
         return providers;
     }
 
-    private static Set<String> extractImplementations(byte[] content) {
+    private static String[] extractImplementations(byte[] content) {
         return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(content), StandardCharsets.UTF_8))
                 .lines()
                 .map(String::trim)
                 .filter(line -> !line.isEmpty())
                 .filter(line -> !line.startsWith("#"))
                 .map(line -> line.replace('.','/'))
-                .collect(Collectors.toCollection(LinkedHashSet::new));
+                .distinct()
+                .toArray(String[]::new);
     }
 
-    private static byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, Set<String>> providers) {
+    private static byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, String[]> providers) {
         ClassWriter classWriter = new ClassWriter(0);
         classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null);
         ModuleVisitor moduleVisitor = classWriter.visitModule(moduleInfo.getModuleName(), Opcodes.ACC_OPEN, moduleInfo.getModuleVersion());
@@ -202,11 +200,8 @@ private static byte[] addModuleInfo(ModuleInfo moduleInfo, Map<String, Set<Strin
         for (String requireName : moduleInfo.getRequiresStatic()) {
             moduleVisitor.visitRequire(requireName, Opcodes.ACC_STATIC_PHASE, null);
         }
-        for (Map.Entry<String, Set<String>> entry : providers.entrySet()) {
-            String provider = entry.getKey();
-            String[] implementations = entry.getValue()
-                    .toArray(new String[0]);
-            moduleVisitor.visitProvide(provider, implementations);
+        for (Map.Entry<String, String[]> entry : providers.entrySet()) {
+            moduleVisitor.visitProvide(entry.getKey(), entry.getValue());
         }
         moduleVisitor.visitEnd();
         classWriter.visitEnd();