A more accurate name for "HttpRequest" (http request handler)

Author: michalwa

README.md

@@ -33,9 +33,7 @@ Express app = new Express();
 
 app.get("/", (req, res) -> {
    res.send("Hello World");
-});
-
-app.listen(); // Will listen on port 80 which is set as default
+}).listen(); // Will listen on port 80 which is set as default
 ```
 
 # Docs:

src/main/java/examples/PortMiddleware.java

@@ -1,11 +1,11 @@
 package examples;
 
 import express.filter.Filter;
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 import express.http.request.Request;
 import express.http.response.Response;
 
-public class PortMiddleware implements HttpRequest, Filter {
+public class PortMiddleware implements HttpRequestHandler, Filter {
 
 
   /**

src/main/java/express/Express.java

@@ -7,7 +7,7 @@
 import express.filter.FilterLayerHandler;
 import express.filter.FilterTask;
 import express.filter.FilterWorker;
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -22,7 +22,7 @@
  */
 public class Express implements Router {
 
-  private final ConcurrentHashMap<String, HttpRequest> parameterListener;
+  private final ConcurrentHashMap<String, HttpRequestHandler> parameterListener;
   private final ConcurrentHashMap<Object, Object> locals;
 
   private final ArrayList<FilterWorker> worker;
@@ -94,12 +94,12 @@ public boolean isSecure() {
    * @param param   The parameter name.
    * @param request An request handler.
    */
-  public Express onParam(String param, HttpRequest request) {
+  public Express onParam(String param, HttpRequestHandler request) {
     parameterListener.put(param, request);
     return this;
   }
 
-  public ConcurrentHashMap<String, HttpRequest> getParameterListener() {
+  public ConcurrentHashMap<String, HttpRequestHandler> getParameterListener() {
     return parameterListener;
   }
 
@@ -170,66 +170,66 @@ public Express use(String root, ExpressRouter router) {
     return this;
   }
 
-  public Express use(HttpRequest middleware) {
+  public Express use(HttpRequestHandler middleware) {
     addMiddleware("*", "*", middleware);
     return this;
   }
 
-  public Express use(String context, HttpRequest middleware) {
+  public Express use(String context, HttpRequestHandler middleware) {
     addMiddleware("*", context, middleware);
     return this;
   }
 
-  public Express use(String context, String requestMethod, HttpRequest middleware) {
+  public Express use(String context, String requestMethod, HttpRequestHandler middleware) {
     addMiddleware(requestMethod.toUpperCase(), context, middleware);
     return this;
   }
 
   // Internal service to handle middleware
-  private void addMiddleware(String requestMethod, String context, HttpRequest middleware) {
+  private void addMiddleware(String requestMethod, String context, HttpRequestHandler middleware) {
     if (middleware instanceof FilterTask) {
       worker.add(new FilterWorker((FilterTask) middleware));
     }
 
     handler.add(0, new FilterImpl(requestMethod, context, middleware));
   }
 
-  public Express all(HttpRequest request) {
+  public Express all(HttpRequestHandler request) {
     handler.add(1, new FilterImpl("*", "*", request));
     return this;
   }
 
-  public Express all(String context, HttpRequest request) {
+  public Express all(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("*", context, request));
     return this;
   }
 
-  public Express all(String context, String requestMethod, HttpRequest request) {
+  public Express all(String context, String requestMethod, HttpRequestHandler request) {
     handler.add(1, new FilterImpl(requestMethod, context, request));
     return this;
   }
 
-  public Express get(String context, HttpRequest request) {
+  public Express get(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("GET", context, request));
     return this;
   }
 
-  public Express post(String context, HttpRequest request) {
+  public Express post(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("POST", context, request));
     return this;
   }
 
-  public Express put(String context, HttpRequest request) {
+  public Express put(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("PUT", context, request));
     return this;
   }
 
-  public Express delete(String context, HttpRequest request) {
+  public Express delete(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("DELETE", context, request));
     return this;
   }
 
-  public Express patch(String context, HttpRequest request) {
+  public Express patch(String context, HttpRequestHandler request) {
     handler.add(1, new FilterImpl("PATCH", context, request));
     return this;
   }

src/main/java/express/ExpressRouter.java

@@ -4,7 +4,7 @@
 import express.filter.FilterLayerHandler;
 import express.filter.FilterTask;
 import express.filter.FilterWorker;
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 
 import java.util.ArrayList;
 
@@ -23,65 +23,65 @@ public class ExpressRouter implements Router {
     HANDLER = new FilterLayerHandler(2);
   }
 
-  public ExpressRouter use(HttpRequest middleware) {
+  public ExpressRouter use(HttpRequestHandler middleware) {
     addMiddleware("*", "*", middleware);
     return this;
   }
 
-  public ExpressRouter use(String context, HttpRequest middleware) {
+  public ExpressRouter use(String context, HttpRequestHandler middleware) {
     addMiddleware("*", context, middleware);
     return this;
   }
 
-  public ExpressRouter use(String context, String requestMethod, HttpRequest middleware) {
+  public ExpressRouter use(String context, String requestMethod, HttpRequestHandler middleware) {
     addMiddleware(requestMethod.toUpperCase(), context, middleware);
     return this;
   }
 
-  private void addMiddleware(String requestMethod, String context, HttpRequest middleware) {
+  private void addMiddleware(String requestMethod, String context, HttpRequestHandler middleware) {
     if (middleware instanceof FilterTask) {
       WORKER.add(new FilterWorker((FilterTask) middleware));
     }
 
     HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
   }
 
-  public ExpressRouter all(HttpRequest request) {
+  public ExpressRouter all(HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("*", "*", request));
     return this;
   }
 
-  public ExpressRouter all(String context, HttpRequest request) {
+  public ExpressRouter all(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("*", context, request));
     return this;
   }
 
-  public ExpressRouter all(String context, String requestMethod, HttpRequest request) {
+  public ExpressRouter all(String context, String requestMethod, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl(requestMethod, context, request));
     return this;
   }
 
-  public ExpressRouter get(String context, HttpRequest request) {
+  public ExpressRouter get(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("GET", context, request));
     return this;
   }
 
-  public ExpressRouter post(String context, HttpRequest request) {
+  public ExpressRouter post(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("POST", context, request));
     return this;
   }
 
-  public ExpressRouter put(String context, HttpRequest request) {
+  public ExpressRouter put(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("PUT", context, request));
     return this;
   }
 
-  public ExpressRouter delete(String context, HttpRequest request) {
+  public ExpressRouter delete(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("DELETE", context, request));
     return this;
   }
 
-  public ExpressRouter patch(String context, HttpRequest request) {
+  public ExpressRouter patch(String context, HttpRequestHandler request) {
     HANDLER.add(1, new FilterImpl("PATCH", context, request));
     return this;
   }

src/main/java/express/Router.java

@@ -1,6 +1,6 @@
 package express;
 
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 
 /**
  * @author Simon Reinisch
@@ -14,7 +14,7 @@ public interface Router {
    * @param middleware An middleware which will be fired on every request-method and path.
    * @return The router itself to allow method call chaining.
    */
-  Router use(HttpRequest middleware);
+  Router use(HttpRequestHandler middleware);
 
   /**
    * Add an middleware which will be called before each request-type listener will be fired.
@@ -24,7 +24,7 @@ public interface Router {
    *
    * @return The router itself to allow method call chaining.
    */
-  Router use(String context, HttpRequest middleware);
+  Router use(String context, HttpRequestHandler middleware);
 
   /**
    * Add an middleware which will be called before each request-type listener will be fired.
@@ -35,7 +35,7 @@ public interface Router {
    *
    * @return The router itself to allow method call chaining.
    */
-  Router use(String context, String requestMethod, HttpRequest middleware);
+  Router use(String context, String requestMethod, HttpRequestHandler middleware);
 
   /**
    * Add an listener for all request methods and contexts.
@@ -44,7 +44,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router all(HttpRequest request);
+  Router all(HttpRequestHandler request);
 
   /**
    * Adds an handler for a specific context.
@@ -54,7 +54,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router all(String context, HttpRequest request);
+  Router all(String context, HttpRequestHandler request);
 
   /**
    * Adds an handler for a specific context and method.
@@ -66,7 +66,7 @@ public interface Router {
    *
    * @return              The router itself to allow method call chaining.
    */
-  Router all(String context, String requestMethod, HttpRequest request);
+  Router all(String context, String requestMethod, HttpRequestHandler request);
 
   /**
    * Add an listener for GET request's.
@@ -76,7 +76,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router get(String context, HttpRequest request);
+  Router get(String context, HttpRequestHandler request);
 
   /**
    * Add an listener for POST request's.
@@ -86,7 +86,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router post(String context, HttpRequest request);
+  Router post(String context, HttpRequestHandler request);
 
   /**
    * Add an listener for PUT request's.
@@ -96,7 +96,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router put(String context, HttpRequest request);
+  Router put(String context, HttpRequestHandler request);
 
   /**
    * Add an listener for DELETE request's.
@@ -106,7 +106,7 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router delete(String context, HttpRequest request);
+  Router delete(String context, HttpRequestHandler request);
 
   /**
    * Add an listener for PATCH request's.
@@ -116,6 +116,6 @@ public interface Router {
    *
    * @return        The router itself to allow method call chaining.
    */
-  Router patch(String context, HttpRequest request);
+  Router patch(String context, HttpRequestHandler request);
 
 }

src/main/java/express/filter/FilterImpl.java

@@ -1,6 +1,6 @@
 package express.filter;
 
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 import express.http.request.Request;
 import express.http.response.Response;
 
@@ -15,9 +15,10 @@
  * An http-filter to extract data and check if an context matches
  * the request.
  */
-public class FilterImpl implements HttpRequest {
+public class FilterImpl implements HttpRequestHandler
+{
 
-  private final HttpRequest REQUEST;
+  private final HttpRequestHandler REQUEST;
   private final String REQ;
   private final String CONTEXT;
   private final boolean REQ_ALL;
@@ -26,7 +27,7 @@ public class FilterImpl implements HttpRequest {
   private String root;
   private String fullContext;
 
-  public FilterImpl(String requestMethod, String context, HttpRequest httpRequest) {
+  public FilterImpl(String requestMethod, String context, HttpRequestHandler httpRequest) {
     this.REQ = requestMethod;
     this.REQUEST = httpRequest;
     this.CONTEXT = normalizePath(context);
@@ -57,7 +58,7 @@ public void setRoot(String root) {
   public void handle(Request req, Response res) {
     String requestMethod = req.getMethod();
     String requestPath = req.getURI().getRawPath();
-    ConcurrentHashMap<String, HttpRequest> parameterListener = req.getApp().getParameterListener();
+    ConcurrentHashMap<String, HttpRequestHandler> parameterListener = req.getApp().getParameterListener();
 
     if (!(REQ_ALL || REQ.equals(requestMethod))) {
       return;
@@ -77,7 +78,7 @@ public void handle(Request req, Response res) {
 
     // Check parameter listener
     params.forEach((s, s2) -> {
-      HttpRequest request = parameterListener.get(s);
+      HttpRequestHandler request = parameterListener.get(s);
 
       if (request != null)
         request.handle(req, res);

src/main/java/express/filter/FilterLayer.java

@@ -1,6 +1,6 @@
 package express.filter;
 
-import express.http.HttpRequest;
+import express.http.HttpRequestHandler;
 import express.http.request.Request;
 import express.http.response.Response;
 
@@ -14,7 +14,7 @@
  * <p>
  * Controller class for FilterLayer.
  */
-public class FilterLayer<T extends HttpRequest> {
+public class FilterLayer<T extends HttpRequestHandler> {
 
   private final List<T> FILTER;