Merge branch '3.x' into 4.x

Author: jknack

jooby/src/main/java/io/jooby/Jooby.java

@@ -602,17 +602,6 @@ public Jooby encoder(@NonNull MediaType contentType, @NonNull MessageEncoder enc
     return this;
   }
 
-  /**
-   * Set server to use.
-   *
-   * @param server Web Server.
-   * @return This application.
-   */
-  @NonNull public Jooby install(@NonNull Server server) {
-    this.server = server;
-    return this;
-  }
-
   @NonNull @Override
   public Jooby dispatch(@NonNull Runnable body) {
     router.dispatch(body);
@@ -1119,6 +1108,18 @@ public static void runApp(@NonNull String[] args, @NonNull Supplier<Jooby> provi
     runApp(args, ExecutionMode.DEFAULT, provider);
   }
 
+  /**
+   * Setup default environment, logging (logback or log4j2) and run application.
+   *
+   * @param args Application arguments.
+   * @param provider Application provider.
+   */
+  public static void runApp(
+      @NonNull String[] args, @NonNull Server server, @NonNull Supplier<Jooby> provider) {
+    configurePackage(provider.getClass().getPackage());
+    runApp(args, server, List.of(provider));
+  }
+
   /**
    * Setup default environment, logging (logback or log4j2) and run application.
    *
@@ -1184,7 +1185,23 @@ public static void runApp(
       @NonNull String[] args,
       @NonNull ExecutionMode executionMode,
       @NonNull Supplier<Jooby> provider) {
-    runApp(args, Server.loadServer(), executionMode, List.of(provider));
+    runApp(args, Server.loadServer(), executionMode, provider);
+  }
+
+  /**
+   * Setup default environment, logging (logback or log4j2) and run application.
+   *
+   * @param args Application arguments.
+   * @param executionMode Application execution mode.
+   * @param provider Application provider.
+   */
+  public static void runApp(
+      @NonNull String[] args,
+      @NonNull Server server,
+      @NonNull ExecutionMode executionMode,
+      @NonNull Supplier<Jooby> provider) {
+    configurePackage(provider.getClass().getPackage());
+    runApp(args, server, executionMode, List.of(provider));
   }
 
   /**

modules/jooby-cli/src/main/resources/cli/App.java.hbs

@@ -9,7 +9,6 @@ import io.jooby.OpenAPIModule;
 public class App extends Jooby {
 
   {
-    install(new {{serverClassName}}());
   {{#if openapi}}
     install(new OpenAPIModule());
   {{/if}}
@@ -21,7 +20,6 @@ public class App extends Jooby {
   }
 
   public static void main(final String[] args) {
-    runApp(args, App::new);
+    runApp(args, new {{serverClassName}}(), App::new);
   }
-
 }

modules/jooby-cli/src/main/resources/cli/App.kt.hbs

@@ -8,7 +8,6 @@ import io.jooby.OpenAPIModule
 {{/if}}
 
 class App: Kooby({
-  install({{serverClassName}}())
 {{#if openapi}}
   install(OpenAPIModule())
 {{/if}}
@@ -22,5 +21,5 @@ class App: Kooby({
 })
 
 fun main(args: Array<String>) {
-  runApp(args, ::App)
+  runApp(args, {{serverClassName}}(), ::App)
 }

tests/src/test/java/examples/AppNoInstallServer.java

@@ -0,0 +1,16 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package examples;
+
+import io.jooby.Jooby;
+import io.jooby.jetty.JettyServer;
+
+public class AppNoInstallServer extends Jooby {
+
+  public static void main(String[] args) {
+    runApp(args, new JettyServer(), AppNoInstallServer::new);
+  }
+}

tests/src/test/kotlin/KtMultiApp.kt

@@ -10,6 +10,8 @@ import io.jooby.kt.runApp
 import io.jooby.netty.NettyServer
 
 fun main(args: Array<String>) {
+  runApp(args, NettyServer(), ::FooApp)
+
   runApp(args, NettyServer(), ExecutionMode.DEFAULT, ::BarApp, ::FooApp)
 
   runApp(args, NettyServer(), ::BarApp, ::FooApp)