Http: code clean up and refactor

http/src/main/java/sabina/Fault.java

@@ -14,6 +14,7 @@
 
 package sabina;
 
+import static java.lang.String.format;
 import static sabina.util.Checks.checkArgument;
 
 import java.util.function.BiConsumer;
@@ -40,13 +41,7 @@ public Fault (final Class<T> exception, final BiConsumer<T, Request> handler) {
         this.exception = exception;
     }
 
-    /**
-     * Invoked when an exception that is mapped to this handler occurs during routing
-     *
-     * @param exception The exception that was thrown during routing
-     * @param request The request object providing information about the HTTP request
-     */
-    public void handle (final T exception, final Request request) {
-        handler.accept (exception, request);
+    @Override public String toString () {
+        return format ("Fault: %s", exception.getName ());
     }
 }

http/src/main/java/sabina/Route.java

@@ -40,7 +40,7 @@ public final class Route {
     public final String path;
     public final String acceptType;
     public final HttpMethod method;
-    private final Handler handler;
+    public final Handler handler;
 
     public final List<String> routeParts;
 
@@ -99,18 +99,7 @@ public boolean isFilter () {
         return method == AFTER || method == BEFORE;
     }
 
-    /**
-     * Invoked when a req is made on this route's corresponding path e.g. '/hello'.
-     *
-     * @param req The request object providing information about the HTTP request.
-     *
-     * @return The content to be set in the response.
-     */
-    public Object handle (final Request req) {
-        return handler.apply (req);
-    }
-
     @Override public String toString () {
-        return format ("%s %s [%s]", method, path, acceptType);
+        return format ("Route: %s %s (%s)", method, path, acceptType);
     }
 }

http/src/main/java/sabina/Server.java

@@ -52,7 +52,7 @@ public final class Server implements Router {
     private static final int DEFAULT_PORT = 4567;
     private static final String DEFAULT_HOST = "0.0.0.0";
 
-    public static Server server (int port) {
+    public static Server server (final int port) {
         return new Server (port);
     }
 

http/src/main/java/sabina/route/SimpleRouteMatcher.java

@@ -14,6 +14,7 @@
 
 package sabina.route;
 
+import static java.util.Collections.EMPTY_LIST;
 import static java.util.Collections.singletonList;
 import static java.util.logging.Logger.getLogger;
 import static java.util.stream.Collectors.toList;
@@ -34,10 +35,9 @@
  * @author Per Wendel
  */
 final class SimpleRouteMatcher implements RouteMatcher {
-    private static final Logger LOG = getLogger (SimpleRouteMatcher.class.getName ());
-    private static final List<Route> EMPTY = new ArrayList<> (0);
+//    private static final Logger LOG = getLogger (SimpleRouteMatcher.class.getName ());
 
-    private final Map<HttpMethod, List<Route>> routes = new HashMap<> ();
+    private final Map<HttpMethod, List<Route>> routeMap = new HashMap<> ();
 
     /** Holds a map of Exception classes and associated handlers. */
     private final Map<Class<? extends Exception>, Fault<?>> exceptionMap = new HashMap<> ();
@@ -49,9 +49,9 @@ final class SimpleRouteMatcher implements RouteMatcher {
      */
     @Override public void processRoute (Route target) {
         HttpMethod method = target.method;
-        if (!routes.containsKey (method))
-            routes.put (method, new ArrayList<> ());
-        routes.get (method).add (target);
+        if (!routeMap.containsKey (method))
+            routeMap.put (method, new ArrayList<> ());
+        routeMap.get (method).add (target);
     }
 
     /**
@@ -170,11 +170,11 @@ private boolean routeWithGivenAcceptType (String bestMatch) {
     private List<Route> findTargetsForRequestedRoute (
         HttpMethod httpMethod, String path) {
 
-        return routes.containsKey (httpMethod)?
-            routes.get(httpMethod).stream ()
+        return routeMap.containsKey (httpMethod)?
+            routeMap.get(httpMethod).stream ()
                 .filter (entry -> matches (entry, path))
                 .collect (toList ()) :
-            EMPTY;
+            EMPTY_LIST;
     }
 
     // TODO: I believe this feature has impacted performance. Optimization?

http/src/main/java/sabina/server/MatcherFilter.java

@@ -99,7 +99,7 @@ public MatcherFilter (
         String bodyContent = null;
 
         try {
-            bodyContent = onFilter (BEFORE, httpReq, httpRes, uri, acceptType, bodyContent);
+            bodyContent = onFilter (BEFORE, httpReq, httpRes, uri, acceptType, null);
 
             final HttpMethod httpMethod = HttpMethod.valueOf (httpMethodStr);
             RouteMatch match = routeMatcher.findTarget (httpMethod, uri, acceptType);
@@ -174,7 +174,7 @@ private String handleTargetRoute (
             if (!aTarget.isFilter ()) {
                 request = new Request (aMatch, aHttpReq, aHttpRes);
 
-                Object element = aTarget.handle (request);
+                Object element = aTarget.handler.apply (request);
                 result = element != null? element.toString () : null;
             }
             if (result != null) {
@@ -187,7 +187,7 @@ private String handleTargetRoute (
         catch (Exception e) {
             Fault<Exception> handler = (Fault<Exception>)routeMatcher.findHandler (e.getClass ());
             if (handler != null && request != null) {
-                handler.handle (e, request);
+                handler.handler.accept (e, request);
             }
             else {
                 LOG.severe (e.getMessage ());
@@ -214,7 +214,7 @@ private String onFilter (
 
         for (RouteMatch filterMatch : matchSet) {
             final Request request = new Request (filterMatch, httpRequest, httpResponse);
-            filterMatch.entry.handle (request);
+            filterMatch.entry.handler.apply (request);
 
             final String bodyAfterFilter = request.response.body ();
             if (bodyAfterFilter != null)

http/src/test/java/sabina/RouteTest.java

@@ -49,6 +49,6 @@ public void routeWithEmptyAcceptType () {
         assert action.path.equals ("path");
         assert action.acceptType.equals ("type");
         assert action.method.equals (AFTER);
-        assert action.toString ().equals ("AFTER path [type]");
+        assert action.toString ().equals ("Route: AFTER path (type)");
     }
 }