jetty 9.4.0.v20161208 fix #613

Author: jknack

coverage-report/src/test/java/org/jooby/BufferSizeFeature.java

@@ -28,7 +28,7 @@ public class BufferSizeFeature extends ServerFeature {
       }
       Result rsp = result;
       len.ifPresent(l -> rsp.header("Content-Length", l));
-      chunked.ifPresent(c -> rsp.header("Transfer-Encoding", "Chunked"));
+      chunked.ifPresent(c -> rsp.header("Transfer-Encoding", "chunked"));
       return rsp;
     });
   }

jooby-executor/src/main/java/org/jooby/exec/Exec.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;

jooby-jetty/pom.xml

@@ -116,55 +116,4 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <family>linux</family>
-        </os>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-tcnative-boringssl-static</artifactId>
-          <version>1.1.33.Fork19</version>
-          <classifier>linux-x86_64</classifier>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>windows_x86</id>
-      <activation>
-        <os>
-          <family>windows</family>
-        </os>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-tcnative-boringssl-static</artifactId>
-          <version>1.1.33.Fork19</version>
-          <classifier>windows-x86_64</classifier>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>mac_x86_64</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-tcnative-boringssl-static</artifactId>
-          <version>1.1.33.Fork19</version>
-          <classifier>osx-x86_64</classifier>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
 </project>

jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyResponse.java

@@ -95,8 +95,8 @@ public void failed(final Throwable cause) {
   public void end() {
     if (endRequest) {
       super.end();
+      nreq = null;
     }
-    nreq = null;
   }
 
   @Override

jooby-jetty/src/main/java/org/jooby/internal/jetty/JettyServer.java

@@ -42,6 +42,7 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.util.DecoratedObjectFactory;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.websocket.api.WebSocketBehavior;
@@ -110,16 +111,19 @@ private Server server(final HttpHandler handler, final Config conf,
 
     server.addConnector(http);
 
+    ContextHandler sch = new ContextHandler();
+    sch.setAttribute(DecoratedObjectFactory.ATTR, new DecoratedObjectFactory());
+
     WebSocketPolicy wsConfig = conf(new WebSocketPolicy(WebSocketBehavior.SERVER),
         conf.getConfig("jetty.ws"), "jetty.ws");
-    WebSocketServerFactory webSocketServerFactory = new WebSocketServerFactory(wsConfig);
+    WebSocketServerFactory webSocketServerFactory = new WebSocketServerFactory(
+        sch.getServletContext(), wsConfig);
     webSocketServerFactory.setCreator((req, rsp) -> {
       JettyWebSocket ws = new JettyWebSocket();
       req.getHttpServletRequest().setAttribute(JettyWebSocket.class.getName(), ws);
       return ws;
     });
 
-    ContextHandler sch = new ContextHandler();
     // always '/' context path is internally handle by jooby
     sch.setContextPath("/");
     sch.setHandler(new JettyHandler(handler, webSocketServerFactory, conf
@@ -197,8 +201,7 @@ public void stop() throws Exception {
   }
 
   @Override
-  public Optional<Executor> executor()
-  {
+  public Optional<Executor> executor() {
     return Optional.ofNullable(server.getThreadPool());
   }
 

jooby-jetty/src/test/java/org/jooby/internal/jetty/JettyServerTest.java

@@ -1,5 +1,6 @@
 package org.jooby.internal.jetty;
 
+import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.isA;
@@ -9,13 +10,15 @@
 import java.util.Map;
 
 import javax.inject.Provider;
+import javax.servlet.ServletContext;
 
 import org.eclipse.jetty.server.ConnectionFactory;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.util.DecoratedObjectFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ThreadPool;
 import org.eclipse.jetty.websocket.api.WebSocketBehavior;
@@ -104,6 +107,8 @@ public class JettyServerTest {
         .build();
     ctx.setContextPath("/");
     ctx.setHandler(isA(JettyHandler.class));
+    ctx.setAttribute(eq(DecoratedObjectFactory.ATTR), isA(DecoratedObjectFactory.class));
+    expect(ctx.getServletContext()).andReturn(unit.get(ContextHandler.Context.class));
 
     server.setStopAtShutdown(false);
     server.setHandler(ctx);
@@ -173,8 +178,8 @@ public class JettyServerTest {
 
   private Block wsFactory = unit -> {
     WebSocketServerFactory factory = unit.constructor(WebSocketServerFactory.class)
-        .args(WebSocketPolicy.class)
-        .build(unit.get(WebSocketPolicy.class));
+        .args(ServletContext.class, WebSocketPolicy.class)
+        .build(unit.get(ContextHandler.Context.class), unit.get(WebSocketPolicy.class));
 
     factory.setCreator(isA(WebSocketCreator.class));
 
@@ -187,7 +192,7 @@ public class JettyServerTest {
   @Test
   public void startStopServer() throws Exception {
 
-    new MockUnit(HttpHandler.class, Provider.class)
+    new MockUnit(HttpHandler.class, Provider.class, ContextHandler.Context.class)
         .expect(pool)
         .expect(server)
         .expect(httpConf)