refactor+code cleanup around deferred +after&complete handlers

Author: jknack

jooby/src/main/java/org/jooby/Deferred.java

@@ -22,6 +22,8 @@
 
 import java.util.concurrent.Callable;
 
+import javaslang.CheckedFunction0;
+
 /**
  * <h1>async request processing</h1>
  * A Deferred result, useful for async request processing. Application can produces a result from a
@@ -94,8 +96,8 @@
  * error.
  * </p>
  * <p>
- * Checkout the utility method {@link #resolve(Callable)} and/or {@link #run(Callable)}. Both of
- * them catch and handle exceptions for you.
+ * Checkout the utility method {@link #resolve(CheckedFunction0)} and/or
+ * {@link #run(CheckedFunction0)}. Both of them catch and handle exceptions for you.
  * </p>
  *
  * @author edgar
@@ -160,8 +162,7 @@ public static interface Handler {
    * @param initializer An initializer.
    */
   public Deferred(final Initializer0 initializer) {
-    requireNonNull(initializer, "Initializer is required.");
-    this.initializer = (req, deferred) -> initializer.run(deferred);
+    this((req, deferred) -> initializer.run(deferred));
   }
 
   /**
@@ -220,42 +221,44 @@ public void reject(final Throwable cause) {
   }
 
   /**
-   * Produces a {@link Runnable} that runs the given {@link Callable} and {@link #resolve(Callable)}
-   * or {@link #reject(Throwable)} the deferred.
+   * Produces a {@link Runnable} that runs the given {@link Callable} and
+   * {@link #resolve(CheckedFunction0)} or {@link #reject(Throwable)} the deferred.
    *
    * Please note, the given {@link Callable} runs in the caller thread.
    *
    * @param block Callable that produces a result.
    * @param <T> Resulting type.
    * @return This deferred as {@link Runnable}.
    */
