Undertow uppgrade 1.4.15 fix #783

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue418.java

@@ -1,6 +1,24 @@
 package org.jooby.issues;
 
-import com.google.common.collect.ImmutableMap;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.http.HttpVersion;
@@ -28,24 +46,7 @@
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Phaser;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import com.google.common.collect.ImmutableMap;
 
 public class Issue418 extends ServerFeature {
 

jooby-undertow/src/main/java/org/jooby/internal/undertow/UndertowServer.java

@@ -44,7 +44,6 @@
 import io.undertow.UndertowOptions;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.handlers.GracefulShutdownHandler;
-import io.undertow.server.protocol.http2.Http2UpgradeHandler;
 
 public class UndertowServer implements org.jooby.spi.Server {
 
@@ -67,11 +66,7 @@ public UndertowServer(final org.jooby.spi.HttpHandler dispatcher, final Config c
 
     awaitShutdown = conf.getDuration("undertow.awaitShutdown", TimeUnit.MILLISECONDS);
     boolean http2 = conf.getBoolean("server.http2.enabled");
-    HttpHandler handler = doHandler(dispatcher, conf);
-    if (http2) {
-      handler = new Http2UpgradeHandler(handler);
-    }
-    shutdown = new GracefulShutdownHandler(handler);
+    shutdown = new GracefulShutdownHandler(doHandler(dispatcher, conf));
     Undertow.Builder ubuilder = configure(conf, io.undertow.Undertow.builder())
         .addHttpListener(conf.getInt("application.port"),
             host(conf.getString("application.host")));
@@ -209,8 +204,7 @@ public void stop() throws Exception {
   }
 
   @Override
-  public Optional<Executor> executor()
-  {
+  public Optional<Executor> executor() {
     return Optional.ofNullable(server.getWorker());
   }
 

pom.xml

@@ -2950,7 +2950,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
   <properties>
     <!-- Dependencies -->
     <jackson.version>2.8.3</jackson.version>
-    <undertow.version>1.4.9.Final</undertow.version>
+    <undertow.version>1.4.15.Final</undertow.version>
     <servlet.version>3.1.0</servlet.version>
     <jetty.version>9.4.3.v20170317</jetty.version>
     <netty.version>4.1.9.Final</netty.version>