server: remove server from application

- we just need the buffered factory

Author: jknack

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

@@ -87,7 +87,7 @@ public class Jooby implements Router, Registry {
 
   private static Jooby owner;
   private static ExecutionMode BOOT_EXECUTION_MODE = ExecutionMode.DEFAULT;
-  private static Server BOOT_SERVER;
+  private static BufferedOutputFactory BUFFER_FACTORY;
 
   private RouterImpl router;
 
@@ -121,8 +121,6 @@ public class Jooby implements Router, Registry {
 
   private String version;
 
-  private Server server;
-
   /** Creates a new Jooby instance. */
   public Jooby() {
     if (owner == null) {
@@ -133,14 +131,10 @@ public Jooby() {
       startingCallbacks = new ArrayList<>();
       readyCallbacks = new ArrayList<>();
       lateExtensions = new ArrayList<>();
-      server = BOOT_SERVER;
-      if (server != null) {
-        router.setOutputFactory(server.getOutputFactory());
-      } else {
-        // NOTE: fallback to default, this is required for direct instance creation of class
-        // app bootstrap always ensures server instance.
-        router.setOutputFactory(BufferedOutputFactory.create());
-      }
+      // NOTE: fallback to default, this is required for direct instance creation of class
+      // app bootstrap always ensures server instance.
+      router.setOutputFactory(
+          Optional.ofNullable(BUFFER_FACTORY).orElseGet(BufferedOutputFactory::create));
     } else {
       copyState(owner, this);
     }
@@ -1311,12 +1305,12 @@ public static Jooby createApp(
 
     Jooby app;
     try {
-      Jooby.BOOT_SERVER = server;
+      Jooby.BUFFER_FACTORY = server.getOutputFactory();
       Jooby.BOOT_EXECUTION_MODE = executionMode;
       app = provider.get();
     } finally {
       Jooby.BOOT_EXECUTION_MODE = executionMode;
-      Jooby.BOOT_SERVER = null;
+      Jooby.BUFFER_FACTORY = null;
     }
 
     return app;
@@ -1452,7 +1446,7 @@ private void joobyRunHook(ClassLoader loader, Server server) {
   }
 
   /**
-   * Copy internal state from one application into other.
+   * Copy the internal state from one application into others.
    *
    * @param source Source application.
    * @param dest Destination application.
@@ -1471,6 +1465,5 @@ private static void copyState(Jooby source, Jooby dest) {
     dest.readyCallbacks = source.readyCallbacks;
     dest.startingCallbacks = source.startingCallbacks;
     dest.stopCallbacks = source.stopCallbacks;
-    dest.server = source.server;
   }
 }

modules/jooby-test/src/main/java/io/jooby/test/JoobyExtension.java

@@ -232,8 +232,7 @@ private int port(int port, int fallback) {
   public void postProcessTestInstance(Object instance, ExtensionContext context) throws Exception {
     for (Field field : instance.getClass().getDeclaredFields()) {
       if (!Modifier.isStatic(field.getModifiers())) {
-        Supplier<Object> injectionPoint =
-            injectionPoint(context, field.getType(), () -> field.getName());
+        Supplier<Object> injectionPoint = injectionPoint(context, field.getType(), field::getName);
         if (injectionPoint != null) {
           field.setAccessible(true);
           field.set(instance, injectionPoint.get());

tests/src/test/java/io/jooby/junit/ServerTestRunner.java

@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.condition.DisabledOnOs;
 
 import io.jooby.*;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.internal.MutedServer;
 import io.jooby.test.WebClient;
 
@@ -89,7 +90,7 @@ public void ready(SneakyThrows.Consumer2<WebClient, WebClient> onReady) {
     Server server = this.server.get(serverOptions);
     String applogger = null;
     try {
-      setBootServer(server);
+      setBufferFactory(server.getOutputFactory());
       System.setProperty("___app_name__", testName);
       System.setProperty("___server_name__", server.getName());
       var app = provider.get();
@@ -141,15 +142,15 @@ public void ready(SneakyThrows.Consumer2<WebClient, WebClient> onReady) {
       } else {
         MutedServer.mute(server).stop();
       }
-      setBootServer(null);
+      setBufferFactory(null);
     }
   }
 
-  private static void setBootServer(Server server) {
+  private static void setBufferFactory(BufferedOutputFactory bufferedOutputFactory) {
     try {
-      var bootServer = Jooby.class.getDeclaredField("BOOT_SERVER");
-      bootServer.setAccessible(true);
-      bootServer.set(null, server);
+      var field = Jooby.class.getDeclaredField("BUFFER_FACTORY");
+      field.setAccessible(true);
+      field.set(null, bufferedOutputFactory);
     } catch (NoSuchFieldException | IllegalAccessException e) {
       throw SneakyThrows.propagate(e);
     }