Most everything works

jujube-benchmark/Readme.md

@@ -1,5 +1,5 @@
 # Benchmark Module
-All tests run in a 2017 MacBook Pro 13" with 16GB of RAM and AdoptOpenJDK 11.0.3+7.
+All tests run in a 2017 MacBook Pro 13" with 16GB of RAM, NVME storage and AdoptOpenJDK 11.0.3+7.
 All tests had a max heap setting (-xmx) of only 64MB. 
 
 ## Results

jujube-core/pom.xml

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents.core5</groupId>
       <artifactId>httpcore5-h2</artifactId>
-      <version>5.0-beta11</version>
+      <version>${httpComponentsCore.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>5.0-beta7</version>
+      <version>5.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

jujube-core/src/main/java/org/ophion/jujube/Jujube.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Just enough logic to turn Apache Http Core into something suited for micro services
@@ -58,6 +57,14 @@ public void start() {
         .setCanonicalHostName(config.getServerConfig().getCanonicalHostName())
         .setVersionPolicy(config.getServerConfig().getVersionPolicy());
 
+      if (config.getServerConfig().getH2StreamListener() != null) {
+        bootstrap.setStreamListener(config.getServerConfig().getH2StreamListener());
+      }
+
+      if (config.getServerConfig().getHttp1StreamListener() != null) {
+        bootstrap.setStreamListener(config.getServerConfig().getHttp1StreamListener());
+      }
+
       config.routes()
         .forEach((k, v) -> bootstrap.register(k, () -> new JujubeServerExchangeHandler(config, v)));
 
@@ -83,11 +90,18 @@ public void start() {
   }
 
   public void stop() {
-    System.out.println("> HTTP server is shutting down, awaiting in-flight requests...");
-    instance.close(CloseMode.GRACEFUL);
-    instance.initiateShutdown();
+    var shutdownDelay = config.getServerConfig().getShutDownDelay();
+    System.out.println(String.format("> HTTP server is shutting down, awaiting %s for in-flight requests...", Durations.humanize(shutdownDelay)));
     try {
-      instance.awaitShutdown(TimeValue.of(100, TimeUnit.MILLISECONDS));
+      if (shutdownDelay.isZero()) {
+        instance.close(CloseMode.IMMEDIATE);
+        instance.initiateShutdown();
+        instance.awaitShutdown(TimeValue.ZERO_MILLISECONDS);
+      } else {
+        instance.close(CloseMode.GRACEFUL);
+        instance.initiateShutdown();
+        instance.awaitShutdown(TimeValue.ofMilliseconds(shutdownDelay.toMillis()));
+      }
     } catch (InterruptedException e) {
       throw new IllegalStateException(e);
     }

jujube-core/src/main/java/org/ophion/jujube/config/ServerConfig.java

@@ -3,13 +3,15 @@
 import org.apache.hc.core5.function.Callback;
 import org.apache.hc.core5.function.Supplier;
 import org.apache.hc.core5.http.config.Http1Config;
+import org.apache.hc.core5.http.impl.Http1StreamListener;
 import org.apache.hc.core5.http.nio.AsyncServerExchangeHandler;
 import org.apache.hc.core5.http.nio.ssl.BasicServerTlsStrategy;
 import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
 import org.apache.hc.core5.http.protocol.LookupRegistry;
 import org.apache.hc.core5.http.protocol.UriPatternOrderedMatcher;
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.http2.config.H2Config;
+import org.apache.hc.core5.http2.impl.nio.H2StreamListener;
 import org.apache.hc.core5.http2.ssl.H2ServerTlsStrategy;
 import org.apache.hc.core5.reactor.IOReactorConfig;
 import org.apache.hc.core5.ssl.SSLContextBuilder;
@@ -22,6 +24,7 @@
 import javax.net.ssl.SSLContext;
 import java.security.KeyStore;
 import java.security.cert.Certificate;
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 public class ServerConfig {
@@ -36,6 +39,9 @@ public class ServerConfig {
   private TlsStrategy tlsStrategy;
   private String canonicalHostName;
   private Http1Config http1Config = Http1Config.DEFAULT;
+  private H2StreamListener h2StreamListener;
+  private Http1StreamListener http1StreamListener;
+  private Duration shutDownDelay = Duration.ofMillis(100);
 
   public ServerConfig() {
     this.ioReactorConfig = IOReactorConfig.custom()
@@ -67,6 +73,22 @@ public ServerConfig() {
     }
   }
 
+  public H2StreamListener getH2StreamListener() {
+    return h2StreamListener;
+  }
+
+  public void setH2StreamListener(H2StreamListener h2StreamListener) {
+    this.h2StreamListener = h2StreamListener;
+  }
+
+  public Http1StreamListener getHttp1StreamListener() {
+    return http1StreamListener;
+  }
+
+  public void setHttp1StreamListener(Http1StreamListener http1StreamListener) {
+    this.http1StreamListener = http1StreamListener;
+  }
+
   public DataSize getRequestEntityLimit() {
     return requestEntityLimit;
   }
@@ -158,4 +180,12 @@ public Http1Config getHttp1Config() {
   public void setHttp1Config(Http1Config http1Config) {
     this.http1Config = http1Config;
   }
+
+  public Duration getShutDownDelay() {
+    return shutDownDelay;
+  }
+
+  public void setShutDownDelay(Duration shutDownDelay) {
+    this.shutDownDelay = shutDownDelay;
+  }
 }

jujube-core/src/main/java/org/ophion/jujube/internal/JujubeServerExchangeHandler.java

@@ -16,6 +16,8 @@
 import org.ophion.jujube.context.ParameterSource;
 import org.ophion.jujube.context.PrimitiveParameter;
 import org.ophion.jujube.http.MultipartEntity;
+import org.ophion.jujube.internal.consumers.ContentAwareRequestConsumer;
+import org.ophion.jujube.internal.consumers.RequestEntityLimitExceeded;
 import org.ophion.jujube.internal.util.Loggers;
 import org.ophion.jujube.response.HttpResponseRequestTooLarge;
 import org.ophion.jujube.response.HttpResponseServerError;
@@ -48,7 +50,7 @@ public JujubeServerExchangeHandler(JujubeConfig config, RouteHandler handler) {
   protected AsyncRequestConsumer<Message<HttpRequest, HttpEntity>> supplyConsumer(HttpRequest request, EntityDetails entityDetails, HttpContext context) throws HttpException {
     LOG.debug("handling request: {}", request.toString());
 
-    return new ContentAwareRequestConsumer<>(config, entityDetails, exceptionRef);
+    return new ContentAwareRequestConsumer(config, entityDetails, exceptionRef);
   }
 
   @Override
@@ -83,7 +85,6 @@ protected void handle(Message<HttpRequest, HttpEntity> requestMessage, AsyncServ
             response = new HttpResponseServerError();
           }
         }
-
       }
 
       // handling response: