[톰캣 구현하기 - 1,2단계] 에단(김석호) 미션 제출합니다.

tomcat/src/main/java/org/apache/coyote/handler/FrontHandler.java

@@ -1,13 +1,14 @@
 package org.apache.coyote.handler;
 
 import org.apache.coyote.handler.mapping.HandlerMapping;
+import org.apache.coyote.handler.mapping.HomePageMapping;
 import org.apache.coyote.handler.mapping.LoginMapping;
 import org.apache.coyote.handler.mapping.LoginPageMapping;
 import org.apache.coyote.handler.mapping.RegisterMapping;
 import org.apache.coyote.handler.mapping.RegisterPageMapping;
 import org.apache.coyote.handler.mapping.StaticFileMapping;
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.HttpResponse;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -18,25 +19,21 @@ public class FrontHandler {
     private static final Set<HandlerMapping> handlerMapping = new HashSet<>();
 
     static {
+        handlerMapping.add(new HomePageMapping());
         handlerMapping.add(new StaticFileMapping());
         handlerMapping.add(new LoginMapping());
         handlerMapping.add(new LoginPageMapping());
         handlerMapping.add(new RegisterMapping());
         handlerMapping.add(new RegisterPageMapping());
     }
 
-    public String handle(final String firstLine, final HttpHeaders headers, final String requestBody) throws IOException {
-        String response = "";
-        final String[] parsedFirstLine = firstLine.split(" ");
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
         for (final HandlerMapping mapping : handlerMapping) {
-            final HttpMethod httpMethod = HttpMethod.from(parsedFirstLine[0]);
-            final String requestUri = parsedFirstLine[1];
-            if (mapping.supports(httpMethod, requestUri)) {
-                response = mapping.handle(parsedFirstLine[1], headers, requestBody);
-                break;
+            if (mapping.supports(httpRequest)) {
+                return mapping.handle(httpRequest);
             }
         }
 
-        return response;
+        return HttpResponse.redirect("/404.html");
     }
 }

tomcat/src/main/java/org/apache/coyote/handler/mapping/HandlerMapping.java

@@ -1,13 +1,13 @@
 package org.apache.coyote.handler.mapping;
 
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.HttpResponse;
 
 import java.io.IOException;
 
 public interface HandlerMapping {
 
-    boolean supports(final HttpMethod httpMethod, final String requestUri);
+    boolean supports(final HttpRequest httpRequest);
 
-    String handle(final String requestUri, final HttpHeaders httpHeaders, final String requestBody) throws IOException;
+    HttpResponse handle(final HttpRequest httpRequest) throws IOException;
 }

tomcat/src/main/java/org/apache/coyote/handler/mapping/HomePageMapping.java

@@ -0,0 +1,31 @@
+package org.apache.coyote.handler.mapping;
+
+import org.apache.coyote.http.common.HttpBody;
+import org.apache.coyote.http.common.HttpHeaders;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.ContentType;
+import org.apache.coyote.http.response.HttpResponse;
+import org.apache.coyote.http.response.StatusCode;
+import org.apache.coyote.http.response.StatusLine;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static org.apache.coyote.http.common.HttpHeader.CONTENT_TYPE;
+
+public class HomePageMapping implements HandlerMapping {
+
+    @Override
+    public boolean supports(final HttpRequest httpRequest) {
+        return httpRequest.isGetRequest() && "/".equals(httpRequest.getRequestUri().getRequestUri());
+    }
+
+    @Override
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
+        return HttpResponse.builder()
+                .statusLine(StatusLine.from(StatusCode.OK))
+                .httpHeaders(new HttpHeaders(Map.of(CONTENT_TYPE, ContentType.HTML.getValue())))
+                .body(new HttpBody("Hello world!"))
+                .build();
+    }
+}

tomcat/src/main/java/org/apache/coyote/handler/mapping/LoginFilter.java

@@ -1,8 +1,8 @@
 package org.apache.coyote.handler.mapping;
 
 import org.apache.coyote.http.LoginManager;
-import org.apache.coyote.http.Session;
-import org.apache.coyote.http.SessionManager;
+import org.apache.coyote.http.session.Session;
+import org.apache.coyote.http.session.SessionManager;
 
 import java.util.Map;
 

tomcat/src/main/java/org/apache/coyote/handler/mapping/LoginMapping.java

