httpsgithu · pull · Apr 4, 2022 · Apr 21, 2022 · Apr 29, 2022 · May 1, 2022
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [jknack]
diff --git a/.github/workflows/full-build.yml b/.github/workflows/full-build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [1.8, 11, 13]
+        java_version: [1.8, 11, 17, 18]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:

diff --git a/.github/workflows/quick-build.yml b/.github/workflows/quick-build.yml
@@ -2,14 +2,17 @@ name: Quick Build
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        java_version: [1.8, 11, 13]
+        java_version: [1.8, 11, 17]
         os: [ubuntu-latest]
 
     steps:

diff --git a/.github/workflows/starter.yml b/.github/workflows/starter.yml
@@ -8,6 +8,9 @@ on:
     paths:
       - 'starters/**'
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}

diff --git a/docs/asciidoc/dev-tools.adoc b/docs/asciidoc/dev-tools.adoc
@@ -109,6 +109,7 @@ The next example shows all the available options with their default values:
       <restartExtensions>conf,properties,class</restartExtensions> <2>
       <compileExtensions>java,kt</compileExtensions>               <3>
       <port>8080</port>                                            <4>
+      <waitTimeBeforeRestart>500</waitTimeBeforeRestart>           <5>
     </configuration>
   </plugin>
   ...
@@ -137,11 +138,13 @@ joobyRun {
   restartExtensions = ["conf", "properties", "class"]              <2>
   compileExtensions = ["java", "kt"]                               <3>
   port = 8080                                                      <4>
+  waitTimeBeforeRestart = 500                                      <5>
 }
 ----
 
 <1> Application main class
 <2> Restart extensions. A change on these files trigger a restart request.
 <3> Source extensions. A change on these files trigger a compilation request, followed by a restart request.
 <4> Application port
+<5> How long to wait after last file change to restart. Default is: `500` milliseconds.
 
diff --git a/docs/asciidoc/execution-model.adoc b/docs/asciidoc/execution-model.adoc
@@ -364,13 +364,13 @@ workerThreads = Math.max(Runtime.getRuntime().availableProcessors(), 2) * 8
 For example `8` cores gives us `64` worker threads.
 
 - Undertow: The javadoc:utow.Utow[text=Undertow server] implementation multiply the number of available processors
-(with a minimum of 2) by 8.
+by 8.
 
 ----
-workerThreads = Math.max(Runtime.getRuntime().availableProcessors(), 2) * 8
+workerThreads = Runtime.getRuntime().availableProcessors() * 8
 ----
 
-For example `8` cores gives us `64` worker threads.
+For `8` cores gives us `64` worker threads.
 
 - Jetty: The javadoc:jetty.Jetty[text=Jetty server] implementation uses the default configuration
 with `200` worker threads.

diff --git a/docs/asciidoc/modules/openapi.adoc b/docs/asciidoc/modules/openapi.adoc
@@ -393,7 +393,7 @@ and/or `@Operation` annotations.
 
 ==== Responses & Status
 
-The default response code is `Success(200)` (or `NO_CONENT(204)` for DELETE mvc routes). Now, if
+The default response code is `Success(200)` (or `NO_CONTENT(204)` for DELETE mvc routes). Now, if
 you need to:
 
 - document the default response

diff --git a/docs/asciidoc/servers.adoc b/docs/asciidoc/servers.adoc
@@ -48,6 +48,7 @@ Server options are available via javadoc:ServerOptions[] class:
       .setMaxRequestSize(10485760)
       .setSecurePort(8433)
       .setSsl(SslOptions.selfSigned())
+      .setHttpsOnly(false)
       .setHttp2(true)
       .setExpectContinue(true)
   ); 
@@ -70,8 +71,9 @@ Server options are available via javadoc:ServerOptions[] class:
     maxRequestSize = 10485760
     securePort = 8443
     ssl = SslOptions.selfSigned()
-    http2 = true
-    expectContinue = true
+    isHttpsOnly = true
+    isHttp2 = true
+    isExpectContinue = true
   }
 }
 ----
@@ -87,8 +89,9 @@ Server options are available via javadoc:ServerOptions[] class:
 - maxRequestSize: Maximum request size in bytes. Request exceeding this value results in 413(REQUEST_ENTITY_TOO_LARGE) response. Default is `10mb`.
 - securePort: Enable HTTPS. This option is fully covered in next section.
 - ssl: SSL options with certificate details. This option is fully covered in next section.
-- http2: Enable HTTP 2.0.
-- expectContinue: Whenever 100-Expect and continue requests are handled by the server. This is off
+- isHttpsOnly: bind only to HTTPS port, not HTTP. This requires SSL options to be configured.
+- isHttp2: Enable HTTP 2.0.
+- isExpectContinue: Whenever 100-Expect and continue requests are handled by the server. This is off
   by default, except for Jetty which is always ON.
 
 Server options are available as application configuration properties too:
@@ -107,6 +110,7 @@ server.defaultHeaders = true
 server.maxRequestSize = 10485760
 server.securePort = 8443
 server.ssl.type = self-signed | PKCS12 | X509
+server.httpsOnly = false
 server.http2 = true
 server.expectContinue = false
 ----

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.14.1-SNAPSHOT</version>
+    <version>2.16.5-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>io.methvin</groupId>
       <artifactId>directory-watcher</artifactId>
-      <version>0.15.0</version>
+      <version>0.15.1</version>
     </dependency>
 
     <!-- zt-exec -->
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.3</version>
     </dependency>
 
   </dependencies>

