server: make server options available on app initialization

- code clean up

Author: jknack

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

@@ -33,7 +33,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,6 +88,7 @@ public class Jooby implements Router, Registry {
   private static Jooby owner;
   private static ExecutionMode BOOT_EXECUTION_MODE = ExecutionMode.DEFAULT;
   private static OutputFactory OUTPUT_FACTORY;
+  private static ServerOptions SERVER_OPTIONS;
 
   private RouterImpl router;
 
@@ -136,6 +136,7 @@ public Jooby() {
       // NOTE: fallback to default, this is required for direct instance creation of class
       // app bootstrap always ensures server instance.
       router.setOutputFactory(Optional.ofNullable(OUTPUT_FACTORY).orElseGet(OutputFactory::create));
+      router.setServerOptions(Optional.ofNullable(SERVER_OPTIONS).orElseGet(ServerOptions::new));
     } else {
       copyState(owner, this);
     }
@@ -444,7 +445,7 @@ public String getContextPath() {
     return router;
   }
 
-  @Nullable @Override
+  @NonNull @Override
   public ServerOptions getServerOptions() {
     return router.getServerOptions();
   }
@@ -961,8 +962,7 @@ public Jooby setStartupSummary(List<StartupSummary> startupSummary) {
       if (config.hasPath(AvailableSettings.STARTUP_SUMMARY)) {
         Object value = config.getAnyRef(AvailableSettings.STARTUP_SUMMARY);
         List<String> values = value instanceof List ? (List) value : List.of(value.toString());
-        startupSummary =
-            values.stream().map(StartupSummary::create).collect(Collectors.toUnmodifiableList());
+        startupSummary = values.stream().map(StartupSummary::create).toList();
       } else {
         startupSummary = List.of(StartupSummary.DEFAULT, StartupSummary.ROUTES);
       }
@@ -1301,11 +1301,13 @@ public static Jooby createApp(
     Jooby app;
     try {
       Jooby.OUTPUT_FACTORY = server.getOutputFactory();
+      Jooby.SERVER_OPTIONS = server.getOptions();
       Jooby.BOOT_EXECUTION_MODE = executionMode;
       app = provider.get();
     } finally {
       Jooby.BOOT_EXECUTION_MODE = executionMode;
       Jooby.OUTPUT_FACTORY = null;
+      Jooby.SERVER_OPTIONS = null;
     }
 
     return app;

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

@@ -182,12 +182,11 @@ default Object execute(@NonNull Context context) {
   @NonNull ServiceRegistry getServices();
 
   /**
-   * Server options. They might be null during application initialization. Once deployed, they are
-   * never null (at runtime).
+   * Server options.
    *
-   * @return Server options or <code>null</code>.
+   * @return Server options.
    */
-  @Nullable ServerOptions getServerOptions();
+  @NonNull ServerOptions getServerOptions();
 
   /**
    * Set application context path. Context path is the base path for all routes. Default is: <code>/

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

@@ -156,7 +156,9 @@ public Server setOptions(@NonNull ServerOptions options) {
       return this;
     }
 
-    protected abstract ServerOptions defaultOptions();
+    protected ServerOptions defaultOptions() {
+      return new ServerOptions();
+    }
   }
 
   @NonNull OutputFactory getOutputFactory();
@@ -298,11 +300,6 @@ static Server loadServer(@Nullable ServerOptions options) {
       var log = LoggerFactory.getLogger(servers.get(0).getClass());
       log.warn("Multiple servers found {}. Using: {}", names, names.get(0));
     }
-    var server = servers.get(0);
-    if (options != null) {
-      options.setServer(server.getName());
-      server.setOptions(options);
-    }
-    return server;
+    return servers.get(0);
   }
 }

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

@@ -75,23 +75,28 @@ public class ServerOptions {
   public static final int IO_THREADS =
       Integer.parseInt(
           System.getProperty(
-              "jooby.server.ioThreads",
-              Integer.toString(Runtime.getRuntime().availableProcessors())));
+              "server.ioThreads", Integer.toString(Runtime.getRuntime().availableProcessors())));
+
+  private static final String SERVER_NAME = System.getProperty("server.name");
 
   /**
    * Number of worker (a.k.a application) threads. It is the number of processors multiply by <code>
    * 8</code>.
    */
-  public static final int WORKER_THREADS = Runtime.getRuntime().availableProcessors() * 8;
+  public static final int WORKER_THREADS =
+      Integer.parseInt(
+          System.getProperty(
+              "server.workerThreads",
+              Integer.toString(Runtime.getRuntime().availableProcessors() * 8)));
 
   /** HTTP port. Default is <code>8080</code> or <code>0</code> for random port. */
   private int port = SERVER_PORT;
 
   /** Number of IO threads used by the server. Used by Netty and Undertow. */
-  private Integer ioThreads;
+  private int ioThreads = IO_THREADS;
 
   /** Number of worker threads (a.k.a application) to use. */
-  private Integer workerThreads;
+  private int workerThreads = WORKER_THREADS;
 
   /**
    * Configure server to default headers: <code>Date</code>, <code>Content-Type</code> and <code>
@@ -100,9 +105,9 @@ public class ServerOptions {
   private boolean defaultHeaders = true;
 
   /** Name of server: Jetty, Netty or Undertow. */
-  private String server;
+  private String server = SERVER_NAME;
 
-  private OutputOptions buffer = OutputOptions.defaults();
+  private OutputOptions output = OutputOptions.defaults();
 
   /**
    * Maximum request size in bytes. Request exceeding this value results in {@link
@@ -150,11 +155,11 @@ public class ServerOptions {
       if (conf.hasPath("server.name")) {
         options.setServer(conf.getString("server.name"));
       }
-      if (conf.hasPath("server.buffer.size")) {
-        options.buffer.setSize(conf.getInt("server.buffer.size"));
+      if (conf.hasPath("server.output.size")) {
+        options.output.setSize(conf.getInt("server.output.size"));
       }
-      if (conf.hasPath("server.buffer.useDirectBuffers")) {
-        options.buffer.setDirectBuffers(conf.getBoolean("server.buffer.useDirectBuffers"));
+      if (conf.hasPath("server.output.useDirectBuffers")) {
+        options.output.setDirectBuffers(conf.getBoolean("server.output.useDirectBuffers"));
       }
       if (conf.hasPath("server.defaultHeaders")) {
         options.setDefaultHeaders(conf.getBoolean("server.defaultHeaders"));
@@ -197,11 +202,9 @@ public String toString() {
     StringBuilder buff = new StringBuilder();
     buff.append(Optional.ofNullable(server).orElse("server")).append(" {");
     buff.append("port: ").append(port);
-    if (!"jetty".equals(server)) {
-      buff.append(", ioThreads: ").append(Optional.ofNullable(ioThreads).orElse(IO_THREADS));
-    }
+    buff.append(", ioThreads: ").append(getIoThreads());
     buff.append(", workerThreads: ").append(getWorkerThreads());
-    buff.append(", buffer: ").append(getBuffer());
+    buff.append(", output: ").append(getOutput());
     buff.append(", maxRequestSize: ").append(maxRequestSize);
     buff.append(", httpsOnly: ").append(httpsOnly);
     if (compressionLevel != null) {
@@ -311,17 +314,7 @@ public boolean isHttpsOnly() {
    * @return Number of IO threads used by the server. Required by Netty and Undertow.
    */
   public int getIoThreads() {
-    return getIoThreads(IO_THREADS);
-  }
-
-  /**
-   * Number of IO threads used by the server. Required by Netty and Undertow.
-   *
-   * @param defaultIoThreads Default number of threads if none was set.
-   * @return Number of IO threads used by the server. Required by Netty and Undertow.
-   */
-  public int getIoThreads(int defaultIoThreads) {
-    return ioThreads == null ? defaultIoThreads : ioThreads;
+    return ioThreads;
   }
 
   /**
@@ -343,19 +336,7 @@ public int getIoThreads(int defaultIoThreads) {
    *     allowed to block.
    */
   public int getWorkerThreads() {
-    return getWorkerThreads(WORKER_THREADS);
-  }
-
-  /**
-   * Number of worker threads (a.k.a application) to use. These are the threads which are allowed to
-   * block.
-   *
-   * @param defaultWorkerThreads Default worker threads is none was set.
-   * @return Number of worker threads (a.k.a application) to use. These are the threads which are
-   *     allowed to block.
-   */
-  public int getWorkerThreads(int defaultWorkerThreads) {
-    return workerThreads == null ? defaultWorkerThreads : workerThreads;
+    return workerThreads;
   }
 
   /**
@@ -415,12 +396,12 @@ public boolean getDefaultHeaders() {
     return this;
   }
 
-  public OutputOptions getBuffer() {
-    return buffer;
+  public OutputOptions getOutput() {
+    return output;
   }
 
-  public ServerOptions setBuffer(@NonNull OutputOptions buffer) {
-    this.buffer = buffer;
+  public ServerOptions setOutput(@NonNull OutputOptions output) {
+    this.output = output;
     return this;
   }
 

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

@@ -37,7 +37,6 @@
 
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.jooby.*;
 import io.jooby.exception.RegistryException;
 import io.jooby.exception.StatusCodeException;
@@ -172,6 +171,8 @@ public Stack executor(Executor executor) {
 
   private OutputFactory outputFactory;
 
+  private ServerOptions serverOptions;
+
   public RouterImpl() {
     stack.addLast(new Stack(chi, null));
   }
@@ -783,9 +784,14 @@ public Router setFlashCookie(@NonNull Cookie flashCookie) {
     return this;
   }
 
-  @Nullable @Override
+  @NonNull @Override
   public ServerOptions getServerOptions() {
-    return services.getOrNull(ServerOptions.class);
+    return serverOptions;
+  }
+
+  public void setServerOptions(ServerOptions serverOptions) {
+    this.serverOptions = serverOptions;
+    services.put(ServerOptions.class, serverOptions);
   }
 
   @NonNull @Override

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

@@ -26,7 +26,6 @@ public OutputFactory getOutputFactory() {
       return null;
     }
 
-    @Override
     protected ServerOptions defaultOptions() {
       return defaultOptions;
     }

…test/java/io/jooby/buffer/Issue3434.java …test/java/io/jooby/output/Issue3434.javajooby/src/test/java/io/jooby/buffer/Issue3434.java renamed to jooby/src/test/java/io/jooby/output/Issue3434.java jooby/src/test/java/io/jooby/buffer/Issue3434.java renamed to jooby/src/test/java/io/jooby/output/Issue3434.java

@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby.buffer;
+package io.jooby.output;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,8 +15,6 @@
 import org.junit.jupiter.api.Test;
 
 import io.jooby.SneakyThrows;
-import io.jooby.output.OutputFactory;
-import io.jooby.output.OutputOptions;
 
 public class Issue3434 {
   OutputFactory factory = OutputFactory.create(OutputOptions.small());

…est/java/io/jooby/buffer/OutputTest.java …est/java/io/jooby/output/OutputTest.javajooby/src/test/java/io/jooby/buffer/OutputTest.java renamed to jooby/src/test/java/io/jooby/output/OutputTest.java jooby/src/test/java/io/jooby/buffer/OutputTest.java renamed to jooby/src/test/java/io/jooby/output/OutputTest.java

@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby.buffer;
+package io.jooby.output;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -17,8 +17,6 @@
 import io.jooby.SneakyThrows;
 import io.jooby.internal.output.ByteBufferWrappedOutput;
 import io.jooby.internal.output.CompsiteByteBufferOutput;
-import io.jooby.output.ByteBufferOutput;
-import io.jooby.output.Output;
 
 public class OutputTest {
 

modules/jooby-jetty/src/main/java/io/jooby/jetty/JettyServer.java

@@ -47,12 +47,15 @@
  */
 public class JettyServer extends io.jooby.Server.Base {
 
+  private static final String NAME = "jetty";
   private static final int THREADS = 200;
 
   static {
     int cpus = ProcessorUtils.availableProcessors();
     var ioThreads = Math.max(1, Math.min(cpus / 2, THREADS / 16));
-    System.setProperty("jooby.server.ioThreads", ioThreads + "");
+    System.setProperty("server.ioThreads", ioThreads + "");
+    System.setProperty("server.workerThreads", THREADS + "");
+    System.setProperty("server.name", NAME);
   }
 
   private OutputFactory outputFactory;
@@ -83,25 +86,14 @@ public JettyServer() {}
   @NonNull @Override
   public OutputFactory getOutputFactory() {
     if (outputFactory == null) {
-      this.outputFactory = OutputFactory.create(getOptions().getBuffer());
+      this.outputFactory = OutputFactory.create(getOptions().getOutput());
     }
     return outputFactory;
   }
 
-  @NonNull @Override
-  public JettyServer setOptions(@NonNull ServerOptions options) {
-    super.setOptions(options.setWorkerThreads(options.getWorkerThreads(THREADS)));
-    return this;
-  }
-
-  @Override
-  protected ServerOptions defaultOptions() {
-    return new ServerOptions().setServer(getName()).setWorkerThreads(THREADS);
-  }
-
   @NonNull @Override
   public String getName() {
-    return "jetty";
+    return NAME;
   }
 
   /**
@@ -150,8 +142,8 @@ public io.jooby.Server start(@NonNull Jooby... application) {
 
       var httpConf = new HttpConfiguration();
       httpConf.setUriCompliance(UriCompliance.LEGACY);
-      httpConf.setOutputBufferSize(options.getBuffer().getSize());
-      httpConf.setOutputAggregationSize(options.getBuffer().getSize());
+      httpConf.setOutputBufferSize(options.getOutput().getSize());
+      httpConf.setOutputAggregationSize(options.getOutput().getSize());
       httpConf.setSendXPoweredBy(false);
       httpConf.setSendDateHeader(options.getDefaultHeaders());
       httpConf.setSendServerVersion(false);
@@ -302,7 +294,7 @@ private List<Map.Entry<String, Handler>> createHandler(
                   new JettyHandler(
                       invocationType,
                       applications.get(0),
-                      options.getBuffer().getSize(),
+                      options.getOutput().getSize(),
                       options.getMaxRequestSize(),
                       options.getDefaultHeaders());
               if (options.isExpectContinue() == Boolean.TRUE) {