context: remove detach from Context

jknack · jknack · commit add72a5af4fe · 2025-10-19T10:54:00.000-03:00
- fix #3791 - handle undertow dispatch/detach internally
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -1010,18 +1010,6 @@ default Value lookup(String name) {
    */
   Context dispatch(@NonNull Executor executor, @NonNull Runnable action);
 
-  /**
-   * Tells context that response will be generated form a different thread. This operation is
-   * similar to {@link #dispatch(Runnable)} except there is no thread dispatching here.
-   *
-   * <p>This operation integrates easily with third-party libraries like rxJava or others.
-   *
-   * @param next Application code.
-   * @return This context.
-   * @throws Exception When detach operation fails.
-   */
-  Context detach(@NonNull Route.Handler next) throws Exception;
-
   /**
    * Perform a websocket handsahke and upgrade a HTTP GET into a websocket protocol.
    *
diff --git a/jooby/src/main/java/io/jooby/ForwardingContext.java b/jooby/src/main/java/io/jooby/ForwardingContext.java
@@ -1044,12 +1044,6 @@ public Context dispatch(@NonNull Executor executor, @NonNull Runnable action) {
     return this;
   }
 
-  @Override
-  public Context detach(@NonNull Route.Handler next) throws Exception {
-    ctx.detach(next);
-    return this;
-  }
-
   @Override
   public Context upgrade(@NonNull WebSocket.Initializer handler) {
     ctx.upgrade(handler);
diff --git a/jooby/src/main/java/io/jooby/Route.java b/jooby/src/main/java/io/jooby/Route.java
@@ -106,6 +106,9 @@ public void setRoute(Route route) {
     }
   }
 
+  /** Marker interface for reactive responses. */
+  public interface Reactive extends Filter {}
+
   /**
    * Decorates a handler and run logic before handler is executed.
    *
@@ -699,7 +702,7 @@ public Route setEncoder(@NonNull MessageEncoder encoder) {
    *
    * @return Truth when route is non-blocking. False otherwise or <code>null</code> otherwise.
    */
-  @NonNull public boolean isNonBlocking() {
+  public boolean isNonBlocking() {
     return nonBlocking == Boolean.TRUE;
   }
 
diff --git a/jooby/src/main/java/io/jooby/internal/Pipeline.java b/jooby/src/main/java/io/jooby/internal/Pipeline.java
@@ -6,7 +6,6 @@
 package io.jooby.internal;
 
 import static io.jooby.internal.handler.DefaultHandler.DEFAULT;
-import static io.jooby.internal.handler.DetachHandler.DETACH;
 import static io.jooby.internal.handler.WorkerHandler.WORKER;
 
 import java.util.concurrent.Executor;
@@ -20,19 +19,11 @@
 public class Pipeline {
 
   public static Handler build(
-      boolean requiresDetach,
-      Route route,
-      ExecutionMode mode,
-      Executor executor,
-      ContextInitializer initializer) {
+      Route route, ExecutionMode mode, Executor executor, ContextInitializer initializer) {
     // Set default wrapper and blocking mode
     if (!route.isNonBlockingSet()) {
       route.setNonBlocking(isDefaultNonblocking(executor, mode));
     }
-    Route.Filter wrapper = DEFAULT;
-    if (requiresDetach && route.isNonBlocking()) {
-      wrapper = DETACH.then(wrapper);
-    }
 
     // Non-Blocking? Split pipeline Head+Handler let reactive call After pipeline
     Handler pipeline;
@@ -43,7 +34,7 @@ public static Handler build(
       pipeline = route.getPipeline();
     }
     return dispatchHandler(
-        mode, executor, decorate(initializer, wrapper.then(pipeline)), route.isNonBlocking());
+        mode, executor, decorate(initializer, DEFAULT.then(pipeline)), route.isNonBlocking());
   }
 
   private static boolean isDefaultNonblocking(Executor executor, ExecutionMode mode) {
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -592,10 +592,8 @@ public void initialize() {
             prependMediaType(route.getConsumes(), route.getFilter(), Route.SUPPORT_MEDIA_TYPE));
         route.setFilter(prependMediaType(route.getProduces(), route.getFilter(), Route.ACCEPT));
       }
-      boolean requiresDetach = server.getName().equals("undertow");
       Route.Handler pipeline =
-          Pipeline.build(
-              requiresDetach, route, forceMode(route, mode), executor, postDispatchInitializer);
+          Pipeline.build(route, forceMode(route, mode), executor, postDispatchInitializer);
       route.setPipeline(pipeline);
       /** Final render */
       route.setEncoder(encoder);
diff --git a/jooby/src/main/java/io/jooby/internal/handler/ConcurrentHandler.java b/jooby/src/main/java/io/jooby/internal/handler/ConcurrentHandler.java
@@ -15,7 +15,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Route;
 
-public class ConcurrentHandler implements Route.Filter {
+public class ConcurrentHandler implements Route.Reactive {
 
   @NonNull @Override
   public Route.Handler apply(@NonNull Route.Handler next) {
@@ -38,11 +38,11 @@ public Route.Handler apply(@NonNull Route.Handler next) {
                   after.apply(ctx, value, unwrap((Throwable) x));
                 }
                 if (x != null) {
-                  Throwable exception = unwrap((Throwable) x);
+                  Throwable exception = unwrap(x);
                   ctx.sendError(exception);
                 } else {
                   // See https://github.com/jooby-project/jooby/issues/3486
-                  if (!ctx.isResponseStarted() && value != ctx) {
+                  if (!ctx.isResponseStarted() && value != ctx && value != null) {
                     ctx.render(value);
                   }
                 }
diff --git a/jooby/src/main/java/io/jooby/internal/handler/DetachHandler.java b/jooby/src/main/java/io/jooby/internal/handler/DetachHandler.java
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java b/modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java
@@ -370,12 +370,6 @@ public Context dispatch(@NonNull Executor executor, @NonNull Runnable action) {
     return this;
   }
 
-  @NonNull @Override
-  public Context detach(@NonNull Route.Handler next) throws Exception {
-    next.apply(this);
-    return this;
-  }
-
   @NonNull @Override
   public Context upgrade(@NonNull WebSocket.Initializer handler) {
     try {
diff --git a/modules/jooby-mutiny/src/main/java/io/jooby/mutiny/Mutiny.java b/modules/jooby-mutiny/src/main/java/io/jooby/mutiny/Mutiny.java
@@ -23,7 +23,7 @@
 public class Mutiny {
 
   private static final Route.Filter MUTINY =
-      new Route.Filter() {
+      new Route.Reactive() {
 
         private void after(Context ctx, Object value, Throwable failure) {
           Route.After after = ctx.getRoute().getAfter();
diff --git a/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java b/modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyContext.java
@@ -253,12 +253,6 @@ public Context dispatch(Executor executor, Runnable action) {
     return this;
   }
 
-  @NonNull @Override
-  public Context detach(@NonNull Route.Handler next) throws Exception {
-    next.apply(this);
-    return this;
-  }
-
   @NonNull @Override
   public QueryString query() {
     if (query == null) {
diff --git a/modules/jooby-reactor/src/main/java/io/jooby/reactor/Reactor.java b/modules/jooby-reactor/src/main/java/io/jooby/reactor/Reactor.java
@@ -24,7 +24,7 @@
 public class Reactor {
 
   private static final Route.Filter REACTOR =
-      new Route.Filter() {
+      new Route.Reactive() {
 
         private void after(Context ctx, Object value, Throwable failure) {
           Route.After after = ctx.getRoute().getAfter();
@@ -38,14 +38,14 @@ private void after(Context ctx, Object value, Throwable failure) {
           }
         }
 
-        @NonNull @Override
+        @Override
         public Route.Handler apply(@NonNull Route.Handler next) {
           return ctx -> {
             Object result = next.apply(ctx);
             if (ctx.isResponseStarted()) {
               // Return context to mark as handled
               return ctx;
-            } else if (result instanceof Flux flux) {
+            } else if (result instanceof Flux<?> flux) {
               flux.subscribe(toSubscriber(newSubscriber(ctx)));
               // Return context to mark as handled
               return ctx;
@@ -57,7 +57,6 @@ public Route.Handler apply(@NonNull Route.Handler next) {
                         after(ctx, value, null);
                         // See https://github.com/jooby-project/jooby/issues/3486
                         if (!ctx.isResponseStarted() && value != ctx) {
-
                           // render:
                           ctx.render(value);
                         }
diff --git a/modules/jooby-rxjava3/src/main/java/io/jooby/rxjava3/Reactivex.java b/modules/jooby-rxjava3/src/main/java/io/jooby/rxjava3/Reactivex.java
@@ -26,8 +26,8 @@
 public class Reactivex {
 
   private static final Route.Filter RX =
-      new Route.Filter() {
-        @NonNull @Override
+      new Route.Reactive() {
+        @Override
         public Route.Handler apply(@NonNull Route.Handler next) {
           return ctx -> {
             Object result = next.apply(ctx);
diff --git a/modules/jooby-test/src/main/java/io/jooby/test/MockContext.java b/modules/jooby-test/src/main/java/io/jooby/test/MockContext.java
@@ -471,12 +471,6 @@ public MockContext dispatch(@NonNull Executor executor, @NonNull Runnable action
     return this;
   }
 
-  @Override
-  public MockContext detach(@NonNull Route.Handler next) throws Exception {
-    next.apply(this);
-    return this;
-  }
-
   @Override
   public Map<String, Object> getAttributes() {
     return attributes;
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowContext.java b/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowContext.java
@@ -71,12 +71,14 @@ public class UndertowContext implements DefaultContext, IoCallback {
   private String remoteAddress;
   private String host;
   private int port;
+  private int bufferSize;
 
-  public UndertowContext(HttpServerExchange exchange, Router router) {
+  public UndertowContext(HttpServerExchange exchange, Router router, int bufferSize) {
     this.exchange = exchange;
     this.router = router;
     this.method = exchange.getRequestMethod().toString().toUpperCase();
     this.requestPath = exchange.getRequestPath();
+    this.bufferSize = bufferSize;
   }
 
   boolean isHttpGet() {
@@ -134,6 +136,9 @@ public Route getRoute() {
   @NonNull @Override
   public Context setRoute(Route route) {
     this.route = route;
+    if (this.route.isNonBlocking()) {
+      this.exchange.dispatch();
+    }
     return this;
   }
 
@@ -283,22 +288,6 @@ public Context dispatch(@NonNull Executor executor, @NonNull Runnable action) {
     return this;
   }
 
-  @NonNull @Override
-  public Context detach(@NonNull Route.Handler next) throws Exception {
-    exchange.dispatch(SameThreadExecutor.INSTANCE, detach(this, next));
-    return this;
-  }
-
-  private static Runnable detach(Context ctx, Route.Handler next) {
-    return () -> {
-      try {
-        next.apply(ctx);
-      } catch (Exception cause) {
-        ctx.sendError(cause);
-      }
-    };
-  }
-
   @NonNull @Override
   public Context upgrade(@NonNull WebSocket.Initializer handler) {
     try {
@@ -484,6 +473,7 @@ public Context send(@NonNull ByteBuffer[] data) {
 
   @NonNull @Override
   public Context send(@NonNull ByteBuffer data) {
+    ifUnDispatch(data);
     exchange.setResponseContentLength(data.remaining());
     exchange.getResponseHeaders().put(Headers.CONTENT_LENGTH, Long.toString(data.remaining()));
     exchange.getResponseSender().send(data, this);
@@ -652,6 +642,12 @@ private void ifSetChunked() {
     }
   }
 
+  private void ifUnDispatch(ByteBuffer data) {
+    if (data.remaining() > bufferSize && exchange.isDispatched()) {
+      exchange.unDispatch();
+    }
+  }
+
   private void ifStartBlocking() {
     if (!exchange.isBlocking()) {
       exchange.startBlocking();
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowHandler.java b/modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowHandler.java
@@ -40,7 +40,7 @@ public UndertowHandler(
   @Override
   public void handleRequest(HttpServerExchange exchange) throws Exception {
     var router = ctxSelector.select(exchange.getRequestPath());
-    var context = new UndertowContext(exchange, router);
+    var context = new UndertowContext(exchange, router, bufferSize);
 
     /* default headers: */
     HeaderMap responseHeaders = exchange.getResponseHeaders();
diff --git a/modules/jooby-vertx/src/main/java/io/jooby/vertx/VertxHandler.java b/modules/jooby-vertx/src/main/java/io/jooby/vertx/VertxHandler.java
@@ -8,7 +8,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
 import io.jooby.Route;
 import io.vertx.core.Future;
@@ -29,7 +28,7 @@
  * @author edgar
  * @since 4.0.8
  */
-public class VertxHandler implements Route.Filter {
+public class VertxHandler implements Route.Reactive {
   private static class AsyncFileHandler {
     private final Context ctx;
     private final OutputStream out;
@@ -85,7 +84,7 @@ private void handle(Buffer buffer) {
   }
 
   @Override
-  public @NonNull Route.Handler apply(Route.Handler next) {
+  public Route.Handler apply(Route.Handler next) {
     return ctx -> {
       var result = next.apply(ctx);
       if (ctx.isResponseStarted()) {
diff --git a/tests/src/test/java/examples/Performance.java b/tests/src/test/java/examples/Performance.java
@@ -14,7 +14,7 @@
 import io.jooby.Jooby;
 import io.jooby.ServerOptions;
 import io.jooby.StartupSummary;
-import io.jooby.jetty.JettyServer;
+import io.jooby.undertow.UndertowServer;
 
 public class Performance extends Jooby {
 
@@ -43,6 +43,6 @@ public class Performance extends Jooby {
 
   public static void main(final String[] args) {
     System.setProperty("io.netty.disableHttpHeadersValidation", "true");
-    runApp(args, new JettyServer(new ServerOptions()), EVENT_LOOP, Performance::new);
+    runApp(args, new UndertowServer(new ServerOptions()), EVENT_LOOP, Performance::new);
   }
 }
diff --git a/tests/src/test/java/io/jooby/test/FeaturedTest.java b/tests/src/test/java/io/jooby/test/FeaturedTest.java
@@ -55,23 +55,7 @@
 
 import com.google.common.base.Splitter;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.AttachedFile;
-import io.jooby.Context;
-import io.jooby.Cookie;
-import io.jooby.FileDownload;
-import io.jooby.FileUpload;
-import io.jooby.FlashMap;
-import io.jooby.Formdata;
-import io.jooby.InlineFile;
-import io.jooby.Jooby;
-import io.jooby.ModelAndView;
-import io.jooby.Router;
-import io.jooby.RouterOptions;
-import io.jooby.SameSite;
-import io.jooby.ServerOptions;
-import io.jooby.ServiceKey;
-import io.jooby.ServiceRegistry;
-import io.jooby.StatusCode;
+import io.jooby.*;
 import io.jooby.handlebars.HandlebarsModule;
 import io.jooby.handler.AccessLogHandler;
 import io.jooby.handler.AssetHandler;

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ public void setRoute(Route route) {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ /** Marker interface for reactive responses. */`
	`110`	`+ public interface Reactive extends Filter {}`
	`111`	`+`
`109`	`112`	`/**`
`110`	`113`	`* Decorates a handler and run logic before handler is executed.`
`111`	`114`	`*`
`@@ -699,7 +702,7 @@ public Route setEncoder(@NonNull MessageEncoder encoder) {`
`699`	`702`	`*`
`700`	`703`	`* @return Truth when route is non-blocking. False otherwise or <code>null</code> otherwise.`
`701`	`704`	`*/`
`702`		`- @NonNull public boolean isNonBlocking() {`
	`705`	`+ public boolean isNonBlocking() {`
`703`	`706`	`return nonBlocking == Boolean.TRUE;`
`704`	`707`	`}`
`705`	`708`