Cannot use chain.next() with current MVC route implementation fix #924

Author: jknack

jooby/src/main/java/org/jooby/Jooby.java

@@ -2949,6 +2949,8 @@ private Injector bootstrap(final Config args,
 
       binder.bind(Request.class).toProvider(Providers.outOfScope(Request.class))
           .in(RequestScoped.class);
+      binder.bind(Route.Chain.class).toProvider(Providers.outOfScope(Route.Chain.class))
+          .in(RequestScoped.class);
       binder.bind(Response.class).toProvider(Providers.outOfScope(Response.class))
           .in(RequestScoped.class);
       /** server sent event */

jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java

@@ -312,6 +312,8 @@ public boolean equals(final Object obj) {
 
   private static final Key<Request> REQ = Key.get(Request.class);
 
+  private static final Key<Route.Chain> CHAIN = Key.get(Route.Chain.class);
+
   private static final Key<Response> RSP = Key.get(Response.class);
 
   private static final Key<Sse> SSE = Key.get(Sse.class);
@@ -489,7 +491,9 @@ public void handle(final NativeRequest request, final NativeResponse response) t
       Route[] routes = routeCache
           .getUnchecked(new RouteKey(method, path, type, req.accept()));
 
-      new RouteChain(req, rsp, routes).next(req, rsp);
+      RouteChain chain = new RouteChain(req, rsp, routes);
+      scope.put(CHAIN, chain);
+      chain.next(req, rsp);
 
     } catch (DeferredExecution ex) {
       deferred = true;

jooby/src/main/java/org/jooby/internal/MappedHandler.java

@@ -215,18 +215,23 @@
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class MappedHandler implements Filter {
 
-  private Throwing.Function2<Request, Response, Object> supplier;
+  private Throwing.Function3<Request, Response, Route.Chain, Object> supplier;
   private Mapper mapper;
 
-  public MappedHandler(final Throwing.Function2<Request, Response, Object> supplier,
+  public MappedHandler(final Throwing.Function3<Request, Response, Route.Chain, Object> supplier,
       final Route.Mapper mapper) {
     this.supplier = supplier;
     this.mapper = mapper;
   }
 
+  public MappedHandler(final Throwing.Function2<Request, Response, Object> supplier,
+      final Route.Mapper mapper) {
+    this((req, rsp, chain) -> supplier.apply(req, rsp), mapper);
+  }
+
   @Override
   public void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {
-    Object input = supplier.apply(req, rsp);
+    Object input = supplier.apply(req, rsp, chain);
     Object output = Try
         .apply(() -> mapper.map(input))
         .recover(ClassCastException.class, input)

jooby/src/main/java/org/jooby/internal/RouteImpl.java

@@ -258,7 +258,8 @@ public RouteImpl(final Filter filter, final Definition route, final String metho
         if (((MvcHandler) filter).method().getReturnType() == void.class) {
           this.filter = filter;
         } else {
-          this.filter = new MappedHandler((req, rsp) -> ((MvcHandler) filter).invoke(req, rsp),
+          this.filter = new MappedHandler((req, rsp, chain) -> ((MvcHandler) filter).invoke(req, rsp,
+              chain),
             mapper);
         }
       } else {

jooby/src/main/java/org/jooby/internal/mvc/MvcHandler.java

@@ -236,7 +236,7 @@ public class RequestParam {
 
   private interface GetValue {
 
-    Object apply(Request req, Response rsp, RequestParam param) throws Exception;
+    Object apply(Request req, Response rsp, Route.Chain chain, RequestParam param) throws Exception;
 
   }
 
@@ -255,56 +255,60 @@ private interface GetValue {
     /**
      * Body
      */
-    builder.put(bodyType, (req, rsp, param) -> req.body().to(param.type));
+    builder.put(bodyType, (req, rsp, chain, param) -> req.body().to(param.type));
     /**
      * Request
      */
-    builder.put(TypeLiteral.get(Request.class), (req, rsp, param) -> req);
+    builder.put(TypeLiteral.get(Request.class), (req, rsp, chain, param) -> req);
     /**
      * Route
      */
-    builder.put(TypeLiteral.get(Route.class), (req, rsp, param) -> req.route());
+    builder.put(TypeLiteral.get(Route.class), (req, rsp, chain, param) -> req.route());
     /**
      * Response
      */
-    builder.put(TypeLiteral.get(Response.class), (req, rsp, param) -> rsp);
+    builder.put(TypeLiteral.get(Response.class), (req, rsp, chain, param) -> rsp);
+    /**
+     * Route.Chain
+     */
+    builder.put(TypeLiteral.get(Route.Chain.class), (req, rsp, chain, param) -> chain);
     /**
      * Session
      */
-    builder.put(TypeLiteral.get(Session.class), (req, rsp, param) -> req.session());
+    builder.put(TypeLiteral.get(Session.class), (req, rsp, chain, param) -> req.session());
     builder.put(TypeLiteral.get(Types.newParameterizedType(Optional.class, Session.class)),
-        (req, rsp, param) -> req.ifSession());
+        (req, rsp, chain, param) -> req.ifSession());
 
     /**
      * Files
      */
-    builder.put(TypeLiteral.get(Upload.class), (req, rsp, param) -> req.file(param.name));
+    builder.put(TypeLiteral.get(Upload.class), (req, rsp, chain, param) -> req.file(param.name));
     builder.put(TypeLiteral.get(Types.newParameterizedType(Optional.class, Upload.class)),
-        (req, rsp, param) -> {
+        (req, rsp, chain, param) -> {
           List<Upload> files = req.files(param.name);
           return files.size() == 0 ? Optional.empty() : Optional.of(files.get(0));
         });
     builder.put(TypeLiteral.get(Types.newParameterizedType(List.class, Upload.class)),
-        (req, rsp, param) -> req.files(param.name));
+        (req, rsp, chain, param) -> req.files(param.name));
 
     /**
      * Cookie
      */
-    builder.put(TypeLiteral.get(Cookie.class), (req, rsp, param) -> req.cookies().stream()
+    builder.put(TypeLiteral.get(Cookie.class), (req, rsp, chain, param) -> req.cookies().stream()
         .filter(c -> c.name().equalsIgnoreCase(param.name)).findFirst().get());
-    builder.put(TypeLiteral.get(Types.listOf(Cookie.class)), (req, rsp, param) -> req.cookies());
+    builder.put(TypeLiteral.get(Types.listOf(Cookie.class)), (req, rsp, chain, param) -> req.cookies());
     builder.put(TypeLiteral.get(Types.newParameterizedType(Optional.class, Cookie.class)),
-        (req, rsp, param) -> req.cookies().stream()
+        (req, rsp, chain, param) -> req.cookies().stream()
             .filter(c -> c.name().equalsIgnoreCase(param.name)).findFirst());
     /**
      * Header
      */
-    builder.put(headerType, (req, rsp, param) -> req.header(param.name).to(param.type));
+    builder.put(headerType, (req, rsp, chain, param) -> req.header(param.name).to(param.type));
 
     /**
      * Local
      */
-    builder.put(localType, (req, rsp, param) -> {
+    builder.put(localType, (req, rsp, chain, param) -> {
       if (param.type.getRawType() == Map.class) {
         return req.attributes();
       }
@@ -318,7 +322,7 @@ private interface GetValue {
     /**
      * Flash
      */
-    builder.put(flashType, (req, rsp, param) -> {
+    builder.put(flashType, (req, rsp, chain, param) -> {
       Class rawType = param.type.getRawType();
       if (Map.class.isAssignableFrom(rawType)) {
         return req.flash();
@@ -360,8 +364,8 @@ public RequestParam(final AnnotatedElement elem, final String name, final Type t
     this.strategy = injector.getOrDefault(strategyType, param());
   }
 
-  public Object value(final Request req, final Response rsp) throws Throwable {
-    return strategy.apply(req, rsp, this);
+  public Object value(final Request req, final Response rsp, final Route.Chain chain) throws Throwable {
+    return strategy.apply(req, rsp, chain, this);
   }
 
   public static String nameFor(final Parameter param) {
@@ -387,7 +391,7 @@ private static String findName(final AnnotatedElement elem) {
   }
 
   private static final GetValue param() {
-    return (req, rsp, param) -> {
+    return (req, rsp, chain, param) -> {
       Mutant mutant = req.param(param.name);
       if (mutant.isSet() || param.optional) {
         return mutant.to(param.type);
@@ -400,5 +404,4 @@ private static final GetValue param() {
       }
     };
   }
-
 }