Simplify detach operation (clean up call stack)

jknack · jknack · commit 3e63b9e2b433 · 2019-07-26T15:30:30.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -697,10 +697,10 @@ public interface Context extends Registry {
    *
    * This operation integrates easily with third-party libraries like rxJava or others.
    *
-   * @param action Application code.
+   * @param next Application code.
    * @return This context.
    */
-  @Nonnull Context detach(@Nonnull Runnable action);
+  @Nonnull Context detach(@Nonnull Route.Handler next) throws Exception;
 
   /*
    * **********************************************************************************************
diff --git a/jooby/src/main/java/io/jooby/ForwardingContext.java b/jooby/src/main/java/io/jooby/ForwardingContext.java
@@ -301,8 +301,8 @@ public ForwardingContext(@Nonnull Context context) {
     return this;
   }
 
-  @Override @Nonnull public Context detach(@Nonnull Runnable action) {
-    context.detach(action);
+  @Override @Nonnull public Context detach(@Nonnull Route.Handler next) throws Exception {
+    context.detach(next);
     return this;
   }
 
diff --git a/jooby/src/main/java/io/jooby/internal/handler/DetachHandler.java b/jooby/src/main/java/io/jooby/internal/handler/DetachHandler.java
@@ -17,14 +17,8 @@ public DetachHandler(Route.Handler next) {
     this.next = next;
   }
 
-  @Nonnull @Override public Object apply(@Nonnull Context ctx) {
-    return ctx.detach(() -> {
-      try {
-        next.apply(ctx);
-      } catch (Throwable x) {
-        ctx.sendError(x);
-      }
-    });
+  @Nonnull @Override public Object apply(@Nonnull Context ctx) throws Exception {
+    return ctx.detach(next);
   }
 
   @Override public Route.Handler next() {
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
@@ -244,9 +244,9 @@ public Context dispatch(@Nonnull Executor executor, @Nonnull Runnable action) {
     return this;
   }
 
-  @Nonnull @Override public Context detach(@Nonnull Runnable action) {
+  @Nonnull @Override public Context detach(@Nonnull Route.Handler next) throws Exception {
     ifStartAsync();
-    action.run();
+    next.apply(this);
     return this;
   }
 
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
@@ -172,8 +172,8 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S
     return this;
   }
 
-  @Nonnull @Override public Context detach(@Nonnull Runnable action) {
-    action.run();
+  @Nonnull @Override public Context detach(@Nonnull Route.Handler next) throws Exception {
+    next.apply(this);
     return this;
   }
 
diff --git a/modules/jooby-test/src/main/java/io/jooby/MockContext.java b/modules/jooby-test/src/main/java/io/jooby/MockContext.java
@@ -295,8 +295,8 @@ public MockContext dispatch(@Nonnull Executor executor, @Nonnull Runnable action
     return this;
   }
 
-  @Nonnull @Override public MockContext detach(@Nonnull Runnable action) {
-    action.run();
+  @Nonnull @Override public MockContext detach(@Nonnull Route.Handler next) throws Exception {
+    next.apply(this);
     return this;
   }
 
diff --git a/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java b/modules/jooby-utow/src/main/java/io/jooby/internal/utow/UtowContext.java
@@ -204,8 +204,14 @@ public UtowContext(HttpServerExchange exchange, Router router) {
     return this;
   }
 
-  @Nonnull @Override public Context detach(@Nonnull Runnable action) {
-    exchange.dispatch(SameThreadExecutor.INSTANCE, action);
+  @Nonnull @Override public Context detach(@Nonnull Route.Handler next) {
+    exchange.dispatch(SameThreadExecutor.INSTANCE, () -> {
+      try {
+        next.apply(this);
+      } catch (Throwable x) {
+        sendError(x);
+      }
+    });
     return this;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -697,10 +697,10 @@ public interface Context extends Registry {`
`697`	`697`	`*`
`698`	`698`	`* This operation integrates easily with third-party libraries like rxJava or others.`
`699`	`699`	`*`
`700`		`- * @param action Application code.`
	`700`	`+ * @param next Application code.`
`701`	`701`	`* @return This context.`
`702`	`702`	`*/`
`703`		`- @Nonnull Context detach(@Nonnull Runnable action);`
	`703`	`+ @Nonnull Context detach(@Nonnull Route.Handler next) throws Exception;`
`704`	`704`
`705`	`705`	`/*`
`706`	`706`	`* **********************************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -301,8 +301,8 @@ public ForwardingContext(@Nonnull Context context) {`
`301`	`301`	`return this;`
`302`	`302`	`}`
`303`	`303`
`304`		`- @Override @Nonnull public Context detach(@Nonnull Runnable action) {`
`305`		`- context.detach(action);`
	`304`	`+ @Override @Nonnull public Context detach(@Nonnull Route.Handler next) throws Exception {`
	`305`	`+ context.detach(next);`
`306`	`306`	`return this;`
`307`	`307`	`}`
`308`	`308`
Original file line number	Diff line number	Diff line change
`@@ -244,9 +244,9 @@ public Context dispatch(@Nonnull Executor executor, @Nonnull Runnable action) {`
`244`	`244`	`return this;`
`245`	`245`	`}`
`246`	`246`
`247`		`- @Nonnull @Override public Context detach(@Nonnull Runnable action) {`
	`247`	`+ @Nonnull @Override public Context detach(@Nonnull Route.Handler next) throws Exception {`
`248`	`248`	`ifStartAsync();`
`249`		`- action.run();`
	`249`	`+ next.apply(this);`
`250`	`250`	`return this;`
`251`	`251`	`}`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,8 @@ public NettyContext(ChannelHandlerContext ctx, HttpRequest req, Router router, S`
`172`	`172`	`return this;`
`173`	`173`	`}`
`174`	`174`
`175`		`- @Nonnull @Override public Context detach(@Nonnull Runnable action) {`
`176`		`- action.run();`
	`175`	`+ @Nonnull @Override public Context detach(@Nonnull Route.Handler next) throws Exception {`
	`176`	`+ next.apply(this);`
`177`	`177`	`return this;`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -295,8 +295,8 @@ public MockContext dispatch(@Nonnull Executor executor, @Nonnull Runnable action`
`295`	`295`	`return this;`
`296`	`296`	`}`
`297`	`297`
`298`		`- @Nonnull @Override public MockContext detach(@Nonnull Runnable action) {`
`299`		`- action.run();`
	`298`	`+ @Nonnull @Override public MockContext detach(@Nonnull Route.Handler next) throws Exception {`
	`299`	`+ next.apply(this);`
`300`	`300`	`return this;`
`301`	`301`	`}`
`302`	`302`