route: remove handle field

- more code cleanup

Author: jknack

jooby/src/main/java/io/jooby/Route.java

@@ -442,8 +442,6 @@ public MethodHandle toMethodHandle() {
 
   private MessageEncoder encoder;
 
-  private Object handle;
-
   private List<MediaType> produces = EMPTY_LIST;
 
   private List<MediaType> consumes = EMPTY_LIST;
@@ -477,7 +475,6 @@ public Route(@NonNull String method, @NonNull String pattern, @NonNull Handler h
     this.method = method.toUpperCase();
     this.pattern = pattern;
     this.handler = handler;
-    this.handle = handler;
   }
 
   /**
@@ -561,17 +558,6 @@ public Route(@NonNull String method, @NonNull String pattern, @NonNull Handler h
     return Router.reverse(getPattern(), values);
   }
 
-  /**
-   * Handler instance which might or might not be the same as {@link #getHandler()}.
-   *
-   * <p>The handle is required to extract correct metadata.
-   *
-   * @return Handle.
-   */
-  public @NonNull Object getHandle() {
-    return handle;
-  }
-
   /**
    * After filter or <code>null</code>.
    *
@@ -612,17 +598,6 @@ public Route(@NonNull String method, @NonNull String pattern, @NonNull Handler h
     return this;
   }
 
-  /**
-   * Set route handle instance, required when handle is different from {@link #getHandler()}.
-   *
-   * @param handle Handle instance.
-   * @return This route.
-   */
-  public @NonNull Route setHandle(@NonNull Object handle) {
-    this.handle = handle;
-    return this;
-  }
-
   /**
    * Set route pipeline. This method is part of public API but isn't intended to be used by public.
    *
@@ -1112,17 +1087,11 @@ private void addHttpMethod(boolean enabled, String httpMethod) {
   }
 
   private Route.Handler computePipeline() {
-    Route.Handler pipeline = computeHeadPipeline();
+    Route.Handler pipeline = filter == null ? handler : filter.then(handler);
 
     if (after != null) {
       pipeline = pipeline.then(after);
     }
     return pipeline;
   }
-
-  private Route.Handler computeHeadPipeline() {
-    Route.Handler pipeline = filter == null ? handler : filter.then(handler);
-
-    return pipeline;
-  }
 }

jooby/src/main/java/io/jooby/WebSocket.java

@@ -55,6 +55,10 @@ interface Initializer {
     void init(@NonNull Context ctx, @NonNull WebSocketConfigurer configurer);
   }
 
+  interface Handler extends Route.Handler {
+    Initializer getInitializer();
+  }
+
   /** On connect callback. */
   interface OnConnect {
     /**

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -446,14 +446,12 @@ public Router setOutputFactory(@NonNull BufferedOutputFactory outputFactory) {
 
   @NonNull @Override
   public Route ws(@NonNull String pattern, @NonNull WebSocket.Initializer handler) {
-    return route(WS, pattern, new WebSocketHandler(handler)).setHandle(handler);
+    return route(WS, pattern, new WebSocketHandler(handler));
   }
 
   @NonNull @Override
   public Route sse(@NonNull String pattern, @NonNull ServerSentEmitter.Handler handler) {
-    return route(SSE, pattern, new ServerSentEventHandler(handler))
-        .setHandle(handler)
-        .setExecutorKey("worker");
+    return route(SSE, pattern, new ServerSentEventHandler(handler)).setExecutorKey("worker");
   }
 
   @Override
@@ -889,7 +887,6 @@ private void copy(Route src, Route it) {
     it.setFilter(filter);
     it.setAfter(after);
     it.setEncoder(src.getEncoder());
-    it.setHandle(src.getHandle());
     it.setProduces(src.getProduces());
     it.setConsumes(src.getConsumes());
     it.setAttributes(src.getAttributes());

jooby/src/main/java/io/jooby/internal/handler/WebSocketHandler.java

@@ -7,17 +7,20 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Context;
-import io.jooby.Route;
 import io.jooby.StatusCode;
 import io.jooby.WebSocket;
 
-public class WebSocketHandler implements Route.Handler {
+public class WebSocketHandler implements WebSocket.Handler {
   private WebSocket.Initializer handler;
 
   public WebSocketHandler(WebSocket.Initializer handler) {
     this.handler = handler;
   }
 
+  public WebSocket.Initializer getInitializer() {
+    return handler;
+  }
+
   @NonNull @Override
   public Object apply(@NonNull Context ctx) {
     boolean webSocket = ctx.header("Upgrade").value("").equalsIgnoreCase("WebSocket");

modules/jooby-kotlin/src/main/kotlin/io/jooby/kt/CoroutineRouter.kt

@@ -141,28 +141,26 @@ class CoroutineRouter(val coroutineStart: CoroutineStart, val router: Router) {
     route(OPTIONS, pattern, handler)
 
   fun route(method: String, pattern: String, handler: suspend HandlerContext.() -> Any): Route =
-    router
-      .route(method, pattern) { ctx ->
-        val handlerContext = HandlerContext(ctx)
-        launch(handlerContext) {
+    router.route(method, pattern) { ctx ->
+      val handlerContext = HandlerContext(ctx)
+      launch(handlerContext) {
+        try {
+          val result = handler(handlerContext)
+          ctx.route.after?.apply(ctx, result, null)
+          if (result != ctx && !ctx.isResponseStarted) {
+            ctx.render(result)
+          }
+        } catch (cause: Throwable) {
           try {
-            val result = handler(handlerContext)
-            ctx.route.after?.apply(ctx, result, null)
-            if (result != ctx && !ctx.isResponseStarted) {
-              ctx.render(result)
-            }
-          } catch (cause: Throwable) {
-            try {
-              ctx.route.after?.apply(ctx, null, cause)
-            } finally {
-              errorHandler.invoke(ErrorHandlerContext(ctx, cause, router.errorCode(cause)))
-            }
+            ctx.route.after?.apply(ctx, null, cause)
+          } finally {
+            errorHandler.invoke(ErrorHandlerContext(ctx, cause, router.errorCode(cause)))
           }
         }
-        // Return context to mark as handled
-        ctx
       }
-      .setHandle(handler)
+      // Return context to mark as handled
+      ctx
+    }
 
   internal fun launch(handlerContext: HandlerContext, block: suspend CoroutineScope.() -> Unit) {
     // Global catch-all exception handler

modules/jooby-kotlin/src/main/kotlin/io/jooby/kt/Kooby.kt

@@ -275,7 +275,7 @@ open class Kooby() : Jooby() {
 
   @RouterDsl
   fun route(method: String, pattern: String, handler: HandlerContext.() -> Any): Route {
-    return super.route(method, pattern) { ctx -> handler(HandlerContext(ctx)) }.setHandle(handler)
+    return super.route(method, pattern) { ctx -> handler(HandlerContext(ctx)) }
   }
 
   @RouterDsl

modules/jooby-test/src/main/java/io/jooby/test/MockRouter.java

@@ -495,12 +495,12 @@ private MockValue call(
     findContext.setRoute(route);
     Object value;
     try {
-      Route.Handler handler = fullExecution ? route.getPipeline() : route.getHandler();
       if (route.getMethod().equals(Router.WS)) {
-        WebSocket.Initializer initializer = (WebSocket.Initializer) route.getHandle();
-        MockWebSocketConfigurer configurer = new MockWebSocketConfigurer(ctx, initializer);
+        var initializer = ((WebSocket.Handler) route.getHandler()).getInitializer();
+        var configurer = new MockWebSocketConfigurer(ctx, initializer);
         return new SingleMockValue(configurer);
       } else {
+        var handler = fullExecution ? route.getPipeline() : route.getHandler();
         value = handler.apply(ctx);
         if (ctx instanceof MockContext) {
           MockResponse response = ((MockContext) ctx).getResponse();