output: remove buffer name from output classes

Author: jknack

jooby/src/main/java/io/jooby/Context.java

@@ -29,11 +29,11 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutput;
-import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.internal.LocaleUtils;
 import io.jooby.internal.ReadOnlyContext;
 import io.jooby.internal.WebSocketSender;
+import io.jooby.output.Output;
+import io.jooby.output.OutputFactory;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -143,7 +143,7 @@ private static Selector single() {
    */
   Router getRouter();
 
-  BufferedOutputFactory getOutputFactory();
+  OutputFactory getOutputFactory();
 
   /**
    * Forward executing to another route. We use the given path to find a matching route.
@@ -1298,7 +1298,7 @@ Context responseWriter(
    * @param output Output.
    * @return This context.
    */
-  Context send(@NonNull BufferedOutput output);
+  Context send(@NonNull Output output);
 
   /**
    * Send response data.

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -26,9 +26,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
 import io.jooby.internal.*;
+import io.jooby.output.OutputFactory;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -690,7 +690,7 @@ default Context sendError(@NonNull Throwable cause, @NonNull StatusCode code) {
   }
 
   @Override
-  default BufferedOutputFactory getOutputFactory() {
+  default OutputFactory getOutputFactory() {
     return getRouter().getOutputFactory();
   }
 }

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -23,9 +23,9 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutput;
-import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
+import io.jooby.output.Output;
+import io.jooby.output.OutputFactory;
 import io.jooby.value.Value;
 import io.jooby.value.ValueFactory;
 
@@ -671,7 +671,7 @@ public Router getRouter() {
   }
 
   @Override
-  public BufferedOutputFactory getOutputFactory() {
+  public OutputFactory getOutputFactory() {
     return ctx.getOutputFactory();
   }
 
@@ -1239,7 +1239,7 @@ public Context send(@NonNull ByteBuffer data) {
   }
 
   @Override
-  public Context send(@NonNull BufferedOutput output) {
+  public Context send(@NonNull Output output) {
     ctx.send(output);
     return this;
   }

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

@@ -41,13 +41,13 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.RegistryException;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.LocaleUtils;
 import io.jooby.internal.MutedServer;
 import io.jooby.internal.RegistryRef;
 import io.jooby.internal.RouterImpl;
+import io.jooby.output.OutputFactory;
 import io.jooby.problem.ProblemDetailsHandler;
 import io.jooby.value.ValueFactory;
 
@@ -80,18 +80,19 @@ public class Jooby implements Router, Registry {
   static final String APP_NAME = "___app_name__";
 
   private static final String JOOBY_RUN_HOOK = "___jooby_run_hook__";
+  private static final Logger log = LoggerFactory.getLogger(Jooby.class);
 
   private final transient AtomicBoolean started = new AtomicBoolean(true);
 
   private final transient AtomicBoolean stopped = new AtomicBoolean(false);
 
   private static Jooby owner;
   private static ExecutionMode BOOT_EXECUTION_MODE = ExecutionMode.DEFAULT;
-  private static BufferedOutputFactory BUFFER_FACTORY;
+  private static OutputFactory OUTPUT_FACTORY;
 
   private RouterImpl router;
 
-  private ExecutionMode mode = BOOT_EXECUTION_MODE;
+  private ExecutionMode mode;
 
   private Path tmpdir;
 
@@ -125,6 +126,7 @@ public class Jooby implements Router, Registry {
   public Jooby() {
     if (owner == null) {
       ClassLoader classLoader = getClass().getClassLoader();
+      mode = BOOT_EXECUTION_MODE;
       environmentOptions = new EnvironmentOptions().setClassLoader(classLoader);
       router = new RouterImpl();
       stopCallbacks = new LinkedList<>();
@@ -133,8 +135,7 @@ public Jooby() {
       lateExtensions = new ArrayList<>();
       // 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));
+      router.setOutputFactory(Optional.ofNullable(OUTPUT_FACTORY).orElseGet(OutputFactory::create));
     } else {
       copyState(owner, this);
     }
@@ -845,7 +846,7 @@ public Jooby setValueFactory(@NonNull ValueFactory valueFactory) {
   }
 
   @NonNull @Override
-  public BufferedOutputFactory getOutputFactory() {
+  public OutputFactory getOutputFactory() {
     return router.getOutputFactory();
   }
 
@@ -903,9 +904,7 @@ public Jooby setStartupSummary(List<StartupSummary> startupSummary) {
     Path tmpdir = getTmpdir();
     ensureTmpdir(tmpdir);
 
-    if (mode == null) {
-      mode = ExecutionMode.DEFAULT;
-    }
+    log.trace("initialization context static variables {} {}", Context.RFC1123, Context.GMT);
 
     if (locales == null) {
       String path = AvailableSettings.LANG;
@@ -1253,18 +1252,14 @@ public static void runApp(
     var apps = new ArrayList<Jooby>();
     var targetServer = server.getLoggerOff().isEmpty() ? server : MutedServer.mute(server);
     try {
+      // Init context static var
       for (var factory : provider) {
         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
         */
-        ServerOptions.from(app.getConfig())
-            .ifPresent(
-                options -> {
-                  options.setServer(server.getName());
-                  server.setOptions(options);
-                });
+        ServerOptions.from(app.getConfig()).ifPresent(server::setOptions);
         apps.add(app);
       }
 
