Some clean-ups

Author: simonwep

src/express/Express.java

@@ -185,7 +185,16 @@ private void addMiddleware(@NotNull String requestMethod, @NotNull String contex
   }
 
   /**
-   * Add an listener for all request methods.
+   * Add an listener for all request methods and contexts.
+   *
+   * @param request Will be fired on all requests.
+   */
+  public void all(@NotNull HttpRequest request) {
+    HANDLER.add(1, new ExpressFilterImpl(this, "*", "*", request));
+  }
+
+  /**
+   * Adds an handler for a specific context.
    *
    * @param context The context.
    * @param request An listener which will be fired if the context matches the requestpath.
@@ -195,12 +204,15 @@ public void all(@NotNull String context, @NotNull HttpRequest request) {
   }
 
   /**
-   * Add an listener for all request methods and contexts.
+   * Adds an handler for a specific context and method.
+   * You can use a star '*' to match every context / request-method.
    *
-   * @param request Will be fired on all requests.
+   * @param context       The context.
+   * @param requestMethod The request method.
+   * @param request       An listener which will be fired if the context matches the requestpath.
    */
-  public void all(@NotNull HttpRequest request) {
-    HANDLER.add(1, new ExpressFilterImpl(this, "*", "*", request));
+  public void all(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
+    HANDLER.add(1, new ExpressFilterImpl(this, requestMethod, context, request));
   }
 
   /**
@@ -254,29 +266,17 @@ public void patch(@NotNull String context, @NotNull HttpRequest request) {
   }
 
   /**
-   * Add an listener for an specific request method.
+   * Adds an handler for a specific context and method.
+   * You can use a star '*' to match every context / request-method.
    *
-   * @param requestMethod The request method
-   * @param context       The context for the request handler.
+   * @param context       The context.
+   * @param requestMethod The request method.
    * @param request       An listener which will be fired if the context matches the requestpath.
    */
-  public void on(@NotNull String requestMethod, @NotNull String context, @NotNull HttpRequest request) {
+  public void on(@NotNull String context, @NotNull String requestMethod, @NotNull HttpRequest request) {
     HANDLER.add(1, new ExpressFilterImpl(this, requestMethod, context, request));
   }
 
-  /**
-   * Add an listener for an specific request method.
-   * You cann add multiple contexts.
-   *
-   * @param requestMethod The request method
-   * @param contexts      The contexts for the request handler..
-   * @param request       An listener which will be fired if the context matches the requestpath.
-   */
-  public void on(@NotNull String requestMethod, @NotNull HttpRequest request, String... contexts) {
-    for (String c : contexts)
-      HANDLER.add(1, new ExpressFilterImpl(this, requestMethod, c, request));
-  }
-
   /**
    * Start the HTTP-Server on port 80.
    * This method is asyncronous so be sure to add an listener or keep it in mind!

src/express/expressfilter/ExpressFilterImpl.java

@@ -15,16 +15,16 @@
  */
 public class ExpressFilterImpl implements HttpRequest {
 
-  private final Express APP;
+  private final Express EXPRESS;
 
   private final HttpRequest REQUEST;
   private final String REQ;
   private final String CONTEXT;
   private final boolean REQ_ALL;
   private final boolean CONTEXT_ALL;
 
-  public ExpressFilterImpl(Express app, String requestMethod, String context, HttpRequest httpRequest) {
-    this.APP = app;
+  public ExpressFilterImpl(Express express, String requestMethod, String context, HttpRequest httpRequest) {
+    this.EXPRESS = express;
     this.REQ = requestMethod;
     this.REQUEST = httpRequest;
     this.CONTEXT = context;
@@ -57,7 +57,7 @@ public void handle(Request req, Response res) {
 
     // Check parameter lsitener
     params.forEach((s, s2) -> {
-      HttpRequest hreq = APP.getParameterListener().get(s);
+      HttpRequest hreq = EXPRESS.getParameterListener().get(s);
       if (hreq != null)
         hreq.handle(req, res);
     });