Format code, remove trash

Author: simonwep

src/express/Express.java

@@ -4,11 +4,11 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import express.http.HttpRequest;
 import express.filter.FilterImpl;
+import express.filter.FilterLayerHandler;
 import express.filter.FilterTask;
 import express.filter.FilterWorker;
-import express.filter.FilterLayerHandler;
+import express.http.HttpRequest;
 import express.middleware.ExpressMiddleware;
 
 import java.io.IOException;
@@ -274,7 +274,7 @@ public void listen(ExpressListener onStart, int port) throws IOException {
         httpServer.setExecutor(executor);
 
         // Create handler for all contexts
-        httpServer.createContext("/",httpExchange -> {
+        httpServer.createContext("/", httpExchange -> {
           HANDLER.handle(httpExchange, this);
         });
 

src/express/ExpressRouter.java

@@ -1,11 +1,11 @@
 package express;
 
 import com.sun.istack.internal.NotNull;
-import express.http.HttpRequest;
 import express.filter.FilterImpl;
+import express.filter.FilterLayerHandler;
 import express.filter.FilterTask;
 import express.filter.FilterWorker;
-import express.filter.FilterLayerHandler;
+import express.http.HttpRequest;
 
 import java.util.ArrayList;
 

src/express/filter/FilterChain.java

@@ -35,7 +35,7 @@ List<T> getFilter() {
   }
 
   void filter(Request req, Response res) {
-    ListIterator<T> iter =  this.expressFilters.listIterator();
+    ListIterator<T> iter = this.expressFilters.listIterator();
 
     while (!res.isClosed() && iter.hasNext()) {
       iter.next().handle(req, res);

src/express/filter/FilterImpl.java

@@ -4,6 +4,8 @@
 import express.http.request.Request;
 import express.http.response.Response;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -93,7 +95,13 @@ private HashMap<String, String> matchURL(String filter, String url) {
         while (ui < uc.length && uc[ui] != '/')
           val.append(uc[ui++]);
 
-        params.put(key.toString(), val.toString());
+        try {
+          String decVal = URLDecoder.decode(val.toString(), "UTF8");
+          params.put(key.toString(), decVal);
+        } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+        }
+
       } else if (fc[fi] != uc[ui]) {
 
         // Failed

src/express/filter/FilterLayer.java

@@ -54,11 +54,7 @@ public Request(HttpExchange exchange, Express express) {
 
     // Parse content length
     String contentLength = HEADERS.get("Content-Length") != null ? HEADERS.get("Content-Length").get(0) : null;
-    if (contentLength != null && contentLength.matches("^[0-9]+$")) {
-      CONTENT_LENGTH = Long.parseLong(contentLength);
-    } else
-      CONTENT_LENGTH = -1;
-
+    this.CONTENT_LENGTH = contentLength != null ? Long.parseLong(contentLength) : -1;
 
     // Check if the request contains an body-content
     this.CONTENT_TYPE = HEADERS.get("Content-Type") == null ? "" : HEADERS.get("Content-Type").get(0);
@@ -73,8 +69,6 @@ public Request(HttpExchange exchange, Express express) {
 
     // Parse query and cookies, both returns not null if there is nothing
     this.QUERYS = RequestUtils.parseRawQuery(exchange.getRequestURI().getRawQuery());
-
-    // Parse cookies
     this.COOKIES = RequestUtils.parseCookies(HEADERS);
   }
 

src/express/http/request/Request.java

@@ -3,7 +3,6 @@
 import com.sun.istack.internal.NotNull;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import express.Express;
 import express.http.Cookie;
 import express.utils.MediaType;
 import express.utils.Status;

src/express/http/response/Response.java

@@ -1,9 +1,9 @@
 package express.middleware;
 
-import express.http.HttpRequest;
 import express.filter.Filter;
 import express.filter.FilterTask;
 import express.http.Cookie;
+import express.http.HttpRequest;
 import express.http.SessionCookie;
 import express.http.request.Request;
 import express.http.response.Response;