Merge pull request #16 from iherasymenko/master

Prevent duplicates in ModuleInfo DSL

Author: jjohannes

README.md

@@ -96,7 +96,6 @@ extraJavaModuleInfo {
        ignoreServiceProvider("org.codehaus.groovy.runtime.ExtensionModule")
        ignoreServiceProvider("org.codehaus.groovy.plugins.Runners")
        ignoreServiceProvider("org.codehaus.groovy.source.Extensions")
-       ignoreServiceProvider("org.codehaus.groovy.source.Extensions")
     }
 }
 ```

src/functionalTest/groovy/de/jjohannes/gradle/javamodules/test/ExtraJavaModuleInfoTest.groovy

@@ -419,7 +419,6 @@ class ExtraJavaModuleInfoTest extends Specification {
                    ignoreServiceProvider("org.codehaus.groovy.runtime.ExtensionModule")
                    ignoreServiceProvider("org.codehaus.groovy.plugins.Runners")
                    ignoreServiceProvider("org.codehaus.groovy.source.Extensions")
-                   ignoreServiceProvider("org.codehaus.groovy.source.Extensions")
                 }
             }
              

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

@@ -200,24 +200,24 @@ private static String[] extractImplementations(byte[] content) {
     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());
-        for (String packageName : moduleInfo.getExports()) {
+        ModuleVisitor moduleVisitor = classWriter.visitModule(moduleInfo.moduleName, Opcodes.ACC_OPEN, moduleInfo.moduleVersion);
+        for (String packageName : moduleInfo.exports) {
             moduleVisitor.visitExport(packageName.replace('.', '/'), 0);
         }
         moduleVisitor.visitRequire("java.base", 0, null);
-        for (String requireName : moduleInfo.getRequires()) {
+        for (String requireName : moduleInfo.requires) {
             moduleVisitor.visitRequire(requireName, 0, null);
         }
-        for (String requireName : moduleInfo.getRequiresTransitive()) {
+        for (String requireName : moduleInfo.requiresTransitive) {
             moduleVisitor.visitRequire(requireName, Opcodes.ACC_TRANSITIVE, null);
         }
-        for (String requireName : moduleInfo.getRequiresStatic()) {
+        for (String requireName : moduleInfo.requiresStatic) {
             moduleVisitor.visitRequire(requireName, Opcodes.ACC_STATIC_PHASE, null);
         }
         for (Map.Entry<String, String[]> entry : providers.entrySet()) {
             String name = entry.getKey();
             String[] implementations = entry.getValue();
-            if (!moduleInfo.getIgnoredServiceProviders().contains(name)) {
+            if (!moduleInfo.ignoreServiceProviders.contains(name)) {
                 moduleVisitor.visitProvide(name.replace('.', '/'), implementations);
             }
         }

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

@@ -16,74 +16,51 @@
 package de.jjohannes.gradle.javamodules;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
  * Data class to hold the information that should be added as module-info.class to an existing Jar file.
  */
 public class ModuleInfo implements Serializable {
-    private String moduleName;
-    private String moduleVersion;
-    private List<String> exports = new ArrayList<>();
-    private List<String> requires = new ArrayList<>();
-    private List<String> requiresTransitive = new ArrayList<>();
-    private List<String> requiresStatic = new ArrayList<>();
-    private Set<String> ignoredServiceProviders = new LinkedHashSet<>();
+
+    final String moduleName;
+    final String moduleVersion;
+    final Set<String> exports = new LinkedHashSet<>();
+    final Set<String> requires = new LinkedHashSet<>();
+    final Set<String> requiresTransitive = new LinkedHashSet<>();
+    final Set<String> requiresStatic = new LinkedHashSet<>();
+    final Set<String> ignoreServiceProviders = new LinkedHashSet<>();
 
     ModuleInfo(String moduleName, String moduleVersion) {
         this.moduleName = moduleName;
         this.moduleVersion = moduleVersion;
     }
 
     public void exports(String exports) {
-        this.exports.add(exports);
+        addOrThrow(this.exports, exports);
     }
 
     public void requires(String requires) {
-        this.requires.add(requires);
+        addOrThrow(this.requires, requires);
     }
 
     public void requiresTransitive(String requiresTransitive) {
-        this.requiresTransitive.add(requiresTransitive);
+        addOrThrow(this.requiresTransitive, requiresTransitive);
     }
 
     public void requiresStatic(String requiresStatic) {
-        this.requiresStatic.add(requiresStatic);
+        addOrThrow(this.requiresStatic, requiresStatic);
     }
 
     public void ignoreServiceProvider(String ignoreServiceProvider) {
-        this.ignoredServiceProviders.add(ignoreServiceProvider);
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    protected String getModuleVersion() {
-        return moduleVersion;
-    }
-
-    protected List<String> getExports() {
-        return exports;
-    }
-
-    protected List<String> getRequires() {
-        return requires;
-    }
-
-    protected List<String> getRequiresTransitive() {
-        return requiresTransitive;
-    }
-
-    protected List<String> getRequiresStatic() {
-        return requiresStatic;
+        addOrThrow(this.ignoreServiceProviders, ignoreServiceProvider);
     }
 
-    protected Set<String> getIgnoredServiceProviders() {
-        return ignoredServiceProviders;
+    private static void addOrThrow(Set<String> target, String element) {
+        if (!target.add(element)) {
+            throw new IllegalArgumentException("The element '" + element + "' is already specified");
+        }
     }
 
 }