add execution mode to maven plugin

jknack · jknack · commit be2dc1c3836c · 2019-05-05T20:36:08.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -682,16 +682,6 @@ public static void runApp(@Nonnull String[] args, @Nonnull ExecutionMode executi
     server.join();
   }
 
-  /**
-   * Setup default environment, logging (logback or log4j2) and run application.
-   *
-   * @param applicationType Application type.
-   * @return Application.
-   */
-  public static Jooby createApp(@Nonnull Class<? extends Jooby> applicationType) {
-    return createApp(new String[0], ExecutionMode.DEFAULT, reflectionProvider(applicationType));
-  }
-
   /**
    * Setup default environment, logging (logback or log4j2) and run application.
    *
diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/RunMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/RunMojo.java
@@ -64,6 +64,9 @@ public class RunMojo extends AbstractMojo {
   @Parameter(defaultValue = "${application.class}")
   private String mainClass;
 
+  @Parameter(defaultValue = "${application.mode}")
+  private String executionMode;
+
   @Parameter(defaultValue = "conf,properties,class")
   private List<String> restartExtensions;
 
@@ -90,9 +93,13 @@ public class RunMojo extends AbstractMojo {
             .map(it -> it.getProperties().getProperty(APP_CLASS))
             .orElseThrow(() -> new MojoExecutionException("Application class not found"));
       }
+      if (executionMode == null) {
+        executionMode = "DEFAULT";
+      }
       getLog().debug("Found `" + APP_CLASS + "`: " + mainClass);
 
-      HotSwap hotSwap = new HotSwap(session.getCurrentProject().getArtifactId(), mainClass);
+      HotSwap hotSwap = new HotSwap(session.getCurrentProject().getArtifactId(), mainClass,
+          executionMode);
 
       Runtime.getRuntime().addShutdownHook(new Thread(hotSwap::shutdown));
 
diff --git a/modules/jooby-run/src/main/java/io/jooby/run/HotSwap.java b/modules/jooby-run/src/main/java/io/jooby/run/HotSwap.java
@@ -84,16 +84,18 @@ private static class AppModule {
     private final ExtModuleLoader loader;
     private final String projectName;
     private final String mainClass;
+    private final String executionMode;
     private Module module;
     private Server server;
     private ClassLoader contextClassLoader;
 
     public AppModule(Logger logger, ExtModuleLoader loader, String projectName, String mainClass,
-        ClassLoader contextClassLoader) {
+        String executionMode, ClassLoader contextClassLoader) {
       this.logger = logger;
       this.loader = loader;
       this.projectName = projectName;
       this.mainClass = mainClass;
+      this.executionMode = executionMode;
       this.contextClassLoader = contextClassLoader;
     }
 
@@ -105,10 +107,13 @@ public void start() {
         Thread.currentThread().setContextClassLoader(classLoader);
 
         Class joobyClass = classLoader.loadClass("io.jooby.Jooby");
-        Method createApp = joobyClass.getDeclaredMethod("createApp", Class.class);
+        Class executionModeClass = classLoader.loadClass("io.jooby.ExecutionMode");
+        Method createApp = joobyClass
+            .getDeclaredMethod("createApp", String[].class, executionModeClass, Class.class);
 
         Class appClass = classLoader.loadClass(mainClass);
-        App app = new App(createApp.invoke(null, appClass));
+        Enum executionModeValue = Enum.valueOf(executionModeClass, executionMode.toUpperCase());
+        App app = new App(createApp.invoke(null, new String[0], executionModeValue, appClass));
         server = app.start();
       } catch (Exception x) {
         logger.error("Unable to start: {}", mainClass, x);
@@ -158,6 +163,8 @@ private void closeServer() {
 
   private final String mainClass;
 
+  private final String executionMode;
+
   private final Set<Path> resources = new LinkedHashSet<>();
 
   private final Set<Path> dependencies = new LinkedHashSet<>();
@@ -168,9 +175,10 @@ private void closeServer() {
 
   private AppModule module;
 
-  public HotSwap(String projectName, String mainClass) {
+  public HotSwap(String projectName, String mainClass, String executionMode) {
     this.projectName = projectName;
     this.mainClass = mainClass;
+    this.executionMode = executionMode;
   }
 
   public void addResource(Path path) {
@@ -197,7 +205,7 @@ public void start() throws Exception {
       ModuleFinder[] finders = finders(false);
 
       ExtModuleLoader loader = new ExtModuleLoader(finders);
-      module = new AppModule(logger, loader, projectName, mainClass,
+      module = new AppModule(logger, loader, projectName, mainClass, executionMode,
           Thread.currentThread().getContextClassLoader());
       module.start();
       watcher.watch();
