Add query test case, extract static methods

Author: simonwep

src/express/Express.java

@@ -8,7 +8,6 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
 
 public class Express {
 

src/express/ExpressContextThread.java

@@ -23,8 +23,8 @@ public ExpressContextThread(HttpExchange httpExchange, Express express) {
     this.REQUEST = new Request(httpExchange);
     this.RESPONSE = new Response(httpExchange);
 
-    this.requestPath = REQUEST.getRequestURI().getRawPath();
-    this.requestMethod = REQUEST.getRequestMethod();
+    this.requestPath = REQUEST.getURI().getRawPath();
+    this.requestMethod = REQUEST.getMethod();
   }
 
   @Override

src/express/ExpressUtils.java

@@ -0,0 +1,54 @@
+package express;
+
+import com.sun.net.httpserver.Headers;
+import express.cookie.Cookie;
+
+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;
+
+public class ExpressUtils {
+
+  public 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;
+  }
+
+  public static HashMap<String, String> parseRawQuery(URI uri) {
+    HashMap<String, String> querys = new HashMap<>();
+    String rawQuery = uri.getRawQuery();
+
+    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/http/Request.java

@@ -2,28 +2,47 @@
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
+import express.ExpressUtils;
 import express.cookie.Cookie;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 
-public class Request {
+public class Request{
 
   private final HttpExchange HTTP_EXCHANGE;
+  private final URI URI;
   private final InputStream BODY;
   private final Headers HEADER;
 
   private final HashMap<String, Cookie> COOKIES;
-
+  private final HashMap<String, String> QUERYS;
   private HashMap<String, String> params;
 
   public Request(HttpExchange exchange) {
     this.HTTP_EXCHANGE = exchange;
+    this.URI = exchange.getRequestURI();
     this.HEADER = exchange.getRequestHeaders();
     this.BODY = exchange.getRequestBody();
-    this.COOKIES = parseCookies(exchange.getRequestHeaders());
+
+    this.QUERYS = ExpressUtils.parseRawQuery(exchange.getRequestURI());
+    this.COOKIES = ExpressUtils.parseCookies(exchange.getRequestHeaders());
+  }
+
+  public InputStream getBody() {
+    return BODY;
+  }
+
+  public void pipe(OutputStream os, int bufferSize) throws IOException {
+    byte[] buffer = new byte[bufferSize];
+    int n;
+    while ((n = BODY.read(buffer)) != -1)
+      os.write(buffer, 0, n);
+    os.close();
   }
 
   public Cookie getCookie(String name) {
@@ -43,21 +62,25 @@ public String getHost() {
   }
 
   public String getContentType() {
-    return HEADER.get("Accept").get(0);
+    return HEADER.get("Content-Type").get(0);
   }
 
-  public URI getRequestURI() {
-    return HTTP_EXCHANGE.getRequestURI();
+  public URI getURI() {
+    return this.URI;
   }
 
-  public String getRequestMethod() {
+  public String getMethod() {
     return HTTP_EXCHANGE.getRequestMethod();
   }
 
   public String getParam(String key) {
     return params.get(key);
   }
 
+  public String getQuery(String key) {
+    return QUERYS.get(key);
+  }
+
   public void setParams(HashMap<String, String> params) {
     this.params = params;
   }
@@ -66,25 +89,4 @@ public List<String> getHeader(String header) {
     return HEADER.get(header);
   }
 
-  private 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;
-  }
-
 }

src/test/Get.java

@@ -11,23 +11,36 @@ public class Get {
   public static void main(String[] args) throws IOException {
     Express express = new Express();
 
+    // Test case for url
     express.get("/", (req, res) -> res.send("Called /"));
 
+    // Test case for url
     express.get("/user", (req, res) -> res.send("Called /user"));
 
+    // Test case for url
     express.get("/user/bob", (req, res) -> res.send("Called /user/bob"));
 
+    // Test case for url querying
+    express.get("/getposts", (req, res) -> {
+      String age = req.getQuery("age");
+      String from = req.getQuery("from");
+      res.send("Age: " + age + "\nFrom: " + from);
+    });
+
+    // Test case for param placeholder
     express.get("/hello/:username", (req, res) -> {
       String username = req.getParam("username");
       res.send("User " + username + " sad hello!");
     });
 
+    // Test case for multiple param placeholder
     express.get("/hello/:username/:count", (req, res) -> {
       String username = req.getParam("username");
       String count = req.getParam("count");
       res.send("User " + username + " want to say " + count + " times hello!");
     });
 
+    // Test case for cookie setting & multiple param placeholder
     express.get("/cookie/:name/:val", (req, res) -> {
       String name = req.getParam("name");
       String val = req.getParam("val");
@@ -36,6 +49,7 @@ public static void main(String[] args) throws IOException {
       res.send("ok");
     });
 
+    // Test case for cookie reading
     express.get("/showcookies", (req, res) -> {
       HashMap<String, Cookie> cookies = req.getCookies();
       StringBuffer buffer = new StringBuffer();