Fix #80: 3) Limit addOpens to test and run tasks only

Author: tlinkowski

README.md

@@ -163,10 +163,11 @@ compileJava {
 
 The following options are supported by the `moduleOptions` extension:
 
-* addModules: Maps to `--add-modules`. Value is of type `List<String>`, e.g, `['com.acme.foo']`.
-* addReads: Maps to `--add-reads`. Value is of type `Map<String, String>`, e.g, `['module1': 'module2']`.
-* addOpens: Maps to `--add-opens`. Value is of type `Map<String, String>`, e.g, `['module1/package': 'module2']`.
-* addExports: Maps to `--add-exports`. Value is of type `Map<String, String>`, e.g, `['module1/package': 'module2']`.
+* `addModules`: Maps to `--add-modules`. Value is of type `List<String>`, e.g, `['com.acme.foo']`.
+* `addReads`: Maps to `--add-reads`. Value is of type `Map<String, String>`, e.g, `['module1': 'module2']`.
+* `addExports`: Maps to `--add-exports`. Value is of type `Map<String, String>`, e.g, `['module1/package': 'module2']`.
+* `addOpens`: Maps to `--add-opens`. Value is of type `Map<String, String>`, e.g, `['module1/package': 'module2']`
+  (available only for `test` and `run` tasks).
 
 Note that multiple entries matching the same left hand side may be added to `addReads`, `addOpens`, and `addExports` but
 no value accumulation is performed, the last entry overrides the previous one. If you need to combine multiple values then
@@ -183,7 +184,7 @@ compileJava {
 }
 ```
 
-Where as the following block resolves to `--add-reads module1=module2,module3`
+Whereas the following block resolves to `--add-reads module1=module2,module3`
 
 ```
 compileJava {

src/main/java/org/javamodularity/moduleplugin/extensions/ModuleOptions.java

@@ -19,7 +19,6 @@ public abstract class ModuleOptions {
     private List<String> addModules = new ArrayList<>();
     private Map<String, String> addReads = new LinkedHashMap<>();
     private Map<String, String> addExports = new LinkedHashMap<>();
-    private Map<String, String> addOpens = new LinkedHashMap<>();
 
     protected ModuleOptions(Project project) {
         this.project = project;
@@ -49,27 +48,22 @@ public void setAddExports(Map<String, String> addExports) {
         this.addExports = addExports;
     }
 
-    public Map<String, String> getAddOpens() {
-        return addOpens;
-    }
-
-    public void setAddOpens(Map<String, String> addOpens) {
-        this.addOpens = addOpens;
-    }
-
     //region MODULE TASK OPTION
     public void mutateArgs(List<String> args) {
-        buildFullOptionStream().forEach(o -> o.mutateArgs(args));
+        buildFullOptionStreamLogged().forEach(o -> o.mutateArgs(args));
     }
 
-    public Stream<TaskOption> buildFullOptionStream() {
+    public Stream<TaskOption> buildFullOptionStreamLogged() {
         LOGGER.debug("Updating module '{}' with...", helper().moduleName());
+        return buildFullOptionStream().peek(option -> LOGGER.debug("  {} {}", option.getFlag(), option.getValue()));
+    }
+
+    protected Stream<TaskOption> buildFullOptionStream() {
         return StreamHelper.concat(
                 addModulesOption().stream(),
                 addReadsOptionStream(),
-                addExportsOptionStream(),
-                addOpensOptionStream()
-        ).peek(option -> LOGGER.debug("  {} {}", option.getFlag(), option.getValue()));
+                addExportsOptionStream()
+        );
     }
 
     private Optional<TaskOption> addModulesOption() {
@@ -87,11 +81,7 @@ private Stream<TaskOption> addExportsOptionStream() {
         return buildOptionStream("--add-exports", addExports);
     }
 
-    private Stream<TaskOption> addOpensOptionStream() {
-        return buildOptionStream("--add-opens", addOpens);
-    }
-
-    private Stream<TaskOption> buildOptionStream(String flag, Map<String, String> map) {
+    protected final Stream<TaskOption> buildOptionStream(String flag, Map<String, String> map) {
         if (map.isEmpty()) {
             return Stream.empty();
         }

src/main/java/org/javamodularity/moduleplugin/extensions/RunModuleOptions.java

@@ -2,7 +2,7 @@
 
 import org.gradle.api.Project;
 
-public class RunModuleOptions extends ModuleOptions {
+public class RunModuleOptions extends RuntimeModuleOptions {
 
     public RunModuleOptions(Project project) {
         super(project);

src/main/java/org/javamodularity/moduleplugin/extensions/RuntimeModuleOptions.java

@@ -0,0 +1,38 @@
+package org.javamodularity.moduleplugin.extensions;
+
+import org.gradle.api.Project;
+import org.javamodularity.moduleplugin.internal.TaskOption;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public abstract class RuntimeModuleOptions extends ModuleOptions {
+
+    private Map<String, String> addOpens = new LinkedHashMap<>();
+
+    public RuntimeModuleOptions(Project project) {
+        super(project);
+    }
+
+    public Map<String, String> getAddOpens() {
+        return addOpens;
+    }
+
+    public void setAddOpens(Map<String, String> addOpens) {
+        this.addOpens = addOpens;
+    }
+
+    //region OPTION STREAM
+    protected Stream<TaskOption> buildFullOptionStream() {
+        return Stream.concat(
+                super.buildFullOptionStream(),
+                addOpensOptionStream()
+        );
+    }
+
+    private Stream<TaskOption> addOpensOptionStream() {
+        return buildOptionStream("--add-opens", addOpens);
+    }
+    //endregion
+}

src/main/java/org/javamodularity/moduleplugin/extensions/TestModuleOptions.java

@@ -2,7 +2,7 @@
 
 import org.gradle.api.Project;
 
-public class TestModuleOptions extends ModuleOptions {
+public class TestModuleOptions extends RuntimeModuleOptions {
 
     private boolean runOnClasspath;
 

src/main/java/org/javamodularity/moduleplugin/tasks/JavadocTask.java

@@ -43,7 +43,7 @@ private void addJavadocOptions(Javadoc javadoc, JavadocModuleOptions moduleOptio
         StreamHelper.concat(
                 patchModuleExtension.buildModulePathOption(classpath).stream(),
                 patchModuleExtension.resolvePatched(classpath).buildOptionStream(),
-                moduleOptions.buildFullOptionStream()
+                moduleOptions.buildFullOptionStreamLogged()
         ).forEach(option -> option.mutateOptions(options));
     }