Sort project

Author: simonwep

src/express/Express.java

@@ -8,7 +8,6 @@
 import express.http.Request;
 import express.http.Response;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -18,7 +17,7 @@
 /**
  * @author Simon Reinisch
  * @implNote Core modul, don't change anything.
- *
+ * <p>
  * An NodeJS like clone written in Java, see README for more information.
  */
 public class Express {
@@ -234,26 +233,4 @@ public void listen(Action onStart, int port) throws IOException {
       }
     }).start();
   }
-
-  /**
-   * This method 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 path The root directory
-   * @return An HttpRequest interface with the service.
-   */
-  public static HttpRequest statics(String path) {
-    return (req, res) -> {
-      File reqFile = new File(path + req.getURI().getPath());
-
-      if (reqFile.exists()) {
-        String extension = reqFile.getAbsolutePath().replaceAll("^(.*\\.|.*\\\\|.+$)", "");
-        String contentType = ExpressUtils.getContentType(extension);
-        res.send(reqFile, contentType);
-      }
-    };
-  }
 }

src/express/ExpressFilter.java

@@ -14,7 +14,7 @@
 /**
  * @author Simon Reinisch
  * @implNote Core modul of express, don't change anything.
- *
+ * <p>
  * Filter to handle request handling & parsing.
  */
 public class ExpressFilter extends Filter {

src/express/ExpressUtils.java

@@ -1,7 +1,7 @@
 package express;
 
 import com.sun.net.httpserver.Headers;
-import express.cookie.Cookie;
+import express.http.cookie.Cookie;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;

src/express/MIMETypes.java

@@ -4,18 +4,14 @@
 
 /**
  * @author Simon Reinisch
- *
+ * <p>
  * Full list of mime-types to handle static served files.
  * List-link: https://www.freeformatter.com/mime-types-list.html
  */
 public class MIMETypes {
 
   private final static HashMap<String, String> MIME = new HashMap<>();
 
-  public static HashMap<String, String> get() {
-    return MIME;
-  }
-
   static {
     MIME.put("aw", "application/applixware");
     MIME.put("atom", "application/atom+xml ");
@@ -709,4 +705,8 @@ public static HashMap<String, String> get() {
     MIME.put("yaml", "text/yaml");
     MIME.put("dmg", "application/x-apple-diskimage");
   }
+
+  public static HashMap<String, String> get() {
+    return MIME;
+  }
 }

src/express/http/Request.java

@@ -3,7 +3,7 @@
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 import express.ExpressUtils;
-import express.cookie.Cookie;
+import express.http.cookie.Cookie;
 
 import java.io.IOException;
 import java.io.InputStream;

src/express/http/Response.java

@@ -2,7 +2,8 @@
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
-import express.cookie.Cookie;
+import express.http.cookie.Cookie;
+import express.middleware.FormInfo;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,6 +20,8 @@ public class Response {
   private final OutputStream BODY;
   private final Headers HEADER;
 
+  private FormInfo formInfo;
+
   private String contentType = "text/plain";
   private boolean isClose = false;
   private long contentLength = 0;
@@ -30,6 +33,20 @@ public Response(HttpExchange exchange) {
     this.BODY = exchange.getResponseBody();
   }
 
+  /**
+   * If the request was an multipart-formdata request, you can
+   * receive over the FormInfo object serveral informations.
+   *
+   * @return
+   */
+  public FormInfo getFormInfo() {
+    return formInfo;
+  }
+
+  public void setFormInfo(FormInfo formInfo) {
+    this.formInfo = formInfo;
+  }
+
   /**
    * Set an cookie.
    *
@@ -42,6 +59,13 @@ public Response setCookie(Cookie cookie) {
     return this;
   }
 
+  /**
+   * @return Current response status.
+   */
+  public int getStatus() {
+    return this.status;
+  }
+
   /**
    * Set the response-status.
    * Default is 200 (ok).
@@ -55,13 +79,6 @@ public Response setStatus(int status) {
     return this;
   }
 
-  /**
-   * @return Current response status.
-   */
-  public int getStatus() {
-    return this.status;
-  }
-
   /**
    * Send an empty response (Content-Length = 0)
    */

src/express/cookie/Cookie.java renamed to src/express/http/cookie/Cookie.java

@@ -1,4 +1,4 @@
-package express.cookie;
+package express.http.cookie;
 
 
 import java.time.Instant;

src/express/cookie/SameSite.java renamed to src/express/http/cookie/SameSite.java

@@ -1,8 +1,8 @@
-package express.cookie;
+package express.http.cookie;
 
 /**
  * @author Simon Reinisch
  */
 public enum SameSite {
-   STRICT, LAX
+  STRICT, LAX
 }

src/express/middleware/Static.java

@@ -0,0 +1,42 @@
+package express.middleware;
+
+import express.ExpressUtils;
+import express.events.HttpRequest;
+import express.http.Request;
+import express.http.Response;
+
+import java.io.File;
+
+/**
+ * @author Simon Reinisch
+ * <p>
+ * An Express-Middleware to serve static files.
+ */
+public class Static 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) {
+    this.PATH = directoryPath;
+  }
+
+  @Override
+  public void handle(Request req, Response res) {
+    File reqFile = new File(PATH + req.getURI().getPath());
+
+    if (reqFile.exists()) {
+      String extension = reqFile.getAbsolutePath().replaceAll("^(.*\\.|.*\\\\|.+$)", "");
+      String contentType = ExpressUtils.getContentType(extension);
+      res.send(reqFile, contentType);
+    }
+  }
+}

src/test/Get.java

@@ -1,7 +1,7 @@
 package test;
 
 import express.Express;
-import express.cookie.Cookie;
+import express.http.cookie.Cookie;
 
 import java.io.IOException;
 import java.util.HashMap;