rename maven and gradle plugin + support server.port

Author: jknack

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

@@ -24,8 +24,10 @@
 
 public class JoobyPlugin implements Plugin<Project> {
   @Override public void apply(Project project) {
+    project.getExtensions().create("joobyRun", RunTaskConfig.class);
+
     Map<String, Object> options = new HashMap<>();
-    options.put(Task.TASK_TYPE, JoobyRun.class);
+    options.put(Task.TASK_TYPE, RunTask.class);
     options.put(Task.TASK_DEPENDS_ON, "classes");
     options.put(Task.TASK_NAME, "joobyRun");
     options.put(Task.TASK_DESCRIPTION, "Run, debug and hot reload applications");

…/main/java/io/jooby/gradle/JoobyRun.java …c/main/java/io/jooby/gradle/RunTask.javamodules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/JoobyRun.java renamed to modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/JoobyRun.java renamed to modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/RunTask.java

@@ -16,10 +16,8 @@
 package io.jooby.gradle;
 
 import io.jooby.run.HotSwap;
-import org.gradle.StartParameter;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
@@ -44,24 +42,19 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-public class JoobyRun extends DefaultTask {
+public class RunTask extends DefaultTask {
 
   static {
     System.setProperty("jooby.useShutdownHook", "false");
   }
 
-  private String executionMode = "DEFAULT";
-
-  private List<String> restartExtensions = Arrays.asList("conf", "properties", "class");
-
-  private List<String> compileExtensions = Arrays.asList("java", "kt");
-
   private ProjectConnection connection;
 
   @TaskAction
   public void run() throws Throwable {
     try {
       Project current = getProject();
+      RunTaskConfig config = current.getExtensions().getByType(RunTaskConfig.class);
       List<Project> projects = Arrays.asList(current);
 
       String mainClass = projects.stream()
@@ -71,7 +64,8 @@ public void run() throws Throwable {
           .orElseThrow(() -> new IllegalArgumentException(
               "Application class not found. Did you forget to set `mainClassName`?"));
 
-      HotSwap hotSwap = new HotSwap(current.getName(), mainClass, executionMode);
+      HotSwap hotSwap = new HotSwap(current.getName(), mainClass, config.getExecutionMode());
+      hotSwap.setPort(config.getPort());
 
       connection = GradleConnector.newConnector()
           .useInstallation(current.getGradle().getGradleHomeDir())
@@ -89,7 +83,7 @@ public void run() throws Throwable {
       }));
 
       BiConsumer<String, Path> onFileChanged = (event, path) -> {
-        if (isCompileExtension(path)) {
+        if (config.isCompileExtension(path)) {
           compiler.run(new ResultHandler<Void>() {
             @Override public void onComplete(Void result) {
               getLogger().debug("Restarting application on file change: " + path);
@@ -100,7 +94,7 @@ public void run() throws Throwable {
               getLogger().debug("Compilation error found: " + path);
             }
           });
-        } else if (isRestartExtension(path)) {
+        } else if (config.isRestartExtension(path)) {
           getLogger().debug("Restarting application on file change: " + path);
           hotSwap.restart();
         } else {
@@ -187,41 +181,4 @@ private SourceSet sourceSet(final Project project) {
   public JavaPluginConvention getJavaConvention(final Project project) {
     return project.getConvention().getPlugin(JavaPluginConvention.class);
   }
-
-  private boolean isCompileExtension(Path path) {
-    return containsExtension(compileExtensions, path);
-  }
-
-  private boolean isRestartExtension(Path path) {
-    return containsExtension(restartExtensions, path);
-  }
-
-  private boolean containsExtension(List<String> extensions, Path path) {
-    String filename = path.getFileName().toString();
-    return extensions.stream().anyMatch(ext -> filename.endsWith("." + ext));
-  }
-
-  public String getExecutionMode() {
-    return executionMode;
-  }
-
-  public void setExecutionMode(String executionMode) {
-    this.executionMode = executionMode;
-  }
-
-  public List<String> getRestartExtensions() {
-    return restartExtensions;
-  }
-
-  public void setRestartExtensions(List<String> restartExtensions) {
-    this.restartExtensions = restartExtensions;
-  }
-
-  public List<String> getCompileExtensions() {
-    return compileExtensions;
-  }
-
-  public void setCompileExtensions(List<String> compileExtensions) {
-    this.compileExtensions = compileExtensions;
-  }
 }

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

@@ -0,0 +1,76 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.gradle;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+public class RunTaskConfig {
+
+  private String executionMode = "DEFAULT";
+
+  private List<String> restartExtensions = Arrays.asList("conf", "properties", "class");
+
+  private List<String> compileExtensions = Arrays.asList("java", "kt");
+
+  private int port = 8080;
+
+  public int getPort() {
+    return port;
+  }
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
+  public String getExecutionMode() {
+    return executionMode;
+  }
+
+  public void setExecutionMode(String executionMode) {
+    this.executionMode = executionMode;
+  }
+
+  public List<String> getRestartExtensions() {
+    return restartExtensions;
+  }
+
+  public void setRestartExtensions(List<String> restartExtensions) {
+    this.restartExtensions = restartExtensions;
+  }
+
+  public List<String> getCompileExtensions() {
+    return compileExtensions;
+  }
+
+  public void setCompileExtensions(List<String> compileExtensions) {
+    this.compileExtensions = compileExtensions;
+  }
+
+  public boolean isCompileExtension(Path path) {
+    return containsExtension(compileExtensions, path);
+  }
+
+  public boolean isRestartExtension(Path path) {
+    return containsExtension(restartExtensions, path);
+  }
+
+  private boolean containsExtension(List<String> extensions, Path path) {
+    String filename = path.getFileName().toString();
+    return extensions.stream().anyMatch(ext -> filename.endsWith("." + ext));
+  }
+}

…c/main/java/io/jooby/maven/JoobyRun.java …rc/main/java/io/jooby/maven/RunMojo.javamodules/jooby-maven-plugin/src/main/java/io/jooby/maven/JoobyRun.java renamed to modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java modules/jooby-maven-plugin/src/main/java/io/jooby/maven/JoobyRun.java renamed to modules/jooby-maven-plugin/src/main/java/io/jooby/maven/RunMojo.java

@@ -54,7 +54,7 @@
 
 @Mojo(name = "run", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST)
 @Execute(phase = LifecyclePhase.TEST)
-public class JoobyRun extends AbstractMojo {
+public class RunMojo extends AbstractMojo {
 
   static {
     System.setProperty("jooby.useShutdownHook", "false");
@@ -66,14 +66,17 @@ public class JoobyRun extends AbstractMojo {
   private String mainClass;
 
   @Parameter(defaultValue = "${application.mode}")
-  private String executionMode;
+  private String executionMode = "DEFAULT";
 
   @Parameter(defaultValue = "conf,properties,class")
   private List<String> restartExtensions;
 
   @Parameter(defaultValue = "java,kt")
   private List<String> compileExtensions;
 
+  @Parameter(defaultValue = "${server.port}")
+  private int port = 8080;
+
   @Parameter(defaultValue = "${session}", required = true, readonly = true)
   private MavenSession session;
 
@@ -95,13 +98,11 @@ public class JoobyRun extends AbstractMojo {
             .orElseThrow(() -> new MojoExecutionException(
                 "Application class not found. Did you forget to set `application.class`?"));
       }
-      if (executionMode == null) {
-        executionMode = "DEFAULT";
-      }
       getLog().debug("Found `" + APP_CLASS + "`: " + mainClass);
 
       HotSwap hotSwap = new HotSwap(session.getCurrentProject().getArtifactId(), mainClass,
           executionMode);
+      hotSwap.setPort(port);
 
       Runtime.getRuntime().addShutdownHook(new Thread(hotSwap::shutdown));
 
@@ -155,13 +156,7 @@ public class JoobyRun extends AbstractMojo {
     } catch (MojoExecutionException | MojoFailureException x) {
       throw x;
     } catch (Exception x) {
-      Throwable cause;
-      if (x instanceof InvocationTargetException) {
-        cause = x.getCause();
-      } else {
-        cause = x;
-      }
-      throw new MojoFailureException("jooby-run resulted in exception", cause);
+      throw new MojoFailureException("jooby-run resulted in exception", x);
     }
   }
 

modules/jooby-run/src/main/java/io/jooby/run/HotSwap.java

@@ -88,13 +88,15 @@ private static class AppModule {
     private Module module;
     private Server server;
     private ClassLoader contextClassLoader;
+    private int port;
 
     public AppModule(Logger logger, ExtModuleLoader loader, String projectName, String mainClass,
-        String executionMode, ClassLoader contextClassLoader) {
+        int port, String executionMode, ClassLoader contextClassLoader) {
       this.logger = logger;
       this.loader = loader;
       this.projectName = projectName;
       this.mainClass = mainClass;
+      this.port = port;
       this.executionMode = executionMode;
       this.contextClassLoader = contextClassLoader;
     }
@@ -113,10 +115,11 @@ public void start() {
 
         Class appClass = classLoader.loadClass(mainClass);
         Enum executionModeValue = Enum.valueOf(executionModeClass, executionMode.toUpperCase());
-        App app = new App(createApp.invoke(null, new String[0], executionModeValue, appClass));
+        App app = new App(createApp
+            .invoke(null, new String[]{"server.port=" + port}, executionModeValue, appClass));
         server = app.start();
       } catch (Exception x) {
-        logger.error("Unable to start: {}", mainClass, withoutReflection(x));
+        logger.error("execution of {} resulted in exception", mainClass, withoutReflection(x));
       } finally {
         Thread.currentThread().setContextClassLoader(contextClassLoader);
       }
@@ -133,11 +136,12 @@ public void close() {
     }
 
     private Throwable withoutReflection(Throwable cause) {
-      while(cause instanceof ReflectiveOperationException) {
+      while (cause instanceof ReflectiveOperationException) {
         cause = cause.getCause();
       }
       return cause;
     }
+
     private void unloadModule() {
       try {
         if (module != null) {
@@ -181,6 +185,8 @@ private void closeServer() {
 
   private AppModule module;
 
+  private int port = 8080;
+
   public HotSwap(String projectName, String mainClass, String executionMode) {
     this.projectName = projectName;
     if (mainClass.endsWith("Kt")) {
@@ -222,7 +228,7 @@ public void start() throws Exception {
       ModuleFinder[] finders = {new FlattenClasspath(projectName, resources, dependencies)};
 
       ExtModuleLoader loader = new ExtModuleLoader(finders);
-      module = new AppModule(logger, loader, projectName, mainClass, executionMode,
+      module = new AppModule(logger, loader, projectName, mainClass, port, executionMode,
           Thread.currentThread().getContextClassLoader());
       module.start();
       watcher.watch();
@@ -231,6 +237,14 @@ public void start() throws Exception {
     }
   }
 
+  public int getPort() {
+    return port;
+  }
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
   public void restart() {
     module.restart();
   }