-  public <T> Runnable run(final Callable<T> block) {
+  public <T> Runnable run(final CheckedFunction0<T> block) {
     return () -> {
       resolve(block);
     };
   }
 
   /**
-   * Run the given {@link Callable} and {@link #resolve(Callable)} or {@link #reject(Throwable)} the
+   * Run the given {@link Callable} and {@link #resolve(CheckedFunction0)} or
+   * {@link #reject(Throwable)} the
    * deferred.
    *
    * Please note, the given {@link Callable} runs in the caller thread.
    *
    * @param block Callable that produces a result.
    * @param <T> Resulting type.
    */
-  public <T> void resolve(final Callable<T> block) {
+  public <T> void resolve(final CheckedFunction0<T> block) {
     try {
-      resolve(block.call());
-    } catch (Exception ex) {
-      reject(ex);
+      resolve(block.apply());
+    } catch (Throwable x) {
+      reject(x);
     }
   }
 
   /**
    * Setup a handler for this deferred. Application code should never call this method: INTERNAL USE
    * ONLY.
    *
+   * @param req Current request.
    * @param handler A response handler.
    * @throws Exception If initializer fails to start.
    */

jooby/src/main/java/org/jooby/Response.java

@@ -214,13 +214,13 @@ public boolean committed() {
     }
 
     @Override
-    public void push(final Route.After handler) {
-      rsp.push(handler);
+    public void after(final Route.After handler) {
+      rsp.after(handler);
     }
 
     @Override
-    public void push(final Route.Complete handler) {
-      rsp.push(handler);
+    public void complete(final Route.Complete handler) {
+      rsp.complete(handler);
     }
 
     @Override
@@ -636,13 +636,13 @@ default Response status(final int status) {
    * @param handler A handler
    * @see Route.After
    */
-  void push(Route.After handler);
+  void after(Route.After handler);
 
   /**
    * Append complete handler, will be execute after sending response.
    *
    * @param handler A handler
    * @see Route.After
    */
-  void push(Route.Complete handler);
+  void complete(Route.Complete handler);
 }

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

@@ -1907,7 +1907,7 @@ default void handle(final Request req, final Response rsp, final Chain chain) th
   interface After extends Filter {
     @Override
     default void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {
-      rsp.push(this);
+      rsp.after(this);
       chain.next(req, rsp);
     }
 
@@ -2030,7 +2030,7 @@ interface Complete extends Filter {
 
     @Override
     default void handle(final Request req, final Response rsp, final Chain chain) throws Throwable {
-      rsp.push(this);
+      rsp.complete(this);
       chain.next(req, rsp);
     }
 

jooby/src/main/java/org/jooby/Status.java

@@ -426,6 +426,13 @@ public int value() {
     return this.value;
   }
 
+  /**
+   * @return True, for status code >= 400.
+   */
+  public boolean isError() {
+    return this.value >= 400;
+  }
+
   /**
    * @return the reason phrase of this status code.
    */

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

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.jooby.internal;
 
 import java.util.Collections;
@@ -49,7 +67,7 @@ public CookieSessionManager(final ParserExecutor resolver, final Session.Definit
   public Session create(final Request req, final Response rsp) {
     Session session = new SessionImpl.Builder(resolver, true, Session.COOKIE_SESSION, -1).build();
     log.debug("session created: {}", session);
-    rsp.push(saveCookie());
+    rsp.after(saveCookie());
     return session;
   }
 
@@ -60,7 +78,7 @@ public Session get(final Request req, final Response rsp) {
           -1);
       Map<String, String> attributes = attributes(raw);
       session.set(attributes);
-      rsp.push(saveCookie());
+      rsp.after(saveCookie());
       return session.build();
     }).orElse(null);
   }

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

@@ -321,22 +321,24 @@ private void onDeferred(final Map<Object, Object> scope, final NativeRequest req
     try {
       request.startAsync();
 
-      deferred.handler(req, (result, ex) -> {
+      deferred.handler(req, (success, x) -> {
         boolean close = false;
-        Throwable x = null;
+        Optional<Throwable> failure = Optional.ofNullable(x);
         try {
           requestScope.enter(scope);
-          if (result != null) {
+          if (success != null) {
             close = true;
-            rsp.send(result);
-          } else if (ex != null) {
-            close = true;
-            handleErr(req, rsp, ex);
+            rsp.send(success);
           }
         } catch (Throwable exerr) {
-          x = exerr;
+          failure = Optional.of(failure.orElse(exerr));
         } finally {
-          cleanup(req, rsp, close, x, true);
+          Throwable cause = failure.orElse(null);
+          if (cause != null) {
+            close = true;
+            handleErr(req, rsp, cause);
+          }
+          cleanup(req, rsp, close, cause, true);
         }
       });
     } catch (Exception ex) {

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

@@ -88,6 +88,8 @@ public class ResponseImpl implements Response {
 
   private RequestImpl req;
 
+  private boolean failure;
+
   public ResponseImpl(final RequestImpl req, final ParserExecutor parserExecutor,
       final NativeResponse rsp, final Route route, final List<Renderer> renderers,
       final Map<String, Renderer> rendererMap, final Map<String, Object> locals,
@@ -223,8 +225,9 @@ public Optional<Status> status() {
 
   @Override
   public Response status(final Status status) {
-    this.status = requireNonNull(status, "A status is required.");
+    this.status = requireNonNull(status, "Statusrequired.");
     rsp.statusCode(status.value());
+    failure = status.isError();
     return this;
   }
 
@@ -279,9 +282,11 @@ public void send(final Result result) throws Throwable {
 
     Result finalResult = result;
 
-    // after filter
-    for (int i = after.size() - 1; i >= 0; i--) {
-      finalResult = after.get(i).handle(req, this, finalResult);
+    if (!failure) {
+      // after filter
+      for (int i = after.size() - 1; i >= 0; i--) {
+        finalResult = after.get(i).handle(req, this, finalResult);
+      }
     }
 
     Optional<MediaType> rtype = finalResult.type();
@@ -347,12 +352,12 @@ public void send(final Result result) throws Throwable {
   }
 
   @Override
-  public void push(final After handler) {
+  public void after(final After handler) {
     after.add(handler);
   }
 
   @Override
-  public void push(final Complete handler) {
+  public void complete(final Complete handler) {
     complete.add(handler);
   }
 

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

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.jooby.internal;
 
 import org.jooby.Cookie;

jooby/src/main/java/org/jooby/internal/handlers/FlashScopeHandler.java

@@ -55,7 +55,7 @@ public void handle(final Request req, final Response rsp, final Route.Chain chai
     req.set(FlashScope.NAME, flashScope);
 
     // wrap & proceed
-    rsp.push(finalizeFlash(copy, flashScope));
+    rsp.after(finalizeFlash(copy, flashScope));
 
     chain.next(req, rsp);
   }

jooby/src/test/java/org/jooby/ResponseForwardingTest.java

@@ -350,12 +350,12 @@ public void pushAfter() throws Exception {
     new MockUnit(Response.class, Route.After.class)
         .expect(unit -> {
           Response rsp = unit.get(Response.class);
-          rsp.push(unit.get(Route.After.class));
+          rsp.after(unit.get(Route.After.class));
         })
         .run(unit -> {
           Response rsp = new Response.Forwarding(unit.get(Response.class));
 
-          rsp.push(unit.get(Route.After.class));
+          rsp.after(unit.get(Route.After.class));
         });
   }
 
@@ -364,12 +364,11 @@ public void pushComplete() throws Exception {
     new MockUnit(Response.class, Route.Complete.class)
         .expect(unit -> {
           Response rsp = unit.get(Response.class);
-          rsp.push(unit.get(Route.Complete.class));
+          rsp.complete(unit.get(Route.Complete.class));
         })
         .run(unit -> {
           Response rsp = new Response.Forwarding(unit.get(Response.class));
-
-          rsp.push(unit.get(Route.Complete.class));
+          rsp.complete(unit.get(Route.Complete.class));
         });
   }