output api: make sure outputfactory is accessible while creating the application

Author: jknack

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

@@ -87,6 +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 RouterImpl router;
 
@@ -132,6 +133,14 @@ 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());
+      }
     } else {
       copyState(owner, this);
     }
@@ -857,12 +866,6 @@ public BufferedOutputFactory getOutputFactory() {
     return router.getOutputFactory();
   }
 
-  @NonNull @Override
-  public Jooby setOutputFactory(@NonNull BufferedOutputFactory outputFactory) {
-    router.setOutputFactory(outputFactory);
-    return this;
-  }
-
   @NonNull @Override
   public Jooby setHiddenMethod(@NonNull Function<Context, Optional<String>> provider) {
     router.setHiddenMethod(provider);
@@ -1210,8 +1213,7 @@ public static void runApp(
     var apps = new ArrayList<Jooby>();
     var targetServer = server.getLoggerOff().isEmpty() ? server : MutedServer.mute(server);
     for (var factory : provider) {
-      var app = createApp(executionMode, factory);
-      app.server = targetServer;
+      var app = createApp(server, executionMode, factory);
       /*
        When running a single app instance, there is no issue with server options, when multiple
        apps set options a warning will be printed
@@ -1248,7 +1250,9 @@ public static void runApp(
    * @return Application.
    */
   public static Jooby createApp(
-      @NonNull ExecutionMode executionMode, @NonNull Supplier<Jooby> provider) {
+      @NonNull Server server,
+      @NonNull ExecutionMode executionMode,
+      @NonNull Supplier<Jooby> provider) {
     configurePackage(provider.getClass().getPackage());
     /* Find application.env: */
     String logfile =
@@ -1261,7 +1265,8 @@ public static Jooby createApp(
 
     Jooby app;
     try {
-      BOOT_EXECUTION_MODE = executionMode;
+      Jooby.BOOT_SERVER = server;
+      Jooby.BOOT_EXECUTION_MODE = executionMode;
       app = provider.get();
     } catch (Throwable t) {
       LoggerFactory.getLogger(Jooby.class)
@@ -1271,7 +1276,8 @@ public static Jooby createApp(
           ? (StartupException) t
           : new StartupException("Application initialization resulted in exception", t);
     } finally {
-      BOOT_EXECUTION_MODE = ExecutionMode.DEFAULT;
+      Jooby.BOOT_EXECUTION_MODE = executionMode;
+      Jooby.BOOT_SERVER = null;
     }
 
     return app;
@@ -1426,5 +1432,6 @@ private static void copyState(Jooby source, Jooby dest) {
     dest.readyCallbacks = source.readyCallbacks;
     dest.startingCallbacks = source.startingCallbacks;
     dest.stopCallbacks = source.stopCallbacks;
+    dest.server = source.server;
   }
 }

jooby/src/main/java/io/jooby/Router.java

@@ -504,8 +504,6 @@ default Object execute(@NonNull Context context) {
 
   @NonNull BufferedOutputFactory getOutputFactory();
 
-  @NonNull Router setOutputFactory(@NonNull BufferedOutputFactory outputFactory);
-
   /**
    * Attach a filter to the route pipeline.
    *

jooby/src/main/java/io/jooby/Server.java

@@ -28,6 +28,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.MutedServer;
 
@@ -158,6 +159,8 @@ public Server setOptions(@NonNull ServerOptions options) {
     protected abstract ServerOptions defaultOptions();
   }
 
+  @NonNull BufferedOutputFactory getOutputFactory();
+
   /**
    * Set server options. This method should be called once, calling this method multiple times will
    * print a warning.

jooby/src/main/java/io/jooby/buffer/ByteBufferOutputFactory.java

@@ -8,7 +8,6 @@
 import java.nio.ByteBuffer;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.internal.buffer.ByteArrayWrappedOutput;
 import io.jooby.internal.buffer.ByteBufferOutput;
 import io.jooby.internal.buffer.ByteBufferWrappedOutput;
 import io.jooby.internal.buffer.CompsiteByteBufferOutput;
@@ -54,7 +53,7 @@ public BufferedOutput wrap(@NonNull ByteBuffer buffer) {
 
   @Override
   public BufferedOutput wrap(@NonNull byte[] bytes) {
-    return new ByteArrayWrappedOutput(bytes);
+    return new ByteBufferWrappedOutput(ByteBuffer.wrap(bytes));
   }
 
   @Override

jooby/src/main/java/io/jooby/internal/MutedServer.java

@@ -16,6 +16,7 @@
 import io.jooby.LoggingService;
 import io.jooby.Server;
 import io.jooby.ServerOptions;
+import io.jooby.buffer.BufferedOutputFactory;
 
 public class MutedServer implements Server {
   private Server delegate;
@@ -30,6 +31,11 @@ private MutedServer(Server server, LoggingService loggingService, List<String> m
     this.mute = mute;
   }
 
+  @NonNull @Override
+  public BufferedOutputFactory getOutputFactory() {
+    return delegate.getOutputFactory();
+  }
+
   /**
    * Muted a server when need it.
    *

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -170,7 +170,7 @@ public Stack executor(Executor executor) {
 
   private ValueFactory valueFactory = new ValueFactory();
 
-  private BufferedOutputFactory outputFactory = BufferedOutputFactory.create();
+  private BufferedOutputFactory outputFactory;
 
   public RouterImpl() {
     stack.addLast(new Stack(chi, null));
@@ -436,10 +436,8 @@ public BufferedOutputFactory getOutputFactory() {
     return outputFactory;
   }
 
-  @NonNull @Override
-  public Router setOutputFactory(@NonNull BufferedOutputFactory outputFactory) {
+  public void setOutputFactory(@NonNull BufferedOutputFactory outputFactory) {
     this.outputFactory = outputFactory;
-    return this;
   }
 
   @NonNull @Override

jooby/src/main/java/io/jooby/internal/buffer/ByteArrayWrappedOutput.java

@@ -13,12 +13,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.jooby.buffer.BufferedOutputFactory;
+
 public class Issue3653 {
 
   private static final ServerOptions defaultOptions = new ServerOptions();
 
   private static class TestServer extends Server.Base {
 
+    @NotNull @Override
+    public BufferedOutputFactory getOutputFactory() {
+      return null;
+    }
+
     @Override
     protected ServerOptions defaultOptions() {
       return defaultOptions;

jooby/src/test/java/io/jooby/Issue3653.java

@@ -16,7 +16,7 @@
 import io.netty.buffer.Unpooled;
 import io.netty.util.ResourceLeakDetector;
 
-public class NettyOutputFactory implements BufferedOutputFactory {
+public class NettyBufferedOutputFactory implements BufferedOutputFactory {
   private static final String LEAK_DETECTION = "io.netty.leakDetection.level";
 
   static {
@@ -30,7 +30,7 @@ public class NettyOutputFactory implements BufferedOutputFactory {
   private final ByteBufAllocator allocator;
   private BufferOptions options;
 
-  public NettyOutputFactory(ByteBufAllocator allocator, BufferOptions options) {
+  public NettyBufferedOutputFactory(ByteBufAllocator allocator, BufferOptions options) {
     this.allocator = allocator;
     this.options = options;
   }
@@ -58,22 +58,22 @@ public BufferedOutputFactory setOptions(BufferOptions options) {
 
   @Override
   @NonNull public BufferedOutput wrap(@NonNull ByteBuffer buffer) {
-    return new NettyWrappedOutput(Unpooled.wrappedBuffer(buffer));
+    return new NettyByteBufferWrappedOutput(buffer);
   }
 
   @Override
   public BufferedOutput wrap(@NonNull String value, @NonNull Charset charset) {
-    return new NettyWrappedOutput(Unpooled.wrappedBuffer(value.getBytes(charset)));
+    return new NettyBufferedOutput(Unpooled.wrappedBuffer(value.getBytes(charset)));
   }
 
   @Override
   @NonNull public BufferedOutput wrap(@NonNull byte[] bytes) {
-    return new NettyWrappedOutput(Unpooled.wrappedBuffer(bytes));
+    return new NettyByteArrayWrappedOutput(bytes, 0, bytes.length);
   }
 
   @Override
   @NonNull public BufferedOutput wrap(@NonNull byte[] bytes, int offset, int length) {
-    return new NettyWrappedOutput(Unpooled.wrappedBuffer(bytes, offset, length));
+    return new NettyByteArrayWrappedOutput(bytes, 0, bytes.length);
   }
 
   @Override