Context detaches when runnin in event-loop and returns a Context

jknack · jknack · commit 7b695468d6a2 · 2019-07-26T15:14:39.000-03:00
diff --git a/jooby/src/main/java/io/jooby/internal/Pipeline.java b/jooby/src/main/java/io/jooby/internal/Pipeline.java
@@ -135,6 +135,9 @@ public static Handler compute(ClassLoader loader, Route route, ExecutionMode mod
     }
     /** Context: */
     if (Context.class.isAssignableFrom(type)) {
+      if (executor == null && mode == ExecutionMode.EVENT_LOOP) {
+        return next(mode, executor, new DetachHandler(route.getPipeline()), false);
+      }
       return next(mode, executor, new SendDirect(route.getPipeline()), true);
     }
     /** InputStream: */
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java b/modules/jooby-jetty/src/main/java/io/jooby/jetty/Jetty.java
@@ -5,7 +5,6 @@
  */
 package io.jooby.jetty;
 
-import io.jooby.ExecutionMode;
 import io.jooby.Jooby;
 import io.jooby.ServerOptions;
 import io.jooby.SneakyThrows;
@@ -63,8 +62,6 @@ public class Jetty extends io.jooby.Server.Base {
       System.setProperty("org.eclipse.jetty.server.Request.maxFormContentSize",
           Long.toString(options.getMaxRequestSize()));
 
-      /** Jetty only support worker executor: */
-      application.setExecutionMode(ExecutionMode.WORKER);
       applications.add(application);
 
       addShutdownHook();
diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java
@@ -17,6 +17,7 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -45,6 +46,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Scanner;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -2459,6 +2461,23 @@ public void templateEngines() {
     });
   }
 
+  @Test
+  @DisplayName("Context detaches when running in event-loop and returns a Context")
+  public void detachOnEventLoop() {
+    new JoobyRunner(app -> {
+      app.get("/detach", ctx -> {
+        CompletableFuture.runAsync(() -> {
+          ctx.send(ctx.pathString());
+        });
+        return ctx;
+      });
+    }).mode(ExecutionMode.EVENT_LOOP).ready(client -> {
+      client.get("/detach", rsp -> {
+        assertEquals("/detach", rsp.body().string().trim());
+      });
+    });
+  }
+
   private static String readText(Path file) {
     try {
       return new String(Files.readAllBytes(file), StandardCharsets.UTF_8);

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,9 @@ public static Handler compute(ClassLoader loader, Route route, ExecutionMode mod`
`135`	`135`	`}`
`136`	`136`	`/** Context: */`
`137`	`137`	`if (Context.class.isAssignableFrom(type)) {`
	`138`	`+ if (executor == null && mode == ExecutionMode.EVENT_LOOP) {`
	`139`	`+ return next(mode, executor, new DetachHandler(route.getPipeline()), false);`
	`140`	`+ }`
`138`	`141`	`return next(mode, executor, new SendDirect(route.getPipeline()), true);`
`139`	`142`	`}`
`140`	`143`	`/** InputStream: */`