gradle: fix joobyTestRun

- jooby:run: allow to run on test classpath fix #3086
- simplify/refactor code

Author: jknack

modules/jooby-gradle-plugin/README.md

@@ -0,0 +1,19 @@
+# How to test locally
+
+- First fun `mvn clean install -P gradlePluin`
+- Previous step install plugin in `.m2/repository`
+- Creates a gradle project
+- Go to `settings.gradle` and add these lines
+
+```groovy
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = 'your project name'
+```
+

modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/BaseTask.java

@@ -20,6 +20,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -28,6 +29,7 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.plugins.JavaApplication;
 import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -190,8 +192,8 @@ public class BaseTask extends DefaultTask {
    * @param project Project.
    * @return Java plugin convention.
    */
-  protected @NonNull JavaPluginConvention getJavaConvention(final @NonNull Project project) {
-    return project.getConvention().getPlugin(JavaPluginConvention.class);
+  protected @NonNull JavaPluginExtension getJavaConvention(final @NonNull Project project) {
+    return project.getExtensions().getByType(JavaPluginExtension.class);
   }
 
   /**

modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/JoobyPlugin.java

@@ -31,7 +31,7 @@ private void joobyRun(Project project) {
     Map<String, Object> options = new HashMap<>();
     options.put(Task.TASK_TYPE, RunTask.class);
     options.put(Task.TASK_DEPENDS_ON, "classes");
-    options.put(Task.TASK_NAME, "joobyRun");
+    options.put(Task.TASK_NAME, RunTask.RUN);
     options.put(Task.TASK_DESCRIPTION, "Run, debug and reload applications");
     options.put(Task.TASK_GROUP, "jooby");
     project.getTasks().create(options);
@@ -41,7 +41,7 @@ private void joobyTestRun(Project project) {
     Map<String, Object> options = new HashMap<>();
     options.put(Task.TASK_TYPE, RunTask.class);
     options.put(Task.TASK_DEPENDS_ON, "testClasses");
-    options.put(Task.TASK_NAME, "joobyTestRun");
+    options.put(Task.TASK_NAME, RunTask.TEST_RUN);
     options.put(Task.TASK_DESCRIPTION, "Run, debug and reload applications using test classpath");
     options.put(Task.TASK_GROUP, "jooby");
     project.getTasks().create(options);

modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java

@@ -14,6 +14,7 @@
 import java.util.Scanner;
 import java.util.Set;
 import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
 
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -43,6 +44,9 @@ public class RunTask extends BaseTask {
     System.setProperty("jooby.useShutdownHook", "false");
   }
 
+  public static final String RUN = "joobyRun";
+  public static final String TEST_RUN = "joobyTestRun";
+
   private ProjectConnection connection;
 
   private String mainClass;
@@ -58,8 +62,6 @@ public class RunTask extends BaseTask {
    */
   private Long waitTimeBeforeRestart;
 
-  private boolean useTestScope;
-
   /**
    * Run task.
    *
@@ -69,10 +71,13 @@ public class RunTask extends BaseTask {
   public void run() throws Throwable {
     try {
       Project current = getProject();
-      String[] tasks = current.getGradle().getTaskGraph().getAllTasks().stream()
+
+      var taskList = current.getGradle().getTaskGraph().getAllTasks().stream()
           .map(Task::getName)
-          .filter(name -> !name.equals("joobyRun"))
-          .toArray(String[]::new);
+          .collect(Collectors.toList());
+      boolean useTestScope = taskList.contains(TEST_RUN);
+      taskList.remove(RUN);
+      taskList.remove(TEST_RUN);
 
       List<Project> projects = getProjects();
 
@@ -106,7 +111,7 @@ public void run() throws Throwable {
           BuildLauncher compiler = connection.newBuild()
               .setStandardError(System.err)
               .setStandardOutput(System.out)
-              .forTasks(tasks);
+              .forTasks(taskList.toArray(new String[0]));
 
           compiler.run(new ResultHandler<Void>() {
             @Override public void onComplete(Void result) {
@@ -130,6 +135,7 @@ public void run() throws Throwable {
         getLogger().debug("Adding project: " + project.getName());
 
         List<SourceSet> sourceSet = sourceSet(project, useTestScope);
+
         // main/resources
         sourceSet.stream()
             .flatMap(it-> it.getResources().getSrcDirs().stream())
@@ -291,10 +297,6 @@ public void setWaitTimeBeforeRestart(Long waitTimeBeforeRestart) {
     this.waitTimeBeforeRestart = waitTimeBeforeRestart;
   }
 
-  protected void setUseTestScope(boolean useTestScope) {
-    this.useTestScope = useTestScope;
-  }
-
   /**
    *
    * Shutdown without killing gradle daemon on ENTER KEY.

modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/TestRunTask.java

@@ -1,3 +1,22 @@
 This project exists to easily integrate the maven build and release process with the gradle plugin: `jooby-gradle-plugin`.
 
 It runs at the end of the build lifecycle to ensure dependencies are built before gradle plugin.
+
+# How to test locally
+
+- First fun `mvn clean install -P gradlePluin`
+- Previous step install plugin in `.m2/repository`
+- Creates a gradle project
+- Go to `settings.gradle` and add these lines
+
+```groovy
+pluginManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = 'your project name'
+```