after route: dont allow to change the response value

Author: jknack

examples/src/main/java/examples/DispatchApp.java

@@ -21,8 +21,6 @@ public class DispatchApp extends Jooby {
     });
 
     after((ctx, value) -> {
-      Number n = (Number) value;
-      return n.intValue() * 2;
     });
 
     get("/", ctx -> ctx.query("n").intValue(2));

examples/src/main/java/examples/Poc.java

@@ -0,0 +1,30 @@
+package examples;
+
+import io.jooby.Jooby;
+import io.jooby.Route;
+import io.reactivex.Single;
+
+import javax.annotation.Nonnull;
+
+public class Poc extends Jooby {
+
+  {
+
+    decorator(next -> ctx -> {
+      return next.apply(ctx);
+    });
+
+    decorator(next -> ctx -> {
+      return next.apply(ctx);
+    });
+
+    decorator(next -> ctx -> {
+      Single<String> single = Single.just("v");
+      single.doOnSuccess(value -> {
+        next.apply(ctx);
+      });
+      return next.apply(ctx);
+    });
+
+  }
+}

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

@@ -118,7 +118,10 @@ public interface After {
      * @return A new decorator.
      */
     @Nonnull default After then(@Nonnull After next) {
-      return (ctx, result) -> apply(ctx, next.apply(ctx, result));
+      return (ctx, result) -> {
+        next.apply(ctx, result);
+        apply(ctx, result);
+      };
     }
 
     /**
@@ -129,7 +132,7 @@ public interface After {
      * @return Response to send.
      * @throws Exception If something goes wrong.
      */
-    @Nonnull Object apply(@Nonnull Context ctx, Object result) throws Exception;
+    @Nonnull void apply(@Nonnull Context ctx, Object result) throws Exception;
   }
 
   /**
@@ -167,14 +170,19 @@ public interface Handler extends Serializable {
      * @return A new handler.
      */
     @Nonnull default Handler then(@Nonnull After next) {
-      return ctx -> next.apply(ctx, apply(ctx));
+      return ctx -> {
+        Object result = apply(ctx);
+        next.apply(ctx, result);
+        return result;
+      };
     }
   }
 
   /**
    * Handler for {@link StatusCode#NOT_FOUND} responses.
    */
-  public static final Handler NOT_FOUND = ctx -> ctx.sendError(new StatusCodeException(StatusCode.NOT_FOUND));
+  public static final Handler NOT_FOUND = ctx -> ctx
+      .sendError(new StatusCodeException(StatusCode.NOT_FOUND));
 
   /**
    * Handler for {@link StatusCode#METHOD_NOT_ALLOWED} responses.

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

@@ -310,6 +310,7 @@ public MockContext setResponseType(@Nonnull MediaType contentType, @Nullable Cha
    * @return Mock response.
    */
   @Nonnull public MockResponse getResponse() {
+    response.setHeaders(responseHeaders);
     return response;
   }
 
@@ -409,7 +410,7 @@ public MockContext setResponseType(@Nonnull MediaType contentType, @Nullable Cha
   }
 
   @Nonnull @Override public MockContext setResponseCookie(@Nonnull Cookie cookie) {
-    String setCookie = response.getHeaders().get("Set-Cookie");
+    String setCookie = (String) response.getHeaders().get("Set-Cookie");
     if (setCookie == null) {
       setCookie = cookie.toCookieString();
     } else {

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

@@ -44,7 +44,7 @@ public class MockResponse implements MockValue {
 
   private StatusCode statusCode = StatusCode.OK;
 
-  private Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+  private Map<String, Object> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 
   private MediaType contentType;
 
@@ -55,7 +55,7 @@ public class MockResponse implements MockValue {
    *
    * @return Response headers.
    */
-  public @Nonnull Map<String, String> getHeaders() {
+  public @Nonnull Map<String, Object> getHeaders() {
     return headers == null ? Collections.emptyMap() : Collections.unmodifiableMap(headers);
   }
 
@@ -65,7 +65,7 @@ public class MockResponse implements MockValue {
    * @param headers Response headers.
    * @return This response.
    */
-  public @Nonnull MockResponse setHeaders(@Nonnull Map<String, String> headers) {
+  public @Nonnull MockResponse setHeaders(@Nonnull Map<String, Object> headers) {
     headers.forEach(this::setHeader);
     return this;
   }
@@ -88,6 +88,17 @@ public class MockResponse implements MockValue {
     return this;
   }
 
+  /**
+   * Set response header.
+   *
+   * @param name Header name.
+   * @param value Header value.
+   * @return This response.
+   */
+  public @Nonnull MockResponse setHeader(@Nonnull String name, @Nonnull Object value) {
+    return setHeader(name, value.toString());
+  }
+
   /**
    * Response content type.
    *

modules/jooby-test/src/test/java/io/jooby/UnitTest.java

@@ -60,14 +60,18 @@ public void unitTests() {
   public void pipeline() {
     Jooby app = new Jooby();
 
-    app.before(ctx -> ctx.attribute("prefix", "<"));
-    app.after((ctx, result) -> result + ">");
-    app.get("/", ctx -> ctx.attribute("prefix") + "OK");
+    app.before(ctx -> ctx.setResponseHeader("before", "<"));
+    app.after((ctx, result) -> ctx.setResponseHeader("after", ">"));
+    app.get("/", ctx -> "OK");
 
     MockRouter router = new MockRouter(app)
         .setFullExecution(true);
 
-    assertEquals("<OK>", router.get("/").value());
+    router.get("/", rsp -> {
+      assertEquals("OK", rsp.value());
+      assertEquals("<", rsp.getHeaders().get("before"));
+      assertEquals(">", rsp.getHeaders().get("after"));
+    });
   }
 
   @Test

tests/src/test/java/io/jooby/FeaturedTest.java

@@ -635,7 +635,6 @@ public void filter() {
       app.after((ctx, value) -> {
         StringBuilder buff = (StringBuilder) value;
         buff.append("after1:" + ctx.isInIoThread()).append(";");
-        return buff;
       });
 
       app.dispatch(() -> {
@@ -646,12 +645,14 @@ public void filter() {
 
         app.after((ctx, value) -> {
           StringBuilder buff = ctx.attribute("buff");
-          buff.append(value).append(";");
           buff.append("after2:" + ctx.isInIoThread()).append(";");
-          return buff;
         });
 
-        app.get("/", ctx -> "result:" + ctx.isInIoThread());
+        app.get("/", ctx -> {
+          StringBuilder buff = ctx.attribute("buff");
+          buff.append("result:").append(ctx.isInIoThread()).append(";");
+          return buff;
+        });
       });
 
     }).mode(ExecutionMode.EVENT_LOOP).ready(client -> {