Refactor existing middleware

Author: simonwep

README.md

@@ -1,6 +1,7 @@
 
 
 
+
 ![Java Express Logo](https://image.ibb.co/mCdxtm/java_express.png)
 
 Small clone of the node-js express framework written in pure Java 8.
@@ -217,21 +218,21 @@ No we can, as we learned above, include it with:
 app.use(new PortMiddleware());
 ```
 ## Existing Middlewares
-There are already some basic middlewares included:
+There are already some basic middlewares included, you can access these via static methods provided from `Express`.
 
 #### Static File serving
 If you want to allocate some files, like js-librarys or css files you can use the [static](https://github.com/Simonwep/java-express/blob/master/src/express/middleware/Static.java) middleware. But you can also provide other files like mp4 etc.
 Example:
 ```java
- app.use(new Static("examplepath\\test_statics"));
+ app.use(Express.statics("examplepath\\test_statics"));
 ```
 Now you can access every files in the `test_statics` over the root adress `\`.
 #### Cookie Session
 Java Express also includes an simple cookie-session middleware:
 ```java
 // You should use an meaningless cookie name for serveral security reasons, here f3v4.
 // Also you can specify the maximum age of the cookie from the creation date, here 3000. 
-app.use(new CookieSession("f3v4", 9000));
+app.use(Express.cookieSession("f3v4", 9000));
 ```
 To use a session cookie we need to get the data from the middleware which is actually an `SessionCookie`:
 ```java

src/examples/Examples.java

@@ -2,8 +2,7 @@
 
 import express.Express;
 import express.http.cookie.Cookie;
-import express.middleware.CookieSession;
-import express.middleware.SessionCookie;
+import express.http.cookie.SessionCookie;
 
 import java.io.IOException;
 
@@ -78,7 +77,7 @@ public static void main(String[] args) throws IOException {
       // req.pipe(new OutputStream() {...});  // Pipe the body to an outputstream
     });
 
-    app.use(new CookieSession("f3v4", 9000));
+    app.use(Express.cookieSession("f3v4", 9000));
 
     app.get("/session", (req, res) -> {
 

src/express/Express.java

@@ -9,6 +9,7 @@
 import express.expressfilter.ExpressFilterWorker;
 import express.http.Request;
 import express.http.Response;
+import express.middleware.ExpressMiddleware;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -20,7 +21,7 @@
  * <p>
  * An NodeJS like clone written in Java.
  */
-public class Express {
+public class Express extends ExpressMiddleware {
 
   private final ArrayList<ExpressFilterWorker> WORKER = new ArrayList<>();
   private final ExpressFilterChain MIDDLEWARE_CHAIN = new ExpressFilterChain();

src/express/http/Request.java

@@ -64,7 +64,7 @@ public Request(HttpExchange exchange) {
     this.AUTH = HEADERS.get("Authorization") == null ? null : new Authorization(HEADERS.get("Authorization").get(0));
 
     // Check if the request contains x-www-form-urlencoded form data
-    this.FORM_QUERYS = CONTENT_TYPE.equals("application/x-www-form-urlencoded")
+    this.FORM_QUERYS = CONTENT_TYPE.startsWith("application/x-www-form-urlencoded")
         ? RequestUtils.parseRawQuery(ExpressUtils.streamToString(BODY))
         : new HashMap<>();
 

src/express/middleware/SessionCookie.java renamed to src/express/http/cookie/SessionCookie.java

@@ -1,4 +1,4 @@
-package express.middleware;
+package express.http.cookie;
 
 /**
  * @author Simon Reinisch

src/express/middleware/CookieSession.java renamed to src/express/middleware/ExpressCookieSession.java

@@ -7,25 +7,19 @@
 import express.http.Request;
 import express.http.Response;
 import express.http.cookie.Cookie;
+import express.http.cookie.SessionCookie;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-public class CookieSession implements HttpRequest, ExpressFilter, ExpressFilterTask {
+final class ExpressCookieSession implements HttpRequest, ExpressFilter, ExpressFilterTask {
 
   private final static String MIDDLEWARE_NAME = "SessionCookie";
 
   private final ConcurrentHashMap<String, SessionCookie> COOKIES = new ConcurrentHashMap<>();
   private final String COOKIE_NAME;
   private final long MAX_AGE;
 
-  /**
-   * Create an new cookie-session middleware.
-   * You can access and edit to session-cookie data via request.getMiddlewareContent('SessionCookie').
-   *
-   * @param cookieName An name for the session-cookie, it's recommed to use NOT SID for security reasons
-   * @param maxAge     An maxage for the cookie
-   */
-  public CookieSession(String cookieName, long maxAge) {
+  ExpressCookieSession(String cookieName, long maxAge) {
     this.COOKIE_NAME = cookieName;
     this.MAX_AGE = maxAge;
   }
@@ -62,12 +56,12 @@ public void onStart() {
 
   @Override
   public void onStop() {
-    // Nothing to do
+    COOKIES.clear();
   }
 
   @Override
   public long getDelay() {
-    return 15000; // 1min
+    return 60000;
   }
 
   @Override

src/express/middleware/ExpressMiddleware.java

@@ -0,0 +1,33 @@
+package express.middleware;
+
+/**
+ * @author Simon Reinisch
+ * <p>
+ * Class which serves middleware
+ */
+public abstract class ExpressMiddleware{
+
+  /**
+   * Create an new cookie-session middleware.
+   * You can access and edit to session-cookie data via request.getMiddlewareContent('SessionCookie').
+   *
+   * @param cookieName An name for the session-cookie, it's recommed to use NOT SID for security reasons
+   * @param maxAge     An maxage for the cookie
+   */
+  public static ExpressCookieSession cookieSession(String cookieName, long maxAge) {
+    return new ExpressCookieSession(cookieName, maxAge);
+  }
+
+  /**
+   * This class serves an entire folder which can contains static file for your
+   * web application, it automatically detect the content type and will send it to
+   * the Client.
+   * <p>
+   * To use it simply put it in the <code>app.use()</code> method!
+   *
+   * @param directoryPath The root directory
+   */
+  public static ExpressStatic statics(String directoryPath) {
+    return new ExpressStatic(directoryPath);
+  }
+}

src/express/middleware/Static.java renamed to src/express/middleware/ExpressStatic.java

@@ -1,10 +1,8 @@
 package express.middleware;
 
-import express.ExpressUtils;
 import express.events.HttpRequest;
 import express.http.Request;
 import express.http.Response;
-import express.utils.MIMETypes;
 
 import java.io.File;
 
@@ -13,20 +11,11 @@
  * <p>
  * An Express-Middleware to serve static files.
  */
-public class Static implements HttpRequest {
+final class ExpressStatic implements HttpRequest {
 
   private final String PATH;
 
-  /**
-   * This class serves an entire folder which can contains static file for your
-   * web application, it automatically detect the content type and will send it to
-   * the Client.
-   * <p>
-   * To use it simply put it in the <code>app.use()</code> method!
-   *
-   * @param directoryPath The root directory
-   */
-  public Static(String directoryPath) {
+  ExpressStatic(String directoryPath) {
     this.PATH = directoryPath;
   }