Fixed Naming Convention

- Fixed: Instance final fields' names shouldn't be upper-case
- Other code style adjustments

Author: michalwa

src/main/java/express/ExpressException.java

@@ -7,10 +7,9 @@
 public class ExpressException extends RuntimeException {
 
   /**
-   * Constructs a new exception with {@code null} as its detail message.
+   * Constructs a new exception with an empty detail message.
    */
-  public ExpressException() {
-  }
+  public ExpressException() {}
 
   /**
    * Constructs a new exception with the specified detail message.

src/main/java/express/ExpressListener.java

@@ -5,5 +5,7 @@
  * Listener for express actions
  */
 public interface ExpressListener {
+  
   void action();
+  
 }

src/main/java/express/ExpressRouter.java

@@ -14,13 +14,13 @@
  */
 public class ExpressRouter implements Router {
 
-  private final ArrayList<FilterWorker> WORKER;
-  private final FilterLayerHandler HANDLER;
+  private final ArrayList<FilterWorker> workers;
+  private final FilterLayerHandler handler;
 
   {
     // Initialize
-    WORKER = new ArrayList<>();
-    HANDLER = new FilterLayerHandler(2);
+    workers = new ArrayList<>();
+    handler = new FilterLayerHandler(2);
   }
 
   public ExpressRouter use(HttpRequestHandler middleware) {
@@ -40,57 +40,57 @@ public ExpressRouter use(String context, String requestMethod, HttpRequestHandle
 
   private void addMiddleware(String requestMethod, String context, HttpRequestHandler middleware) {
     if (middleware instanceof FilterTask) {
-      WORKER.add(new FilterWorker((FilterTask) middleware));
+      workers.add(new FilterWorker((FilterTask) middleware));
     }
 
-    HANDLER.add(0, new FilterImpl(requestMethod, context, middleware));
+    handler.add(0, new FilterImpl(requestMethod, context, middleware));
   }
 
   public ExpressRouter all(HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("*", "*", request));
+    handler.add(1, new FilterImpl("*", "*", request));
     return this;
   }
 
   public ExpressRouter all(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("*", context, request));
+    handler.add(1, new FilterImpl("*", context, request));
     return this;
   }
 
   public ExpressRouter all(String context, String requestMethod, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl(requestMethod, context, request));
+    handler.add(1, new FilterImpl(requestMethod, context, request));
     return this;
   }
 
   public ExpressRouter get(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("GET", context, request));
+    handler.add(1, new FilterImpl("GET", context, request));
     return this;
   }
 
   public ExpressRouter post(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("POST", context, request));
+    handler.add(1, new FilterImpl("POST", context, request));
     return this;
   }
 
   public ExpressRouter put(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("PUT", context, request));
+    handler.add(1, new FilterImpl("PUT", context, request));
     return this;
   }
 
   public ExpressRouter delete(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("DELETE", context, request));
+    handler.add(1, new FilterImpl("DELETE", context, request));
     return this;
   }
 
   public ExpressRouter patch(String context, HttpRequestHandler request) {
-    HANDLER.add(1, new FilterImpl("PATCH", context, request));
+    handler.add(1, new FilterImpl("PATCH", context, request));
     return this;
   }
 
   ArrayList<FilterWorker> getWorker() {
-    return WORKER;
+    return workers;
   }
 
   FilterLayerHandler getHandler() {
-    return HANDLER;
+    return handler;
   }
 }

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

