rename interceptor events #315

Author: jknack

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

@@ -15,7 +15,7 @@ public class Issue315 extends ServerFeature {
   {
     AtomicInteger inc = new AtomicInteger(1);
 
-    after("/err", (req, rsp, cause) -> {
+    complete("/err", (req, rsp, cause) -> {
       assertTrue(cause.isPresent());
     });
 
@@ -41,26 +41,26 @@ public class Issue315 extends ServerFeature {
       buff.append("a");
     });
 
-    after("/buff", (req, rsp, cause) -> {
+    complete("/buff", (req, rsp, cause) -> {
       buff.append("b");
     });
     get("/buff", () -> buff);
 
-    before("/chain", (req, rsp, result) -> {
+    after("/chain", (req, rsp, result) -> {
       String v = result.get();
       result.set("<" + v + ">");
       return result;
     });
 
-    before("/chain", (req, rsp, result) -> {
+    after("/chain", (req, rsp, result) -> {
       String v = result.get();
       result.set("-" + v + "-");
       return result;
     });
 
     get("/chain", () -> "v");
 
-    after("/async", (req, rsp, cause) -> {
+    complete("/async", (req, rsp, cause) -> {
       assertEquals(false, cause.isPresent());
     });
 
@@ -73,13 +73,13 @@ public class Issue315 extends ServerFeature {
       inc.incrementAndGet();
     });
 
-    before((req, rsp, result) -> {
+    after((req, rsp, result) -> {
       Integer i = result.get();
       result.set(i + 2);
       return result;
     });
 
-    after((req, rsp, cause) -> {
+    complete((req, rsp, cause) -> {
       inc.incrementAndGet();
     });
 

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

@@ -957,14 +957,14 @@ public Route.Definition before(final String method, final String pattern,
   }
 
   @Override
-  public Route.Definition before(final String method, final String pattern,
-      final Route.BeforeSend handler) {
+  public Route.Definition after(final String method, final String pattern,
+      final Route.After handler) {
     return appendDefinition(new Route.Definition(method, pattern, handler));
   }
 
   @Override
-  public Route.Definition after(final String method, final String pattern,
-      final Route.After handler) {
+  public Route.Definition complete(final String method, final String pattern,
+      final Route.Complete handler) {
     return appendDefinition(new Route.Definition(method, pattern, handler));
   }
 

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

@@ -1546,14 +1546,14 @@ default void handle(final Request req, final Response rsp, final Chain chain) th
   }
 
   /**
-   * <h2>before send</h2>
+   * <h2>after</h2>
    *
    * Allows for customized response before send it. It will be invoked at the time a response need
    * to be send.
    *
    * <pre>{@code
    * {
-   *   before("GET", "*", (req, rsp, result) -> {
+   *   after("GET", "*", (req, rsp, result) -> {
    *     // your code goes here
    *     return result;
    *   });
@@ -1563,29 +1563,29 @@ default void handle(final Request req, final Response rsp, final Chain chain) th
    * You are allowed to modify the request, response and result objects. The handler returns a
    * {@link Result} which can be the same or an entirely new {@link Result}.
    *
-   * Please note that the <code>before send</code> handler is just syntax sugar for
+   * Please note that the <code>after</code> handler is just syntax sugar for
    * {@link Route.Filter}.
-   * For example, the <code>before send</code> handler was implemented as:
+   * For example, the <code>after</code> handler was implemented as:
    *
    * <pre>{@code
    * {
    *   use("GET", "*", (req, rsp, chain) -> {
    *     chain.next(req, new Response.Forwarding(rsp) {
    *       public void send(Result result) {
-   *         rsp.send(before(req, rsp, result);
+   *         rsp.send(after(req, rsp, result);
    *       }
    *     });
    *   });
    * }
    * }</pre>
    *
-   * Due <code>before send</code> is implemented by wrapping the {@link Response} object. A
-   * <code>before send</code> handler must to be registered before the actual handler you want to
+   * Due <code>after</code> is implemented by wrapping the {@link Response} object. A
+   * <code>after</code> handler must to be registered before the actual handler you want to
    * intercept.
    *
    * <pre>{@code
    * {
-   *   before("GET", "/path", (req, rsp, result) -> {
+   *   after("GET", "/path", (req, rsp, result) -> {
    *     // your code goes here
    *     return result;
    *   });
@@ -1606,7 +1606,7 @@ default void handle(final Request req, final Response rsp, final Chain chain) th
    * @author edgar
    * @since 1.0.0.CR
    */
-  interface BeforeSend extends Filter {
+  interface After extends Filter {
     @Override
     default void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {
       chain.next(req, new Response.Forwarding(rsp) {
@@ -1632,13 +1632,13 @@ public void send(final Result result) throws Exception {
   }
 
   /**
-   * <h2>after</h2>
+   * <h2>complete</h2>
    *
    * Allows for log and cleanup a request. It will be invoked after we send a response.
    *
    * <pre>{@code
    * {
-   *   after((req, rsp, cause) -> {
+   *   complete((req, rsp, cause) -> {
    *     // your code goes here
    *   });
    * }
@@ -1647,11 +1647,11 @@ public void send(final Result result) throws Exception {
    * You are NOT allowed to modify the request and response objects. The <code>cause</code> is an
    * {@link Optional} with a {@link Throwable} useful to identify problems.
    *
-   * The goal of the <code>after</code> handler is to probably cleanup request object and log
+   * The goal of the <code>complete</code> handler is to probably cleanup request object and log
    * responses.
    *
-   * Please note that the <code>after</code> handler is just syntax sugar for {@link Route.Filter}.
-   * For example, the <code>after</code> handler was implemented as:
+   * Please note that the <code>complete</code> handler is just syntax sugar for {@link Route.Filter}.
+   * For example, the <code>complete</code> handler was implemented as:
    *
    * <pre>{@code
    * {
@@ -1662,18 +1662,18 @@ public void send(final Result result) throws Exception {
    *     } catch (Throwable cause) {
    *       err = Optional.of(cause);
    *     } finally {
-   *       after(req, rsp, err);
+   *       complete(req, rsp, err);
    *     }
    *   });
    * }
    * }</pre>
    *
-   * An <code>after</code> handler must to be registered before the actual handler you want to
+   * An <code>complete</code> handler must to be registered before the actual handler you want to
    * intercept.
    *
    * <pre>{@code
    * {
-   *   after((req, rsp, cause) -> {
+   *   complete((req, rsp, cause) -> {
    *     // your code goes here
    *   });
    *
@@ -1709,7 +1709,7 @@ public void send(final Result result) throws Exception {
    *   });
    *
    *   // commit/rollback transaction
-   *   after((req, rsp, cause) -> {
+   *   complete((req, rsp, cause) -> {
    *     // unbind connection from request
    *     try(Connection connection = req.unset("connection").get()) {
    *       Transaction trx = connection.getTransaction();
@@ -1732,7 +1732,7 @@ public void send(final Result result) throws Exception {
    * @author edgar
    * @since 1.0.0.CR
    */
-  interface After extends Filter {
+  interface Complete extends Filter {
 
     @Override
     default void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {