Some refactoring and reimplementations

Author: simonwep

src/express/Express.java

@@ -283,7 +283,6 @@ public void listen(Action onStart, int port) throws IOException {
         // Fire worker threads
         WORKER.forEach(ExpressFilterWorker::start);
 
-
         // Create http server
         httpServer = HttpServer.create(new InetSocketAddress(this.hostname, port), 0);
         httpServer.setExecutor(executor);           // Set thread executor

src/express/expressfilter/FilterLayerHandler.java

@@ -10,14 +10,14 @@
 
 public class FilterLayerHandler implements HttpHandler {
 
-  private ExpressFilterChain[] LEVELS;
+  private ExpressFilterChain[] LAYER;
 
   {
     // Initialize layers
-    LEVELS = new ExpressFilterChain[2];
+    LAYER = new ExpressFilterChain[2];
 
-    for (int i = 0; i < LEVELS.length; i++) {
-      LEVELS[i] = new ExpressFilterChain();
+    for (int i = 0; i < LAYER.length; i++) {
+      LAYER[i] = new ExpressFilterChain();
     }
   }
 
@@ -27,7 +27,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
     Response response = new Response(httpExchange);
 
     // First fire all middlewares, then the normal request filter
-    for (ExpressFilterChain chain : LEVELS) {
+    for (ExpressFilterChain chain : LAYER) {
       chain.filter(request, response);
 
       if (response.isClosed())
@@ -43,12 +43,12 @@ public void handle(HttpExchange httpExchange) throws IOException {
    */
   public void add(int level, HttpRequest handler) {
 
-    if (level >= LEVELS.length)
-      throw new IndexOutOfBoundsException("Out of bounds: " + level + " > " + LEVELS.length);
+    if (level >= LAYER.length)
+      throw new IndexOutOfBoundsException("Out of bounds: " + level + " > " + LAYER.length);
     if (level < 0)
       throw new IndexOutOfBoundsException("Cannot be under zero: " + level + " < 0");
 
-    LEVELS[level].add(handler);
+    LAYER[level].add(handler);
   }
 
 }

src/express/http/Cookie.java

@@ -24,10 +24,18 @@ public class Cookie {
    * @param value Cookie value
    */
   public Cookie(String name, String value) {
+    name = name.trim();
+
+    if (name.length() == 0 || name.charAt(0) == '$')
+      throw new IllegalArgumentException("Illegal cookie name");
+
     this.name = name;
     this.value = value;
   }
 
+  public Cookie() {
+  }
+
   /**
    * @return The name of the Cookie
    */
@@ -183,8 +191,34 @@ public void setDomain(String domain) {
     this.domain = domain;
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    if (obj instanceof Cookie) {
+      Cookie other = (Cookie) obj;
+
+      if (!other.getValue().equals(this.getValue())) return false;
+      if (!other.getName().equals(this.getName())) return false;
+      if (!other.getDomain().equals(this.getDomain())) return false;
+      if (!other.getExpire().equals(this.getExpire())) return false;
+      if (other.getMaxAge() != this.getMaxAge()) return false;
+      if (!other.getSameSite().equals(this.getSameSite())) return false;
+      if (!other.getPath().equals(this.getPath())) return false;
+
+      return true;
+    }
+    return super.equals(obj);
+  }
+
+  /**
+   * Build the string to an cookie-string.
+   *
+   * @return The cookie as string, null if the name / value is null.
+   */
   @Override
   public String toString() {
+    if (name == null || value == null)
+      return null;
+
     StringBuffer b = new StringBuffer();
     b.append(name).append("=").append(value);
 

src/express/http/request/Request.java

@@ -70,7 +70,9 @@ public Request(HttpExchange exchange) {
 
     // Parse query and cookies, both returns not null if there is nothing
     this.QUERYS = RequestUtils.parseRawQuery(exchange.getRequestURI().getRawQuery());
-    this.COOKIES = RequestUtils.parseCookies(exchange.getRequestHeaders());
+
+    // Parse cookies
+    this.COOKIES = RequestUtils.parseCookies(HEADERS);
   }
 
   /**

src/express/http/request/RequestUtils.java

@@ -16,22 +16,39 @@ public class RequestUtils {
    * @param headers The Headers
    * @return An hashmap with the cookie name as key and the complete cookie as value.
    */
-  protected static HashMap<String, Cookie> parseCookies(Headers headers) {
+  static HashMap<String, Cookie> parseCookies(Headers headers) {
     HashMap<String, Cookie> cookieList = new HashMap<>();
     List<String> headerCookies = headers.get("Cookie");
 
     if (headerCookies == null || headerCookies.size() == 0) {
       return cookieList;
     }
 
-    String hcookies = headerCookies.get(0);
+    char[] chars = headerCookies.get(0).toCharArray();
+    StringBuilder key = new StringBuilder();
+    StringBuilder val = new StringBuilder();
+    boolean swap = false;
+
+    for (char c : chars) {
+      if (c == '=') {
+        swap = true;
+      } else if (c == ';') {
+        String rkey = key.toString().trim();
+        cookieList.put(rkey, new Cookie(rkey, val.toString()));
+
+        key.setLength(0);
+        val.setLength(0);
+        swap = false;
+      } else if (swap) {
+        val.append(c);
+      } else {
+        key.append(c);
+      }
+    }
 
-    String[] cookies = hcookies.split(";");
-    for (String cookie : cookies) {
-      String[] split = cookie.split("=");
-      String name = split[0].trim();
-      String value = split[1].trim();
-      cookieList.put(name, new Cookie(name, value));
+    if (key.length() > 0 && val.length() > 0) {
+      String rkey = key.toString().trim();
+      cookieList.put(rkey, new Cookie(rkey, val.toString()));
     }
 
     return cookieList;
@@ -43,7 +60,7 @@ protected static HashMap<String, Cookie> parseCookies(Headers headers) {
    * @param rawQuery The raw query
    * @return An list with key-values which are encoded in UTF8.
    */
-  protected static HashMap<String, String> parseRawQuery(String rawQuery) {
+  static HashMap<String, String> parseRawQuery(String rawQuery) {
     HashMap<String, String> querys = new HashMap<>();
 
     if (rawQuery == null)