Multiple filters for interceptors fix #376

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue376.java

@@ -0,0 +1,74 @@
+package org.jooby.issues;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.jooby.Results;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue376 extends ServerFeature {
+
+  {
+    before("/before", (req, rsp) -> {
+      req.set("counter", 1);
+    }, (req, rsp) -> {
+      int counter = req.get("counter");
+      req.set("counter", counter + 1);
+    }, (req, rsp) -> {
+      int counter = req.get("counter");
+      req.set("counter", counter + 1);
+    });
+
+    after("/after", (req, rsp, result) -> {
+      int counter = result.get();
+      return Results.ok(counter + 1);
+    }, (req, rsp, result) -> {
+      int counter = result.get();
+      return Results.ok(counter + 1);
+    });
+
+    AtomicInteger completeCounter = new AtomicInteger(0);
+
+    complete("/complete", (req, rsp, cause) -> {
+      completeCounter.incrementAndGet();
+    }, (req, rsp, cause) -> {
+      completeCounter.incrementAndGet();
+    }, (req, rsp, cause) -> {
+      completeCounter.incrementAndGet();
+    });
+
+    get("/before", req -> req.get("counter"));
+
+    get("/after", req -> 1);
+
+    get("/complete", req -> 1);
+
+    onStop(() -> {
+      assertEquals(3, completeCounter.get());
+    });
+  }
+
+  @Test
+  public void multipleBeforeFilter() throws Exception {
+    request()
+        .get("/before")
+        .expect("3");
+  }
+
+  @Test
+  public void multipleAfterFilter() throws Exception {
+    request()
+        .get("/after")
+        .expect("3");
+  }
+
+  @Test
+  public void multipleCompleteFilter() throws Exception {
+    request()
+        .get("/complete")
+        .expect("1");
+  }
+
+}

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

@@ -1049,21 +1049,33 @@ public Jooby renderer(final Renderer renderer) {
   }
 
   @Override
