Some clean-ups

Author: simonwep

src/express/expressfilter/ExpressFilterImpl.java

@@ -5,8 +5,6 @@
 import express.http.response.Response;
 
 import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author Simon Reinisch
@@ -40,14 +38,14 @@ public void handle(Request req, Response res) {
 
     // Parse params
     HashMap<String, String> params = matchURL(CONTEXT, requestPath);
-    if(params == null)
+    if (params == null)
       return;
 
     req.setParams(params);
     REQUEST.handle(req, res);
   }
 
-  private static HashMap<String, String> matchURL(String filter, String url) {
+  private HashMap<String, String> matchURL(String filter, String url) {
     HashMap<String, String> params = new HashMap<>();
     StringBuilder key = new StringBuilder();
     StringBuilder val = new StringBuilder();

src/express/expressfilter/ExpressFilterTask.java

@@ -9,6 +9,7 @@ public interface ExpressFilterTask {
 
   /**
    * Returns the delay between the updates
+   *
    * @return Update delay in milliseconds
    */
   long getDelay();

src/express/http/SessionCookie.java

@@ -18,7 +18,7 @@ public SessionCookie(long maxAge) {
   }
 
   /**
-     * @return Max age from this cookie
+   * @return Max age from this cookie
    */
   public long getMaxAge() {
     return MAX_AGE;
@@ -40,6 +40,7 @@ public Object getData() {
 
   /**
    * Set the session data
+   *
    * @param data The data object
    * @return The object itself
    */

src/express/http/request/Request.java

@@ -2,10 +2,9 @@
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import express.utils.MediaType;
-import express.utils.Utils;
 import express.expressfilter.ExpressFilter;
 import express.http.Cookie;
+import express.utils.Utils;
 
 import java.io.*;
 import java.net.InetAddress;
@@ -284,21 +283,21 @@ public HashMap<String, String> getParams() {
   }
 
   /**
-   * Return all url-querys.
+   * Set the params.
    *
-   * @return An entire list of key-values
+   * @param params
    */
-  public HashMap<String, String> getQuerys() {
-    return QUERYS;
+  public void setParams(HashMap<String, String> params) {
+    this.params = params;
   }
 
   /**
-   * Set the params.
+   * Return all url-querys.
    *
-   * @param params
+   * @return An entire list of key-values
    */
-  public void setParams(HashMap<String, String> params) {
-    this.params = params;
+  public HashMap<String, String> getQuerys() {
+    return QUERYS;
   }
 
   /**

src/express/http/request/RequestUtils.java

@@ -3,7 +3,7 @@
 import com.sun.net.httpserver.Headers;
 import express.http.Cookie;
 
-import java.io.*;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;

src/express/http/response/Response.java

@@ -67,7 +67,6 @@ public Response setStatus(@NotNull Status status) {
   }
 
   /**
-   *
    * @return The current contentType
    */
   public MediaType getContentType() {

src/express/middleware/ExpressCookieSession.java

@@ -1,13 +1,13 @@
 package express.middleware;
 
-import express.utils.Utils;
 import express.events.HttpRequest;
 import express.expressfilter.ExpressFilter;
 import express.expressfilter.ExpressFilterTask;
-import express.http.request.Request;
-import express.http.response.Response;
 import express.http.Cookie;
 import express.http.SessionCookie;
+import express.http.request.Request;
+import express.http.response.Response;
+import express.utils.Utils;
 
 import java.util.concurrent.ConcurrentHashMap;
 

src/express/middleware/ExpressStatic.java

@@ -3,6 +3,7 @@
 import express.events.HttpRequest;
 import express.http.request.Request;
 import express.http.response.Response;
+import express.utils.Utils;
 
 import java.io.File;
 
@@ -33,7 +34,7 @@ public void handle(Request req, Response res) {
     if (reqFile.exists()) {
 
       if (EXTENSIONS != null) {
-        String reqEx = reqFile.getAbsolutePath().replaceAll("^(.*\\.|.*\\|.+$)", "");
+        String reqEx = Utils.getExtension(reqFile);
 
         for (String ex : EXTENSIONS) {
           if (reqEx.equals(ex)) {
@@ -47,7 +48,7 @@ public void handle(Request req, Response res) {
       } else {
         if (ONHANDLE != null)
           ONHANDLE.handle(req, res);
-        
+
         res.send(reqFile);
       }
     }

src/express/utils/MediaType.java

@@ -700,14 +700,6 @@ public enum MediaType {
     this.extension = extension;
   }
 
-  public String getMIME() {
-    return MIME;
-  }
-
-  public String getExtension() {
-    return extension;
-  }
-
   public static MediaType getForExtension(String extension) {
     switch (extension) {
       case "aw":
@@ -2083,4 +2075,12 @@ public static MediaType getForExtension(String extension) {
     }
     return null;
   }
+
+  public String getMIME() {
+    return MIME;
+  }
+
+  public String getExtension() {
+    return extension;
+  }
 }

src/express/utils/Utils.java

@@ -7,7 +7,6 @@
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.security.SecureRandom;
-import java.util.Arrays;
 
 public class Utils {
 
@@ -45,7 +44,7 @@ public static MediaType getContentType(File file) {
     MediaType contentType = MediaType.getForExtension(ex);
 
     if (contentType == null)
-     return MediaType._bin;
+      return MediaType._bin;
 
     return contentType;
   }
@@ -78,16 +77,8 @@ public static String getYourIp() throws UnknownHostException {
    * @return The extension.
    */
   public static String getExtension(@NotNull File file) {
-    char[] buffer = new char[255];
-    int bufferIndex = 0;
-
-    for (char c : file.getAbsolutePath().toCharArray()) {
-      if (c == '\\' || c == '.' || c == '/')
-        bufferIndex = 0;
-      else
-        buffer[bufferIndex++] = c;
-    }
-    return new String(Arrays.copyOf(buffer, bufferIndex));
+    String path = file.getAbsolutePath();
+    return path.substring(path.lastIndexOf('.'));
   }
 
 }