Support for addModules in all tasks (#21)

paulbakker · mykyta-protsenko · commit 8087111ec642 · 2018-10-25T15:25:11.000-07:00
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileJavaTaskMutator.java b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileJavaTaskMutator.java
@@ -9,11 +9,18 @@
 class CompileJavaTaskMutator {
 
     static void mutateJavaCompileTask(Project project, JavaCompile compileJava) {
+        ModuleOptions moduleOptions = compileJava.getExtensions().getByType(ModuleOptions.class);
+
         var compilerArgs = new ArrayList<>(compileJava.getOptions().getCompilerArgs());
         compilerArgs.addAll(List.of("--module-path", compileJava.getClasspath().getAsPath()));
 
-        ModuleInfoTestHelper.mutateArgs(project, project.getName(), compilerArgs::add);
+        if(!moduleOptions.getAddModules().isEmpty()) {
+            String addModules = String.join(",", moduleOptions.getAddModules());
+            compilerArgs.add("--add-modules");
+            compilerArgs.add(addModules);
+        }
 
+        ModuleInfoTestHelper.mutateArgs(project, project.getName(), compilerArgs::add);
         compileJava.getOptions().setCompilerArgs(compilerArgs);
         compileJava.setClasspath(project.files());
     }
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTask.java
@@ -9,6 +9,8 @@ public class CompileTask {
     public void configureCompileJava(Project project) {
         JavaCompile compileJava = (JavaCompile) project.getTasks().findByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
         if (compileJava != null) {
+            compileJava.getExtensions().create("moduleOptions", ModuleOptions.class, project);
+
             compileJava.doFirst(task -> CompileJavaTaskMutator.mutateJavaCompileTask(project, compileJava));
         }
     }
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java
@@ -15,7 +15,7 @@ public class CompileTestTask {
     public void configureCompileTestJava(Project project, String moduleName) {
         JavaCompile compileTestJava = (JavaCompile) project.getTasks().findByName(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME);
         JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class);
-
+        compileTestJava.getExtensions().create("moduleOptions", ModuleOptions.class, project);
         SourceSet testSourceSet = javaConvention.getSourceSets().getByName(SourceSet.TEST_SOURCE_SET_NAME);
 
         compileTestJava.doFirst(task -> {
@@ -31,6 +31,13 @@ public void configureCompileTestJava(Project project, String moduleName) {
                         "--add-reads", moduleName + "=" + testEngine.moduleName));
             });
 
+            ModuleOptions moduleOptions = compileTestJava.getExtensions().getByType(ModuleOptions.class);
+            if(!moduleOptions.getAddModules().isEmpty()) {
+                String addModules = String.join(",", moduleOptions.getAddModules());
+                args.add("--add-modules");
+                args.add(addModules);
+            }
+
             ModuleInfoTestHelper.mutateArgs(project, moduleName, args::add);
 
             compileTestJava.getOptions().setCompilerArgs(args);
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/JavadocTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/JavadocTask.java
@@ -10,9 +10,19 @@ public void configureJavaDoc(Project project) {
         Javadoc javadoc = (Javadoc) project.getTasks().findByName(JavaPlugin.JAVADOC_TASK_NAME);
         if (javadoc != null) {
 
+            javadoc.getExtensions().create("moduleOptions", ModuleOptions.class, project);
+
             javadoc.doFirst(task -> {
+                ModuleOptions moduleOptions = javadoc.getExtensions().getByType(ModuleOptions.class);
+
                 CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
                 options.addStringOption("-module-path", javadoc.getClasspath().getAsPath());
+
+                if(!moduleOptions.getAddModules().isEmpty()) {
+                    String addModules = String.join(",", moduleOptions.getAddModules());
+                    options.addStringOption("-add-module", addModules);
+                }
+
                 javadoc.setClasspath(project.files());
             });
 
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleOptions.java b/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleOptions.java
@@ -0,0 +1,20 @@
+package org.javamodularity.moduleplugin.tasks;
+
+import org.gradle.api.Project;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModuleOptions {
+    private List<String> addModules = new ArrayList<>();
+
+    public ModuleOptions(Project project) {}
+
+    public List<String> getAddModules() {
+        return addModules;
+    }
+
+    public void setAddModules(List<String> addModules) {
+        this.addModules = addModules;
+    }
+}
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/RunTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/RunTask.java
@@ -25,6 +25,7 @@ public void configureRun(Project project, String moduleName) {
         project.getPluginManager().withPlugin(ApplicationPlugin.APPLICATION_PLUGIN_NAME, plugin -> {
             if (project.getPlugins().hasPlugin("application")) {
                 JavaExec execTask = (JavaExec) project.getTasks().findByName(ApplicationPlugin.TASK_RUN_NAME);
+                execTask.getExtensions().create("moduleOptions", ModuleOptions.class, project);
                 updateJavaExecTask(execTask, moduleName);
                 updateStartScriptsTask(project, execTask, moduleName);
             }
@@ -42,6 +43,14 @@ private void updateStartScriptsTask(Project project, JavaExec execTask, String m
             );
 
             var jvmArgs = new ArrayList<String>();
+
+            ModuleOptions moduleOptions = execTask.getExtensions().getByType(ModuleOptions.class);
+            System.out.println("ModuleOptions: " + moduleOptions);
+            if(!moduleOptions.getAddModules().isEmpty()) {
+                String addModules = String.join(",", moduleOptions.getAddModules());
+                jvmArgs.add("--add-modules");
+                jvmArgs.add(addModules);
+            }
             startScriptsTask.getDefaultJvmOpts().forEach(jvmArgs::add);
             jvmArgs.addAll(moduleJvmArgs);
 
@@ -65,9 +74,19 @@ private void updateJavaExecTask(JavaExec execTask, String moduleName) {
             );
 
             var jvmArgs = new ArrayList<String>();
+
+            ModuleOptions moduleOptions = execTask.getExtensions().getByType(ModuleOptions.class);
+            if(!moduleOptions.getAddModules().isEmpty()) {
+                String addModules = String.join(",", moduleOptions.getAddModules());
+                jvmArgs.add("--add-modules");
+                jvmArgs.add(addModules);
+            }
+
             jvmArgs.addAll(execTask.getJvmArgs());
             jvmArgs.addAll(moduleJvmArgs);
 
+
+
             execTask.setJvmArgs(jvmArgs);
 
         });
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/TestModuleOptions.java b/src/main/java/org/javamodularity/moduleplugin/tasks/TestModuleOptions.java
@@ -2,11 +2,12 @@
 
 import org.gradle.api.Project;
 
-public class TestModuleOptions {
+public class TestModuleOptions extends ModuleOptions {
 
     private boolean runOnClasspath;
 
     public TestModuleOptions(Project project) {
+        super(project);
     }
 
     public boolean isRunOnClasspath() {
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java
@@ -42,6 +42,12 @@ public void configureTestJava(Project project, String moduleName) {
                     "--add-modules", "ALL-MODULE-PATH"
             ));
 
+            if(!testModuleOptions.getAddModules().isEmpty()) {
+                String addModules = String.join(",", testModuleOptions.getAddModules());
+                args.add("--add-modules");
+                args.add(addModules);
+            }
+
             TestEngine.select(project).ifPresent(testEngine -> {
                 args.addAll(List.of("--add-reads", moduleName + "=" + testEngine.moduleName));
 
diff --git a/src/test/java/org/javamodularity/moduleplugin/tasks/CompileJavaTaskMutatorTest.java b/src/test/java/org/javamodularity/moduleplugin/tasks/CompileJavaTaskMutatorTest.java
@@ -20,6 +20,7 @@ void mutateJavaCompileTask() {
         Project project = ProjectBuilder.builder().withProjectDir(new File("test-project/")).build();
         project.getPlugins().apply("java");
         final JavaCompile compileJava = (JavaCompile) project.getTasks().findByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
+        compileJava.getExtensions().create("moduleOptions", ModuleOptions.class, project);
 
         // when
         CompileJavaTaskMutator.mutateJavaCompileTask(project, compileJava);
diff --git a/test-project/greeter.runner/build.gradle b/test-project/greeter.runner/build.gradle
@@ -11,6 +11,10 @@ dependencies {
 mainClassName = "$moduleName/examples.Runner"
 
 run {
+    moduleOptions {
+        addModules = ['java.sql']
+    }
+
     jvmArgs = [
             "-XX:+PrintGCDetails"
     ]
diff --git a/test-project/greeter.runner/src/main/java/examples/Runner.java b/test-project/greeter.runner/src/main/java/examples/Runner.java
@@ -8,5 +8,10 @@ public class Runner {
     public static void main(String[] args) {
         Greeter greeter = ServiceLoader.load(Greeter.class).findFirst().orElseThrow(() -> new RuntimeException("No Greeter found!"));
         System.out.println(greeter.hello());
+
+        ModuleLayer.boot().modules().stream()
+                .map(Module::getName)
+                .filter(m -> m.equals("java.sql"))
+                .findAny().orElseThrow(() -> new RuntimeException("Expected module java.sql not found"));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public class CompileTask {`
`9`	`9`	`public void configureCompileJava(Project project) {`
`10`	`10`	`JavaCompile compileJava = (JavaCompile) project.getTasks().findByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);`
`11`	`11`	`if (compileJava != null) {`
	`12`	`+ compileJava.getExtensions().create("moduleOptions", ModuleOptions.class, project);`
	`13`	`+`
`12`	`14`	`compileJava.doFirst(task -> CompileJavaTaskMutator.mutateJavaCompileTask(project, compileJava));`
`13`	`15`	`}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@`
`2`	`2`
`3`	`3`	`import org.gradle.api.Project;`
`4`	`4`
`5`		`-public class TestModuleOptions {`
	`5`	`+public class TestModuleOptions extends ModuleOptions {`
`6`	`6`
`7`	`7`	`private boolean runOnClasspath;`
`8`	`8`
`9`	`9`	`public TestModuleOptions(Project project) {`
	`10`	`+ super(project);`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`public boolean isRunOnClasspath() {`