Remove ExpressUtils

Class contains methods which are not useful for the user, so extract them and delete the class.

Author: simonwep

src/express/http/Request.java

@@ -2,15 +2,18 @@
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import express.utils.ExpressUtils;
 import express.http.cookie.Cookie;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author Simon Reinisch
@@ -34,8 +37,8 @@ public Request(HttpExchange exchange) {
     this.BODY = exchange.getRequestBody();
 
     this.params = new HashMap<>();
-    this.QUERYS = ExpressUtils.parseRawQuery(exchange.getRequestURI());
-    this.COOKIES = ExpressUtils.parseCookies(exchange.getRequestHeaders());
+    this.QUERYS = parseRawQuery(exchange.getRequestURI());
+    this.COOKIES = parseCookies(exchange.getRequestHeaders());
   }
 
   /**
@@ -161,4 +164,58 @@ public List<String> getHeader(String header) {
     return HEADER.get(header);
   }
 
+  /**
+   * Extract the cookies from the 'Cookie' header.
+   *
+   * @param headers The Headers
+   * @return An hashmap with the cookie name as key and the complete cookie as value.
+   */
+  private 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);
+
+    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));
+    }
+
+    return cookieList;
+  }
+
+  /**
+   * Method to extract the querys from an url.
+   *
+   * @param uri The uri.
+   * @return An list with key-values which are encoded in UTF8.
+   */
+  private static HashMap<String, String> parseRawQuery(URI uri) {
+    HashMap<String, String> querys = new HashMap<>();
+    String rawQuery = uri.getRawQuery();
+
+    if (rawQuery == null)
+      return querys;
+
+    Matcher mat = Pattern.compile("(.+?)=(.+?)(&|$)").matcher(rawQuery);
+    while (mat.find()) {
+      try {
+        String key = URLDecoder.decode(mat.group(1), "UTF8");
+        String val = URLDecoder.decode(mat.group(2), "UTF8");
+        querys.put(key, val);
+      } catch (UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+    }
+
+    return querys;
+  }
+
 }

src/express/middleware/Static.java

@@ -1,9 +1,9 @@
 package express.middleware;
 
-import express.utils.ExpressUtils;
 import express.events.HttpRequest;
 import express.http.Request;
 import express.http.Response;
+import express.utils.MIMETypes;
 
 import java.io.File;
 
@@ -35,8 +35,23 @@ public void handle(Request req, Response res) {
 
     if (reqFile.exists()) {
       String extension = reqFile.getAbsolutePath().replaceAll("^(.*\\.|.*\\\\|.+$)", "");
-      String contentType = ExpressUtils.getContentType(extension);
+      String contentType = getContentType(extension);
       res.send(reqFile, contentType);
     }
   }
+
+  /**
+   * Returns the MIME-Type of an filename.
+   *
+   * @param fileExtension The file extension.
+   * @return The MIME-Type.
+   */
+  private static String getContentType(String fileExtension) {
+    String ct = MIMETypes.get().get(fileExtension);
+
+    if (ct == null)
+      ct = "text/plain";
+
+    return ct;
+  }
 }