-  public Route.Definition before(final String method, final String pattern,
-      final Route.Before handler) {
-    return appendDefinition(new Route.Definition(method, pattern, handler));
+  public Route.Collection before(final String method, final String pattern,
+      final Route.Before handler, final Route.Before... chain) {
+    Route.Definition[] routes = javaslang.collection.List.of(handler)
+        .appendAll(Arrays.asList(chain))
+        .map(before -> appendDefinition(new Route.Definition(method, pattern, before)))
+        .toJavaArray(Route.Definition.class);
+    return new Route.Collection(routes);
   }
 
   @Override
-  public Route.Definition after(final String method, final String pattern,
-      final Route.After handler) {
-    return appendDefinition(new Route.Definition(method, pattern, handler));
+  public Route.Collection after(final String method, final String pattern,
+      final Route.After handler, final Route.After... chain) {
+    Route.Definition[] routes = javaslang.collection.List.of(handler)
+        .appendAll(Arrays.asList(chain))
+        .map(after -> appendDefinition(new Route.Definition(method, pattern, after)))
+        .toJavaArray(Route.Definition.class);
+    return new Route.Collection(routes);
   }
 
   @Override
-  public Route.Definition complete(final String method, final String pattern,
-      final Route.Complete handler) {
-    return appendDefinition(new Route.Definition(method, pattern, handler));
+  public Route.Collection complete(final String method, final String pattern,
+      final Route.Complete handler, final Route.Complete... chain) {
+    Route.Definition[] routes = javaslang.collection.List.of(handler)
+        .appendAll(Arrays.asList(chain))
+        .map(complete -> appendDefinition(new Route.Definition(method, pattern, complete)))
+        .toJavaArray(Route.Definition.class);
+    return new Route.Collection(routes);
   }
 
   /**
@@ -3180,6 +3192,7 @@ public Jooby use(final Config config) {
    * @param err A route error handler.
    * @return This jooby instance.
    */
+  @Override
   public Jooby err(final Err.Handler err) {
     this.bag.add(requireNonNull(err, "An err handler is required."));
     return this;

jooby/src/main/java/org/jooby/Route.java

@@ -801,7 +801,7 @@ private void newRoute(final Route.Definition route) {
   class Collection implements Props<Collection> {
 
     /** List of definitions. */
-    private Route.Props[] routes;
+    private final Route.Props[] routes;
 
     /**
      * Creates a new collection of route definitions.

jooby/src/main/java/org/jooby/Routes.java

@@ -1734,10 +1734,11 @@ Route.Definition connect(String path,
    * </p>
    *
    * @param handler Before handler.
+   * @param chain Chain of before handler.
    * @return A new route definition.
    */
-  default Route.Definition before(final Route.Before handler) {
-    return before("*", handler);
+  default Route.Collection before(final Route.Before handler, final Route.Before... chain) {
+    return before("*", handler, chain);
   }
 
   /**
@@ -1792,10 +1793,12 @@ default Route.Definition before(final Route.Before handler) {
    *
    * @param pattern Pattern to intercept.
    * @param handler Before handler.
+   * @param chain Chain of before handler.
    * @return A new route definition.
    */
-  default Route.Definition before(final String pattern, final Route.Before handler) {
-    return before("*", pattern, handler);
+  default Route.Collection before(final String pattern, final Route.Before handler,
+      final Route.Before... chain) {
+    return before("*", pattern, handler, chain);
   }
 
   /**
@@ -1851,9 +1854,11 @@ default Route.Definition before(final String pattern, final Route.Before handler
    * @param method HTTP method to intercept.
    * @param pattern Pattern to intercept.
    * @param handler Before handler.
+   * @param chain Chain of before handler.
    * @return A new route definition.
    */
-  Route.Definition before(String method, String pattern, Route.Before handler);
+  Route.Collection before(String method, String pattern, Route.Before handler,
+      Route.Before... chain);
 
   /**
    * <h2>after</h2>
@@ -1915,10 +1920,11 @@ default Route.Definition before(final String pattern, final Route.Before handler
    * </p>
    *
    * @param handler After handler.
+   * @param chain After chain.
    * @return A new route definition.
    */
-  default Route.Definition after(final Route.After handler) {
-    return after("*", handler);
+  default Route.Collection after(final Route.After handler, final Route.After... chain) {
+    return after("*", handler, chain);
   }
 
   /**
@@ -1980,10 +1986,12 @@ default Route.Definition after(final Route.After handler) {
    *
    * @param pattern Pattern to intercept.
    * @param handler After handler.
+   * @param chain After chain.
    * @return A new route definition.
    */
-  default Route.Definition after(final String pattern, final Route.After handler) {
-    return after("*", pattern, handler);
+  default Route.Collection after(final String pattern, final Route.After handler,
+      final Route.After... chain) {
+    return after("*", pattern, handler, chain);
   }
 
   /**
@@ -2047,9 +2055,10 @@ default Route.Definition after(final String pattern, final Route.After handler)
    * @param method HTTP method to intercept.
    * @param pattern Pattern to intercept.
    * @param handler After handler.
+   * @param chain After chain.
    * @return A new route definition.
    */
-  Route.Definition after(String method, String pattern, Route.After handler);
+  Route.Collection after(String method, String pattern, Route.After handler, Route.After... chain);
 
   /**
    * <h2>complete</h2>
@@ -2151,10 +2160,11 @@ default Route.Definition after(final String pattern, final Route.After handler)
    * }</pre>
    *
    * @param handler Complete handler.
+   * @param chain Complete chain.
    * @return A new route definition.
    */
-  default Route.Definition complete(final Route.Complete handler) {
-    return complete("*", handler);
+  default Route.Collection complete(final Route.Complete handler, final Route.Complete... chain) {
+    return complete("*", handler, chain);
   }
 
   /**
@@ -2257,11 +2267,13 @@ default Route.Definition complete(final Route.Complete handler) {
    * }</pre>
    *
    * @param pattern Pattern to intercept.
-   * @param handler Before handler.
+   * @param handler Complete handler.
+   * @param chain Complete chain.
    * @return A new route definition.
    */
-  default Route.Definition complete(final String pattern, final Route.Complete handler) {
-    return complete("*", pattern, handler);
+  default Route.Collection complete(final String pattern, final Route.Complete handler,
+      final Route.Complete... chain) {
+    return complete("*", pattern, handler, chain);
   }
 
   /**
@@ -2365,9 +2377,11 @@ default Route.Definition complete(final String pattern, final Route.Complete han
    * @param method HTTP method to intercept.
    * @param pattern Pattern to intercept.
    * @param handler Complete handler.
+   * @param chain Complete chain.
    * @return A new route definition.
    */
-  Route.Definition complete(String method, String pattern, Route.Complete handler);
+  Route.Collection complete(String method, String pattern, Route.Complete handler,
+      Route.Complete... chain);
 
   /**
    * Append a new WebSocket handler under the given path.