refactor: send now throws a Throwable

jknack · jknack · commit 29a46f200cfc · 2016-04-07T20:50:49.000-03:00
diff --git a/jooby-assets/src/main/java/org/jooby/internal/assets/AssetHandlerWithCompiler.java b/jooby-assets/src/main/java/org/jooby/internal/assets/AssetHandlerWithCompiler.java
@@ -36,7 +36,7 @@ public AssetHandlerWithCompiler(final String pattern, final AssetCompiler compil
   }
 
   @Override
-  protected void send(final Request req, final Response rsp, final Asset asset) throws Exception {
+  protected void send(final Request req, final Response rsp, final Asset asset) throws Throwable {
     super.send(req, rsp, compiler.build(asset));
   }
 }
diff --git a/jooby-assets/src/main/java/org/jooby/internal/assets/LiveCompiler.java b/jooby-assets/src/main/java/org/jooby/internal/assets/LiveCompiler.java
@@ -82,7 +82,7 @@ private void onChange(final Kind<?> kind, final Path path) {
   }
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     String path = req.path();
     if (path.startsWith("/org/jooby/assets/live")) {
       new AssetHandler("/").handle(req, rsp);
@@ -95,7 +95,7 @@ public void handle(final Request req, final Response rsp) throws Exception {
   }
 
   private void reportErr(final Request req, final Response rsp, final AssetException ex)
-      throws Exception {
+      throws Throwable {
     StringBuilder buff = new StringBuilder();
     buff.append("<!doctype html>\n" +
         "<html lang=\"en\">\n" +
diff --git a/jooby-elasticsearch/src/main/java/org/jooby/internal/elasticsearch/EmbeddedHandler.java b/jooby-elasticsearch/src/main/java/org/jooby/internal/elasticsearch/EmbeddedHandler.java
@@ -43,7 +43,7 @@ public EmbeddedHandler(final String path, final ManagedNode node, final boolean
   }
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
 
     EmbeddedHttpRequest restReq = new EmbeddedHttpRequest(path, req);
     EmbeddedHttpChannel channel = new EmbeddedHttpChannel(restReq, rsp, detailedErrorsEnabled);
diff --git a/jooby-elasticsearch/src/main/java/org/jooby/internal/elasticsearch/EmbeddedHttpChannel.java b/jooby-elasticsearch/src/main/java/org/jooby/internal/elasticsearch/EmbeddedHttpChannel.java
@@ -34,7 +34,7 @@ public class EmbeddedHttpChannel extends HttpChannel {
 
   private final CountDownLatch latch = new CountDownLatch(1);
 
-  private Exception failure;
+  private Throwable failure;
 
   public EmbeddedHttpChannel(final RestRequest request, final Response rsp,
       final boolean detailedErrorsEnabled) {
@@ -55,15 +55,15 @@ public void sendResponse(final RestResponse response) {
           .length(content.length())
           .type(response.contentType())
           .send(content);
-    } catch (Exception ex) {
+    } catch (Throwable ex) {
       failure = ex;
     } finally {
       latch.countDown();
     }
 
   }
 
-  public void done() throws Exception {
+  public void done() throws Throwable {
     latch.await();
 
     if (failure != null) {
diff --git a/jooby-hbm/src/main/java/org/jooby/internal/hbm/TrxResponse.java b/jooby-hbm/src/main/java/org/jooby/internal/hbm/TrxResponse.java
@@ -69,7 +69,7 @@ public void setRollbackOnly() {
     rollbackOnly = true;
   }
 
-  private void trxSend(final Object result) throws Exception {
+  private void trxSend(final Object result) throws Throwable {
 
     Consumer<Boolean> setReadOnly = (readOnly) -> {
       try {
@@ -105,7 +105,7 @@ private void trxSend(final Object result) throws Exception {
 
         log.debug("  [{}] commiting readonly transaction: {}", sessionId, readOnlyTrx);
         readOnlyTrx.commit();
-      } catch (Exception ex) {
+      } catch (Throwable ex) {
         if (readOnlyTrx != null && readOnlyTrx.isActive()) {
           log.debug("  [{}] rolling back readonly transaction: {}", sessionId, readOnlyTrx);
           readOnlyTrx.rollback();
@@ -115,7 +115,7 @@ private void trxSend(final Object result) throws Exception {
         log.debug("  [{}] removing readonly mode from connection", sessionId);
         setReadOnly.accept(false);
       }
-    } catch (Exception ex) {
+    } catch (Throwable ex) {
       rollbackOnly = true;
       throw ex;
     } finally {
@@ -151,12 +151,12 @@ public void done() {
   }
 
   @Override
-  public void send(final Object result) throws Exception {
+  public void send(final Object result) throws Throwable {
     trxSend(result);
   }
 
   @Override
-  public void send(final Result result) throws Exception {
+  public void send(final Result result) throws Throwable {
     trxSend(result);
   }
 
diff --git a/jooby-metrics/src/main/java/org/jooby/metrics/HealthCheckHandler.java b/jooby-metrics/src/main/java/org/jooby/metrics/HealthCheckHandler.java
@@ -43,7 +43,7 @@
 public class HealthCheckHandler implements Handler {
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     HealthCheckRegistry registry = req.require(HealthCheckRegistry.class);
     SortedMap<String, Result> checks = req.param("name").toOptional().map(name -> {
       SortedMap<String, Result> set = ImmutableSortedMap.of(name, registry.runHealthCheck(name));
diff --git a/jooby-metrics/src/main/java/org/jooby/metrics/MetricHandler.java b/jooby-metrics/src/main/java/org/jooby/metrics/MetricHandler.java
@@ -60,7 +60,7 @@ public class MetricHandler implements Handler {
   private static final String NO_CACHE = "must-revalidate,no-cache,no-store";
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     MetricRegistry registry = req.require(MetricRegistry.class);
     Map<String, Metric> allmetrics = registry.getMetrics();
     if (allmetrics.isEmpty()) {
diff --git a/jooby-metrics/src/main/java/org/jooby/metrics/PingHandler.java b/jooby-metrics/src/main/java/org/jooby/metrics/PingHandler.java
@@ -36,7 +36,7 @@
 public class PingHandler implements Handler {
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     rsp.status(Status.OK)
         .type(MediaType.plain)
         .header("Cache-Control", "must-revalidate,no-cache,no-store")
diff --git a/jooby-metrics/src/main/java/org/jooby/metrics/ThreadDumpHandler.java b/jooby-metrics/src/main/java/org/jooby/metrics/ThreadDumpHandler.java
@@ -54,7 +54,7 @@ public class ThreadDumpHandler implements Handler {
   }
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     Object data;
     Status status;
     if (threadDump == null) {
diff --git a/jooby-pac4j/src/main/java/org/jooby/internal/pac4j/AuthContext.java b/jooby-pac4j/src/main/java/org/jooby/internal/pac4j/AuthContext.java
@@ -98,7 +98,7 @@ public String getRequestMethod() {
   public void writeResponseContent(final String content) {
     try {
       rsp.send(content);
-    } catch (Exception ex) {
+    } catch (Throwable ex) {
       throw new Err(Status.SERVER_ERROR, ex);
     }
   }
diff --git a/jooby/src/main/java/org/jooby/Err.java b/jooby/src/main/java/org/jooby/Err.java
@@ -57,8 +57,7 @@ public static class DefHandler implements Err.Handler {
     private final Logger log = LoggerFactory.getLogger(Err.class);
 
     @Override
-    public void handle(final Request req, final Response rsp, final Err ex)
-        throws Exception {
+    public void handle(final Request req, final Response rsp, final Err ex) throws Throwable {
       log.error("execution of: " + req.method() + req.path() + " resulted in exception", ex);
 
       rsp.send(
@@ -88,9 +87,9 @@ public interface Handler {
      * @param req HTTP request.
      * @param rsp HTTP response.
      * @param ex Error found and status code.
-     * @throws Exception If something goes wrong.
+     * @throws Throwable If something goes wrong.
      */
-    void handle(Request req, Response rsp, Err ex) throws Exception;
+    void handle(Request req, Response rsp, Err ex) throws Throwable;
   }
 
   /**
diff --git a/jooby/src/main/java/org/jooby/Response.java b/jooby/src/main/java/org/jooby/Response.java
@@ -165,14 +165,14 @@ public Response type(final String type) {
     }
 
     @Override
-    public void send(final Object result) throws Exception {
+    public void send(final Object result) throws Throwable {
       // Special case: let the default response to deal with Object refs.
       // once resolved it will call the Result version.
       Response.super.send(result);
     }
 
     @Override
-    public void send(final Result result) throws Exception {
+    public void send(final Result result) throws Throwable {
       rsp.send(result);
     }
 
@@ -427,7 +427,7 @@ default Response type(final String type) {
    * @param result The HTTP body.
    * @throws Exception If the response write fails.
    */
-  default void send(final Object result) throws Exception {
+  default void send(final Object result) throws Throwable {
     requireNonNull(result, "A response message is required.");
     if (result instanceof Result) {
       send((Result) result);
@@ -446,7 +446,7 @@ default void send(final Object result) throws Exception {
    * @param result A HTTP response.
    * @throws Exception If the response write fails.
    */
-  void send(Result result) throws Exception;
+  void send(Result result) throws Throwable;
 
   /**
    * Redirect to the given url with status code defaulting to {@link Status#FOUND}.
diff --git a/jooby/src/main/java/org/jooby/Route.java b/jooby/src/main/java/org/jooby/Route.java
@@ -215,13 +215,14 @@
 public interface Route {
 
   /**
-   * Static and global route attributes. Useful for annotated route with metadata.
+   * Common route properties, like static and global metadata via attributes, path exclusion,
+   * produces and consumes types.
    *
    * @author edgar
    * @since 1.0.0.CR
    * @param <T> Attribute subtype.
    */
-  interface Attributes<T extends Attributes<T>> {
+  interface Props<T extends Props<T>> {
     /**
      * Set route attribute. Only primitives, string, class, enum or array of previous types are
      * allowed as attributes values.
@@ -341,9 +342,10 @@ default T excludes(final String... excludes) {
      * @return This instance.
      */
     public T excludes(final List<String> excludes);
+
   }
 
-  class Group implements Attributes<Group> {
+  class Group implements Props<Group> {
 
     /** List of definitions. */
     private List<Route.Definition> routes = new ArrayList<>();
@@ -709,7 +711,7 @@ private void newRoute(final Route.Definition route) {
    * @author edgar
    * @since 0.5.0
    */
-  class Collection implements Attributes<Collection> {
+  class Collection implements Props<Collection> {
 
     /** List of definitions. */
     private Route.Definition[] routes;
@@ -823,7 +825,7 @@ public Collection excludes(final List<String> excludes) {
    * @author edgar
    * @since 0.1.0
    */
-  class Definition implements Attributes<Definition> {
+  class Definition implements Props<Definition> {
 
     /**
      * Route's name.
@@ -1648,7 +1650,7 @@ default void handle(final Request req, final Response rsp, final Chain chain) th
       chain.next(req, new Response.Forwarding(rsp) {
 
         @Override
-        public void send(final Result result) throws Exception {
+        public void send(final Result result) throws Throwable {
           super.send(handle(req, rsp, result));
         }
       });
diff --git a/jooby/src/main/java/org/jooby/handlers/AssetHandler.java b/jooby/src/main/java/org/jooby/handlers/AssetHandler.java
@@ -194,8 +194,7 @@ public AssetHandler maxAge(final long maxAge) {
   }
 
   @Override
-  public void handle(final Request req, final Response rsp)
-      throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     String path = req.path();
     URL resource = resolve(req, path);
 
@@ -222,8 +221,7 @@ public void handle(final Request req, final Response rsp)
     }
   }
 
-  private void doHandle(final Request req, final Response rsp,
-      final Asset asset) throws Exception {
+  private void doHandle(final Request req, final Response rsp, final Asset asset) throws Throwable {
 
     // handle etag
     if (this.etag) {
@@ -270,8 +268,7 @@ private void doHandle(final Request req, final Response rsp,
    * @param asset Resolve asset.
    * @throws Exception If send fails.
    */
-  protected void send(final Request req, final Response rsp, final Asset asset)
-      throws Exception {
+  protected void send(final Request req, final Response rsp, final Asset asset) throws Throwable {
     rsp.send(asset);
   }
 
diff --git a/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java b/jooby/src/main/java/org/jooby/internal/HttpHandlerImpl.java
@@ -360,7 +360,7 @@ private void handleErr(final RequestImpl req, final ResponseImpl rsp, final Thro
         log.debug("handling err with: {}", next);
         next.handle(req, rsp, err);
       }
-    } catch (Exception errex) {
+    } catch (Throwable errex) {
       log.error("execution of err handler resulted in exception", errex);
     }
   }
diff --git a/jooby/src/main/java/org/jooby/internal/handlers/TraceHandler.java b/jooby/src/main/java/org/jooby/internal/handlers/TraceHandler.java
@@ -30,7 +30,7 @@
 public class TraceHandler implements Route.Handler {
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
     String CRLF = "\r\n";
     StringBuilder buffer = new StringBuilder("TRACE ").append(req.path())
         .append(" ").append(req.protocol());
diff --git a/jooby/src/main/java/org/jooby/internal/js/JsResponse.java b/jooby/src/main/java/org/jooby/internal/js/JsResponse.java
@@ -33,7 +33,7 @@ public JsResponse(final Response rsp) {
     super(rsp);
   }
 
-  public void sendjs(final ScriptObjectMirror result) throws Exception {
+  public void sendjs(final ScriptObjectMirror result) throws Throwable {
     Object value;
     if (result.isArray()) {
       value = result.entrySet().stream()
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/MvcHandler.java b/jooby/src/main/java/org/jooby/internal/mvc/MvcHandler.java
@@ -48,7 +48,7 @@ public Method method() {
   }
 
   @Override
-  public void handle(final Request req, final Response rsp) throws Exception {
+  public void handle(final Request req, final Response rsp) throws Throwable {
 
     try {
       Object target = req.require(handler.getDeclaringClass());
diff --git a/jooby/src/test/java/org/jooby/ResponseTest.java b/jooby/src/test/java/org/jooby/ResponseTest.java
@@ -119,12 +119,12 @@ public Response type(final MediaType type) {
   }
 
   @Test
-  public void sendObject() throws Exception {
+  public void sendObject() throws Throwable {
     Object data = new Object();
     LinkedList<Object> dataList = new LinkedList<>();
     new ResponseMock() {
       @Override
-      public void send(final Result result) throws Exception {
+      public void send(final Result result) {
         assertNotNull(result);
         assertEquals(Status.OK, result.status().get());
         assertEquals(MediaType.json, result.type().get());
@@ -147,7 +147,7 @@ public Optional<MediaType> type() {
   }
 
   @Test
-  public void sendBody() throws Exception {
+  public void sendBody() throws Throwable {
     Object data = Results.noContent();
     LinkedList<Object> dataList = new LinkedList<>();
     new ResponseMock() {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public AssetHandlerWithCompiler(final String pattern, final AssetCompiler compil`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- protected void send(final Request req, final Response rsp, final Asset asset) throws Exception {`
	`39`	`+ protected void send(final Request req, final Response rsp, final Asset asset) throws Throwable {`
`40`	`40`	`super.send(req, rsp, compiler.build(asset));`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public EmbeddedHandler(final String path, final ManagedNode node, final boolean`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public void handle(final Request req, final Response rsp) throws Exception {`
	`46`	`+ public void handle(final Request req, final Response rsp) throws Throwable {`
`47`	`47`
`48`	`48`	`EmbeddedHttpRequest restReq = new EmbeddedHttpRequest(path, req);`
`49`	`49`	`EmbeddedHttpChannel channel = new EmbeddedHttpChannel(restReq, rsp, detailedErrorsEnabled);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class ThreadDumpHandler implements Handler {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public void handle(final Request req, final Response rsp) throws Exception {`
	`57`	`+ public void handle(final Request req, final Response rsp) throws Throwable {`
`58`	`58`	`Object data;`
`59`	`59`	`Status status;`
`60`	`60`	`if (threadDump == null) {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public String getRequestMethod() {`
`98`	`98`	`public void writeResponseContent(final String content) {`
`99`	`99`	`try {`
`100`	`100`	`rsp.send(content);`
`101`		`- } catch (Exception ex) {`
	`101`	`+ } catch (Throwable ex) {`
`102`	`102`	`throw new Err(Status.SERVER_ERROR, ex);`
`103`	`103`	`}`
`104`	`104`	`}`