@@ -18,26 +18,26 @@
 public class FilterImpl implements HttpRequestHandler
 {
 
-  private final HttpRequestHandler REQUEST;
-  private final String REQ;
-  private final String CONTEXT;
-  private final boolean REQ_ALL;
-  private final boolean CONTEXT_ALL;
+  private final HttpRequestHandler request;
+  private final String req;
+  private final String context;
+  private final boolean reqAll;
+  private final boolean contextAll;
 
   private String root;
   private String fullContext;
 
   public FilterImpl(String requestMethod, String context, HttpRequestHandler httpRequest) {
-    this.REQ = requestMethod;
-    this.REQUEST = httpRequest;
-    this.CONTEXT = normalizePath(context);
+    this.req = requestMethod;
+    this.request = httpRequest;
+    this.context = normalizePath(context);
 
     // Save some information's which don't need to be processed again
-    this.REQ_ALL = requestMethod.equals("*");
-    this.CONTEXT_ALL = context.equals("*");
+    this.reqAll = requestMethod.equals("*");
+    this.contextAll = context.equals("*");
 
     this.root = "/";
-    this.fullContext = this.CONTEXT;
+    this.fullContext = this.context;
   }
 
   public void setRoot(String root) {
@@ -51,7 +51,7 @@ public void setRoot(String root) {
       root += '/';
 
     this.root = normalizePath(root);
-    this.fullContext = normalizePath(this.root + CONTEXT);
+    this.fullContext = normalizePath(this.root + context);
   }
 
   @Override
@@ -60,11 +60,11 @@ public void handle(Request req, Response res) {
     String requestPath = req.getURI().getRawPath();
     ConcurrentHashMap<String, HttpRequestHandler> parameterListener = req.getApp().getParameterListener();
 
-    if (!(REQ_ALL || REQ.equals(requestMethod))) {
+    if (!(reqAll || this.req.equals(requestMethod))) {
       return;
-    } else if (CONTEXT_ALL) {
-      req.setContext(CONTEXT);
-      REQUEST.handle(req, res);
+    } else if (contextAll) {
+      req.setContext(context);
+      request.handle(req, res);
       return;
     }
 
@@ -89,8 +89,8 @@ public void handle(Request req, Response res) {
       return;
 
     // Handle request
-    req.setContext(CONTEXT);
-    REQUEST.handle(req, res);
+    req.setContext(context);
+    request.handle(req, res);
   }
 
   /**

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

@@ -16,30 +16,26 @@
  */
 public class FilterLayer<T extends HttpRequestHandler> {
 
-  private final List<T> FILTER;
-
-  {
-    this.FILTER = Collections.synchronizedList(new ArrayList<>());
-  }
+  private final List<T> filter = Collections.synchronizedList(new ArrayList<>());
 
   public void add(T expressFilter) {
-    this.FILTER.add(expressFilter);
+    this.filter.add(expressFilter);
   }
 
   public void add(int index, T expressFilter) {
-    this.FILTER.add(index, expressFilter);
+    this.filter.add(index, expressFilter);
   }
 
   public void addAll(List<T> expressFilters) {
-    this.FILTER.addAll(expressFilters);
+    this.filter.addAll(expressFilters);
   }
 
   public List<T> getFilter() {
-    return FILTER;
+    return filter;
   }
 
   void filter(Request req, Response res) {
-    ListIterator<T> iter = this.FILTER.listIterator();
+    ListIterator<T> iter = this.filter.listIterator();
 
     while (!res.isClosed() && iter.hasNext()) {
       iter.next().handle(req, res);

src/main/java/express/filter/FilterLayerHandler.java

@@ -16,22 +16,22 @@
  */
 public class FilterLayerHandler {
 
-  private final FilterLayer[] LAYER;
+  private final FilterLayer[] layers;
 
-  public FilterLayerHandler(int layer) {
+  public FilterLayerHandler(int layers) {
 
     // Create & initialize layers
-    this.LAYER = new FilterLayer[layer];
-    for (int i = 0; i < LAYER.length; i++)
-      LAYER[i] = new FilterLayer<>();
+    this.layers = new FilterLayer[layers];
+    for (int i = 0; i < this.layers.length; i++)
+      this.layers[i] = new FilterLayer<>();
   }
 
   public void handle(HttpExchange httpExchange, Express express) {
     Request request = new Request(httpExchange, express);
     Response response = new Response(httpExchange);
 
     // First fire all middleware's, then the normal request filter
-    for (FilterLayer chain : LAYER) {
+    for (FilterLayer chain : layers) {
       chain.filter(request, response);
 
       if (response.isClosed())
@@ -40,20 +40,20 @@ public void handle(HttpExchange httpExchange, Express express) {
   }
 
   /**
-   * Add an new handler for an specific handler layer.
+   * Add an new handler for an specific handler layers.
    *
-   * @param level   The layer.
-   * @param handler The handler, will be append to the top of the layer.
+   * @param level   The layers.
+   * @param handler The handler, will be append to the top of the layers.
    */
   @SuppressWarnings("unchecked")
   public void add(int level, HttpRequestHandler handler) {
 
-    if (level >= LAYER.length)
-      throw new IndexOutOfBoundsException("Out of bounds: " + level + " > " + LAYER.length);
+    if (level >= layers.length)
+      throw new IndexOutOfBoundsException("Out of bounds: " + level + " > " + layers.length);
     if (level < 0)
       throw new IndexOutOfBoundsException("Cannot be under zero: " + level + " < 0");
 
-    LAYER[level].add(handler);
+    layers[level].add(handler);
   }
 
   /**
@@ -64,31 +64,31 @@ public void add(int level, HttpRequestHandler handler) {
   @SuppressWarnings("unchecked")
   public void combine(FilterLayerHandler filterLayerHandler) {
     if (filterLayerHandler != null) {
-      FilterLayer[] chains = filterLayerHandler.getLayer();
+      FilterLayer[] chains = filterLayerHandler.getLayers();
 
-      if (chains.length != LAYER.length)
-        throw new ExpressException("Cannot add an filterLayerHandler with different layer sizes: " + chains.length + " != " + LAYER.length);
+      if (chains.length != layers.length)
+        throw new ExpressException("Cannot add an filterLayerHandler with different layers sizes: " + chains.length + " != " + layers.length);
 
       for (int i = 0; i < chains.length; i++)
-        LAYER[i].addAll(chains[i].getFilter());
+        layers[i].addAll(chains[i].getFilter());
     }
   }
 
   /**
    * Iterate over the different FilterLayer
    *
-   * @param layerConsumer An consumer for the layer
+   * @param layerConsumer An consumer for the layers
    */
   public void forEach(Consumer<FilterLayer> layerConsumer) {
     if (layerConsumer == null)
       return;
 
-    for (FilterLayer layer : LAYER)
+    for (FilterLayer layer : layers)
       layerConsumer.accept(layer);
   }
 
-  private FilterLayer[] getLayer() {
-    return LAYER;
+  private FilterLayer[] getLayers() {
+    return layers;
   }
 
 }

src/main/java/express/filter/FilterWorker.java

@@ -10,24 +10,24 @@
  */
 public class FilterWorker extends TimerTask {
 
-  private final FilterTask MW;
+  private final FilterTask middlewareWorker;
   private Timer timer;
 
   public FilterWorker(FilterTask middlewareWorker) {
-    this.MW = middlewareWorker;
+    this.middlewareWorker = middlewareWorker;
   }
 
   public void start() {
     if (this.timer == null) {
-      MW.onStart();
+      middlewareWorker.onStart();
       this.timer = new Timer();
-      this.timer.scheduleAtFixedRate(this, 0, MW.getDelay());
+      this.timer.scheduleAtFixedRate(this, 0, middlewareWorker.getDelay());
     }
   }
 
   public void stop() {
     if (timer != null) {
-      MW.onStop();
+      middlewareWorker.onStop();
       this.timer.cancel();
       this.timer = null;
     }
@@ -39,6 +39,6 @@ public boolean isActive() {
 
   @Override
   public void run() {
-    MW.onUpdate();
+    middlewareWorker.onUpdate();
   }
 }

src/main/java/express/http/HttpRequestHandler.java

@@ -7,6 +7,7 @@
  * @author Simon Reinisch
  * Interface to handle an http-request
  */
+@FunctionalInterface
 public interface HttpRequestHandler {
 
   /**

src/main/java/express/http/SameSite.java

@@ -4,5 +4,8 @@
  * @author Simon Reinisch
  */
 public enum SameSite {
-  STRICT, LAX
+  
+  STRICT,
+  LAX
+  
 }