diff --git a/jooby/pom.xml b/jooby/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>2.14.1-SNAPSHOT</version>
+    <version>2.16.5-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -277,7 +277,7 @@
     <dependency>
       <groupId>org.webjars.npm</groupId>
       <artifactId>vue</artifactId>
-      <version>3.0.3</version>
+      <version>3.2.33</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -424,6 +424,15 @@ public interface Context extends Registry {
    */
   @Nullable MediaType getRequestType();
 
+  /**
+   * Test whenever this is a CORS preflight request.
+   *
+   * @return Test whenever this is a CORS preflight request.
+   */
+  default boolean isPreflight() {
+    return getMethod().equals(Router.OPTIONS) && !header("Access-Control-Request-Method").isMissing();
+  }
+
   /**
    * Request <code>Content-Type</code> header or <code>null</code> when missing.
    *

diff --git a/jooby/src/main/java/io/jooby/CorsHandler.java b/jooby/src/main/java/io/jooby/CorsHandler.java
@@ -73,7 +73,7 @@ public CorsHandler() {
           return ctx.send(StatusCode.FORBIDDEN);
         }
         log.debug("allowed origin: {}", origin);
-        if (isPreflight(ctx)) {
+        if (ctx.isPreflight()) {
           log.debug("handling preflight for: {}", origin);
           if (preflight(ctx, options, origin)) {
             return ctx;
@@ -135,10 +135,6 @@ private static void simple(final Context ctx, final Cors options, final String o
     route.setHttpOptions(true);
   }
 
-  private boolean isPreflight(final Context ctx) {
-    return ctx.getMethod().equals(Router.OPTIONS) && !ctx.header(AC_REQUEST_METHOD).isMissing();
-  }
-
   private boolean preflight(final Context ctx, final Cors options, final String origin) {
     /*
       Allowed method

diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java
@@ -23,6 +23,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -205,7 +206,7 @@ public interface DefaultContext extends Context {
   }
 
   @Override default boolean accept(@Nonnull MediaType contentType) {
-    return accept(singletonList(contentType)) == contentType;
+    return Objects.equals(accept(singletonList(contentType)), contentType);
   }
 
   @Override default MediaType accept(@Nonnull List<MediaType> produceTypes) {

diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -893,17 +893,19 @@ public Jooby errorCode(@Nonnull Class<? extends Throwable> type,
     log.info("    app dir: {}", System.getProperty("user.dir"));
     log.info("    tmp dir: {}", tmpdir);
 
+    List<Object> args = new ArrayList<>();
     StringBuilder buff = new StringBuilder();
     buff.append("routes: \n\n{}\n\nlistening on:\n");
+    args.add(router);
 
     ServerOptions options = server.getOptions();
     String host = options.getHost().replace("0.0.0.0", "localhost");
-    List<Object> args = new ArrayList<>();
-    args.add(router);
-    args.add(host);
-    args.add(options.getPort());
-    args.add(router.getContextPath());
-    buff.append("  http://{}:{}{}\n");
+    if (!options.isHttpsOnly()) {
+      args.add(host);
+      args.add(options.getPort());
+      args.add(router.getContextPath());
+      buff.append("  http://{}:{}{}\n");
+    }
 
     if (options.isSSLEnabled()) {
       args.add(host);

diff --git a/jooby/src/main/java/io/jooby/Route.java b/jooby/src/main/java/io/jooby/Route.java
@@ -9,6 +9,7 @@
 import io.jooby.exception.MethodNotAllowedException;
 import io.jooby.exception.NotAcceptableException;
 import io.jooby.exception.NotFoundException;
+import io.jooby.exception.StatusCodeException;
 import io.jooby.exception.UnsupportedMediaType;
 
 import javax.annotation.Nonnull;
@@ -309,6 +310,12 @@ public interface Handler extends Serializable, Aware {
   public static final Handler NOT_FOUND = ctx -> ctx
       .sendError(new NotFoundException(ctx.getRequestPath()));
 
+  /**
+   * Handler for {@link StatusCode#REQUEST_ENTITY_TOO_LARGE} responses.
+   */
+  public static final Handler REQUEST_ENTITY_TOO_LARGE = ctx -> ctx
+      .sendError(new StatusCodeException(StatusCode.REQUEST_ENTITY_TOO_LARGE));
+
   /**
    * Handler for {@link StatusCode#METHOD_NOT_ALLOWED} responses.
    */
@@ -337,12 +344,14 @@ public interface Handler extends Serializable, Aware {
 
   /** Handler for {@link StatusCode#UNSUPPORTED_MEDIA_TYPE} responses. */
   public static final Route.Before SUPPORT_MEDIA_TYPE = ctx -> {
-    MediaType contentType = ctx.getRequestType();
-    if (contentType == null) {
-      throw new UnsupportedMediaType(null);
-    }
-    if (!ctx.getRoute().getConsumes().stream().anyMatch(contentType::matches)) {
-      throw new UnsupportedMediaType(contentType.getValue());
+    if (!ctx.isPreflight()) {
+      MediaType contentType = ctx.getRequestType();
+      if (contentType == null) {
+        throw new UnsupportedMediaType(null);
+      }
+      if (!ctx.getRoute().getConsumes().stream().anyMatch(contentType::matches)) {
+        throw new UnsupportedMediaType(contentType.getValue());
+      }
     }
   };
 

diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java
@@ -62,7 +62,11 @@ interface Match {
      */
     @Nonnull Route route();
 
-    void execute(@Nonnull Context context);
+    void execute(@Nonnull Context context, @Nonnull Route.Handler pipeline);
+
+    default void execute(@Nonnull Context context) {
+      execute(context, route().getPipeline());
+    }
 
     /**
      * Path pattern variables.