Store query parameters separately from path

Author: Ericthilen

src/main/java/org/example/httpparser/HttpRequest.java

@@ -2,48 +2,82 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /*
-*
-*This class groups together all information about a request that the server needs
+ *
+ * This class groups together all information about a request that the server needs
  */
 
 public class HttpRequest {
 
-        private final String method;
-        private final String path;
-        private final String version;
-        private final Map<String, String> headers;
-        private final String body;
-        private final Map<String, Object> attributes = new HashMap<>();
-
-        public HttpRequest(String method,
-                           String path,
-                           String version,
-                           Map<String, String> headers,
-                           String body) {
-            this.method = method;
-            this.path = path;
-            this.version = version;
-            this.headers = headers != null ? Map.copyOf(headers) : Collections.emptyMap();
-            this.body = body;
-        }
-
-        public String getMethod() {
-            return method; }
-        public String getPath() {
-            return path; }
-        public String getVersion() {
-            return version; }
-        public Map<String, String> getHeaders() {
-            return headers; }
-        public String getBody() {
-            return body; }
-        public void setAttribute(String key, Object value) {
-            attributes.put(key, value);
-        }
-        public Object getAttribute(String key) {
-            return attributes.get(key);
-        }
+    private final String method;
+    private final String path;
+    private final String version;
+    private final Map<String, String> headers;
+    private final String body;
+
+    private final Map<String, List<String>> queryParams;
+
+    private final Map<String, Object> attributes = new HashMap<>();
+
+    public HttpRequest(String method,
+                       String path,
+                       String version,
+                       Map<String, String> headers,
+                       String body) {
+        this(method, path, version, headers, body, Collections.emptyMap());
+    }
+
+    public HttpRequest(String method,
+                       String path,
+                       String version,
+                       Map<String, String> headers,
+                       String body,
+                       Map<String, List<String>> queryParams) {
+
+        this.method = method;
+        this.path = path;
+        this.version = version;
+        this.headers = headers != null ? Map.copyOf(headers) : Collections.emptyMap();
+        this.body = body;
+        this.queryParams = queryParams != null ? Map.copyOf(queryParams) : Collections.emptyMap();
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public Map<String, List<String>> getQueryParams() {
+        return queryParams;
+    }
+
+    public List<String> getQueryParam(String key) {
+        return queryParams.getOrDefault(key, List.of());
+    }
+
+    public void setAttribute(String key, Object value) {
+        attributes.put(key, value);
+    }
+
+    public Object getAttribute(String key) {
+        return attributes.get(key);
     }
+}