@@ -1305,12 +1300,12 @@ public static Jooby createApp(
 
     Jooby app;
     try {
-      Jooby.BUFFER_FACTORY = server.getOutputFactory();
+      Jooby.OUTPUT_FACTORY = server.getOutputFactory();
       Jooby.BOOT_EXECUTION_MODE = executionMode;
       app = provider.get();
     } finally {
       Jooby.BOOT_EXECUTION_MODE = executionMode;
-      Jooby.BUFFER_FACTORY = null;
+      Jooby.OUTPUT_FACTORY = null;
     }
 
     return app;

jooby/src/main/java/io/jooby/MessageEncoder.java

@@ -7,8 +7,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutput;
 import io.jooby.exception.NotAcceptableException;
+import io.jooby.output.Output;
 
 /**
  * Render a route output as a byte array.
@@ -35,5 +35,5 @@ public interface MessageEncoder {
    * @return Encoded value or <code>null</code> if given object isn't supported it.
    * @throws Exception If something goes wrong.
    */
-  @Nullable BufferedOutput encode(@NonNull Context ctx, @NonNull Object value) throws Exception;
+  @Nullable Output encode(@NonNull Context ctx, @NonNull Object value) throws Exception;
 }

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

@@ -32,10 +32,10 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutputFactory;
 import io.jooby.exception.MissingValueException;
 import io.jooby.handler.AssetHandler;
 import io.jooby.handler.AssetSource;
+import io.jooby.output.OutputFactory;
 import io.jooby.value.ValueFactory;
 
 /**
@@ -502,7 +502,7 @@ default Object execute(@NonNull Context context) {
    */
   @NonNull Router setDefaultWorker(@NonNull Executor worker);
 
-  @NonNull BufferedOutputFactory getOutputFactory();
+  @NonNull OutputFactory getOutputFactory();
 
   /**
    * Attach a filter to the route pipeline.

jooby/src/main/java/io/jooby/Sender.java

@@ -10,7 +10,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferedOutput;
+import io.jooby.output.Output;
 
 /**
  * Non-blocking sender. Reactive responses use this class to send partial data in a non-blocking
@@ -94,7 +94,7 @@ interface Callback {
    */
   Sender write(@NonNull byte[] data, @NonNull Callback callback);
 
-  Sender write(@NonNull BufferedOutput output, @NonNull Callback callback);
+  Sender write(@NonNull Output output, @NonNull Callback callback);
 
   /** Close the sender. */
   void close();

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

@@ -28,9 +28,9 @@
 
 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;
+import io.jooby.output.OutputFactory;
 
 /**
  * Web server contract. Defines operations to start, join and stop a web server. Jooby comes with
@@ -159,7 +159,7 @@ public Server setOptions(@NonNull ServerOptions options) {
     protected abstract ServerOptions defaultOptions();
   }
 
-  @NonNull BufferedOutputFactory getOutputFactory();
+  @NonNull OutputFactory getOutputFactory();
 
   /**
    * Set server options. This method should be called once, calling this method multiple times will

jooby/src/main/java/io/jooby/ServerOptions.java

@@ -25,8 +25,8 @@
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.BufferOptions;
 import io.jooby.internal.SslContextProvider;
+import io.jooby.output.OutputOptions;
 
 /**
  * Available server options. To load server options from configuration files, just do:
@@ -102,7 +102,7 @@ public class ServerOptions {
   /** Name of server: Jetty, Netty or Undertow. */
   private String server;
 
-  private BufferOptions buffer = BufferOptions.defaults();
+  private OutputOptions buffer = OutputOptions.defaults();
 
   /**
    * Maximum request size in bytes. Request exceeding this value results in {@link
@@ -415,11 +415,11 @@ public boolean getDefaultHeaders() {
     return this;
   }
 
-  public BufferOptions getBuffer() {
+  public OutputOptions getBuffer() {
     return buffer;
   }
 
-  public ServerOptions setBuffer(@NonNull BufferOptions buffer) {
+  public ServerOptions setBuffer(@NonNull OutputOptions buffer) {
     this.buffer = buffer;
     return this;
   }

jooby/src/main/java/io/jooby/ServerSentMessage.java

@@ -14,7 +14,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.buffer.*;
+import io.jooby.output.Output;
 
 /**
  * Server-Sent message.
@@ -132,12 +132,12 @@ public ServerSentMessage(@NonNull Object data) {
    * @param ctx Web context. To encode complex objects.
    * @return Encoded data.
    */
-  public @NonNull BufferedOutput encode(@NonNull Context ctx) {
+  public @NonNull Output encode(@NonNull Context ctx) {
     try {
       var route = ctx.getRoute();
       var encoder = route.getEncoder();
       var bufferFactory = ctx.getOutputFactory();
-      var buffer = bufferFactory.newBufferedOutput();
+      var buffer = bufferFactory.newOutput();
 
       if (id != null) {
         buffer.write(ID);