@@ -2,34 +2,33 @@
 
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.common.HttpBody;
+import org.apache.coyote.http.common.HttpHeader;
+import org.apache.coyote.http.common.HttpHeaders;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.HttpResponse;
+import org.apache.coyote.http.response.StatusCode;
+import org.apache.coyote.http.response.StatusLine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
+import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static org.apache.coyote.http.HttpMethod.POST;
 
 public class LoginMapping extends LoginFilter implements HandlerMapping {
 
+    public static final String TARGET_URI = "login";
     private static final Logger log = LoggerFactory.getLogger(LoginMapping.class);
 
     @Override
-    public boolean supports(final HttpMethod httpMethod, final String requestUri) {
-        return POST == httpMethod &&
-                requestUri.contains("login");
+    public boolean supports(final HttpRequest httpRequest) {
+        return httpRequest.isPostRequest() && httpRequest.containsRequestUri(TARGET_URI);
     }
 
     @Override
-    public String handle(final String requestUri, final HttpHeaders httpHeaders, final String requestBody) {
-        final Map<String, String> bodyParams = Arrays.stream(requestBody.split("&"))
-                .map(param -> param.split("="))
-                .collect(Collectors.toMap(param -> param[0], param -> param[1]));
-
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
+        final Map<String, String> bodyParams = httpRequest.getParsedBody();
         final String account = bodyParams.get("account");
         final String password = bodyParams.get("password");
 
@@ -44,17 +43,18 @@ public String handle(final String requestUri, final HttpHeaders httpHeaders, fin
             log.info("로그인 성공! user = {}", user);
         } catch (final IllegalArgumentException e) {
             log.warn("login error = {}", e);
-            return String.join("\r\n",
-                    "HTTP/1.1 302 Found ",
-                    "Location: /401.html ");
+            return HttpResponse.redirect("/401.html");
         }
 
         final UUID uuid = UUID.randomUUID();
         setSession(uuid.toString(), Map.of("account", user.getAccount()));
 
-        return String.join("\r\n",
-                "HTTP/1.1 302 Found ",
-                "Location: /index.html ",
-                "Set-Cookie: JSESSIONID=" + uuid + " ");
+        return HttpResponse.builder()
+                .statusLine(StatusLine.from(StatusCode.FOUND))
+                .httpHeaders(new HttpHeaders(
+                        Map.of(HttpHeader.LOCATION, "/index.html",
+                                HttpHeader.SET_COOKIE, "JSESSIONID=" + uuid)))
+                .body(HttpBody.empty())
+                .build();
     }
 }

tomcat/src/main/java/org/apache/coyote/handler/mapping/LoginPageMapping.java

@@ -2,46 +2,46 @@
 
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
-import org.apache.coyote.http.HttpCookie;
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.common.HttpBody;
+import org.apache.coyote.http.common.HttpHeaders;
+import org.apache.coyote.http.request.HttpCookie;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.ContentType;
+import org.apache.coyote.http.response.HttpResponse;
+import org.apache.coyote.http.response.StatusCode;
+import org.apache.coyote.http.response.StatusLine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.apache.coyote.http.HttpMethod.GET;
+import static org.apache.coyote.http.common.HttpHeader.CONTENT_TYPE;
+import static org.apache.coyote.http.common.HttpHeader.COOKIE;
 
 public class LoginPageMapping extends LoginFilter implements HandlerMapping {
 
+    public static final String TARGET_URI = "login";
     private static final Logger log = LoggerFactory.getLogger(LoginPageMapping.class);
 
     @Override
-    public boolean supports(final HttpMethod httpMethod, final String requestUri) {
-        return GET == httpMethod &&
-                requestUri.contains("login");
+    public boolean supports(final HttpRequest httpRequest) {
+        return httpRequest.isGetRequest() && httpRequest.containsRequestUri(TARGET_URI);
     }
 
     @Override
-    public String handle(final String requestUri, final HttpHeaders httpHeaders, final String requestBody) throws IOException {
-        if (httpHeaders.containsKey("Cookie")) {
-            final HttpCookie cookies = HttpCookie.from(httpHeaders.get("Cookie"));
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
+        if (httpRequest.containsHeader(COOKIE)) {
+            final HttpCookie cookies = HttpCookie.from(httpRequest.getHeader(COOKIE));
             if (isAlreadyLogined(cookies.get("JSESSIONID"))) {
-                return String.join("\r\n",
-                        "HTTP/1.1 302 Found ",
-                        "Location: /index.html ");
+                return HttpResponse.redirect("/index.html");
             }
         }
 
-        final String[] parsedRequestUri = requestUri.split("\\?");
-        if (requestUri.contains("?")) {
+        final String[] parsedRequestUri = httpRequest.getRequestUri().getRequestUri().split("\\?");
+        if (httpRequest.getRequestUri().getRequestUri().contains("?")) {
             final Map<String, String> queryStrings = Arrays.stream(parsedRequestUri[1].split("&"))
                     .map(param -> param.split("="))
                     .collect(Collectors.toMap(param -> param[0], param -> param[1]));
@@ -59,26 +59,17 @@ public String handle(final String requestUri, final HttpHeaders httpHeaders, fin
                 log.info("로그인 성공! user = {}", user);
             } catch (final IllegalArgumentException e) {
                 log.warn("login error = {}", e);
-                return String.join("\r\n",
-                        "HTTP/1.1 302 Found ",
-                        "Location: /401.html ");
+                return HttpResponse.redirect("/401.html");
             }
 
-            return String.join("\r\n",
-                    "HTTP/1.1 302 Found ",
-                    "Location: /index.html ");
+            return HttpResponse.redirect("/index.html");
         }
 
-        final String filePath = "static/login.html";
-        final URL fileUrl = getClass().getClassLoader().getResource(filePath);
-        final Path path = new File(fileUrl.getPath()).toPath();
-        final String responseBody = new String(Files.readAllBytes(path));
-
-        return String.join("\r\n",
-                "HTTP/1.1 200 OK ",
-                "Content-Type: text/html;charset=utf-8 ",
-                "Content-Length: " + responseBody.getBytes().length + " ",
-                "",
-                responseBody);
+        return HttpResponse.builder()
+                .statusLine(StatusLine.from(StatusCode.OK))
+                .httpHeaders(new HttpHeaders(Map.of(CONTENT_TYPE, ContentType.HTML.getValue())))
+                .body(HttpBody.file("static/login.html"))
+                .build();
     }
+
 }

tomcat/src/main/java/org/apache/coyote/handler/mapping/RegisterMapping.java

@@ -2,28 +2,24 @@
 
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.HttpResponse;
 
-import java.util.Arrays;
+import java.io.IOException;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-import static org.apache.coyote.http.HttpMethod.POST;
 
 public class RegisterMapping implements HandlerMapping {
 
+    public static final String TARGET_URI = "register";
+
     @Override
-    public boolean supports(final HttpMethod httpMethod, final String requestUri) {
-        return POST == httpMethod &&
-                requestUri.contains("register");
+    public boolean supports(final HttpRequest httpRequest) {
+        return httpRequest.isPostRequest() && httpRequest.containsRequestUri(TARGET_URI);
     }
 
     @Override
-    public String handle(final String requestUri, final HttpHeaders httpHeaders, final String requestBody) {
-        final Map<String, String> bodyParams = Arrays.stream(requestBody.split("&"))
-                .map(param -> param.split("="))
-                .collect(Collectors.toMap(param -> param[0], param -> param[1]));
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
+        final Map<String, String> bodyParams = httpRequest.getParsedBody();
 
         final String account = bodyParams.get("account");
         final String password = bodyParams.get("password");
@@ -32,8 +28,6 @@ public String handle(final String requestUri, final HttpHeaders httpHeaders, fin
         final User user = new User(account, password, email);
         InMemoryUserRepository.save(user);
 
-        return String.join("\r\n",
-                "HTTP/1.1 302 Found ",
-                "Location: /index.html ");
+        return HttpResponse.redirect("/index.html");
     }
 }

tomcat/src/main/java/org/apache/coyote/handler/mapping/RegisterPageMapping.java

@@ -1,34 +1,33 @@
 package org.apache.coyote.handler.mapping;
 
-import org.apache.coyote.http.HttpHeaders;
-import org.apache.coyote.http.HttpMethod;
+import org.apache.coyote.http.common.HttpBody;
+import org.apache.coyote.http.common.HttpHeaders;
+import org.apache.coyote.http.request.HttpRequest;
+import org.apache.coyote.http.response.ContentType;
+import org.apache.coyote.http.response.HttpResponse;
+import org.apache.coyote.http.response.StatusCode;
+import org.apache.coyote.http.response.StatusLine;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
+import java.util.Map;
+
+import static org.apache.coyote.http.common.HttpHeader.CONTENT_TYPE;
 
 public class RegisterPageMapping implements HandlerMapping {
 
+    public static final String TARGET_URI = "register";
+
     @Override
-    public boolean supports(final HttpMethod httpMethod, final String requestUri) {
-        return HttpMethod.GET == httpMethod &&
-                requestUri.contains("register");
+    public boolean supports(final HttpRequest httpRequest) {
+        return httpRequest.isGetRequest() && httpRequest.containsRequestUri(TARGET_URI);
     }
 
     @Override
-    public String handle(final String requestUri, final HttpHeaders httpHeaders, final String requestBody) throws IOException {
-        final String filePath = "static/register.html";
-        final URL fileUrl = getClass().getClassLoader().getResource(filePath);
-        final Path path = new File(fileUrl.getPath()).toPath();
-        final String responseBody = new String(Files.readAllBytes(path));
-
-        return String.join("\r\n",
-                "HTTP/1.1 200 OK ",
-                "Content-Type: text/html;charset=utf-8 ",
-                "Content-Length: " + responseBody.getBytes().length + " ",
-                "",
-                responseBody);
+    public HttpResponse handle(final HttpRequest httpRequest) throws IOException {
+        return HttpResponse.builder()
+                .statusLine(StatusLine.from(StatusCode.OK))
+                .httpHeaders(new HttpHeaders(Map.of(CONTENT_TYPE, ContentType.HTML.getValue())))
+                .body(HttpBody.file("static/register.html"))
+                .build();
     }
 }