[4단계 - Tomcat 구현하기] 커비(이현지) 미션 제출합니다.

study/src/main/resources/application.yml

@@ -4,7 +4,7 @@ handlebars:
 server:
   tomcat:
     accept-count: 1
-    max-connections: 1
+    max-connections: 2
     threads:
       min-spare: 2
       max: 2

study/src/test/java/thread/stage0/SynchronizationTest.java

@@ -8,21 +8,17 @@
 import org.junit.jupiter.api.Test;
 
 /**
- * 다중 스레드 환경에서 두 개 이상의 스레드가 변경 가능한(mutable) 공유 데이터를 동시에 업데이트하면 경쟁 조건(race condition)이 발생한다.
- * 자바는 공유 데이터에 대한 스레드 접근을 동기화(synchronization)하여 경쟁 조건을 방지한다.
- * 동기화된 블록은 하나의 스레드만 접근하여 실행할 수 있다.
- *
- * Synchronization
- * https://docs.oracle.com/javase/tutorial/essential/concurrency/sync.html
+ * 다중 스레드 환경에서 두 개 이상의 스레드가 변경 가능한(mutable) 공유 데이터를 동시에 업데이트하면 경쟁 조건(race condition)이 발생한다. 자바는 공유 데이터에 대한 스레드 접근을
+ * 동기화(synchronization)하여 경쟁 조건을 방지한다. 동기화된 블록은 하나의 스레드만 접근하여 실행할 수 있다.
+ * <p>
+ * Synchronization https://docs.oracle.com/javase/tutorial/essential/concurrency/sync.html
  */
 class SynchronizationTest {
 
     /**
-     * 테스트가 성공하도록 SynchronizedMethods 클래스에 동기화를 적용해보자.
-     * synchronized 키워드에 대하여 찾아보고 적용하면 된다.
-     *
-     * Guide to the Synchronized Keyword in Java
-     * https://www.baeldung.com/java-synchronized
+     * 테스트가 성공하도록 SynchronizedMethods 클래스에 동기화를 적용해보자. synchronized 키워드에 대하여 찾아보고 적용하면 된다.
+     * <p>
+     * Guide to the Synchronized Keyword in Java https://www.baeldung.com/java-synchronized
      */
     @Test
     void testSynchronized() throws InterruptedException {

study/src/test/java/thread/stage0/ThreadPoolsTest.java

@@ -9,14 +9,11 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * 스레드 풀은 무엇이고 어떻게 동작할까?
- * 테스트를 통과시키고 왜 해당 결과가 나왔는지 생각해보자.
- *
- * Thread Pools
- * https://docs.oracle.com/javase/tutorial/essential/concurrency/pools.html
- *
- * Introduction to Thread Pools in Java
- * https://www.baeldung.com/thread-pool-java-and-guava
+ * 스레드 풀은 무엇이고 어떻게 동작할까? 테스트를 통과시키고 왜 해당 결과가 나왔는지 생각해보자.
+ * <p>
+ * Thread Pools https://docs.oracle.com/javase/tutorial/essential/concurrency/pools.html
+ * <p>
+ * Introduction to Thread Pools in Java https://www.baeldung.com/thread-pool-java-and-guava
  */
 class ThreadPoolsTest {
 

tomcat/src/main/java/com/techcourse/Application.java

@@ -1,6 +1,6 @@
 package com.techcourse;
 
-import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.startup.Tomcat;
 
 public class Application {
 

tomcat/src/main/java/com/techcourse/db/InMemoryUserRepository.java

@@ -10,10 +10,7 @@ public class InMemoryUserRepository {
 
     private static final Map<String, User> database = new ConcurrentHashMap<>();
 
-    static {
-        final User user = new User(1L, "gugu", "password", "hkkang@woowahan.com");
-        database.put(user.getAccount(), user);
-    }
+    private InMemoryUserRepository() {}
 
     public static void save(User user) {
         database.put(user.getAccount(), user);
@@ -23,5 +20,7 @@ public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
 
-    private InMemoryUserRepository() {}
+    public static void reset() {
+        database.clear();
+    }
 }

tomcat/src/main/java/org/apache/catalina/ServletContainer.java

@@ -0,0 +1,20 @@
+package org.apache.catalina;
+
+import org.apache.catalina.controller.Controller;
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
+import org.apache.coyote.processor.ControllerMapper;
+
+public class ServletContainer {
+
+    private final ControllerMapper controllerMapper;
+
+    public ServletContainer(ControllerMapper controllerMapper) {
+        this.controllerMapper = controllerMapper;
+    }
+
+    public void run(HttpRequest httpRequest, HttpResponse httpResponse) {
+        Controller controller = controllerMapper.getController(httpRequest.getPath());
+        controller.service(httpRequest, httpResponse);
+    }
+}

tomcat/src/main/java/org/apache/catalina/controller/AbstractController.java

@@ -0,0 +1,37 @@
+package org.apache.catalina.controller;
+
+import org.apache.catalina.http.HeaderName;
+import org.apache.catalina.http.HttpMethod;
+import org.apache.catalina.http.StatusCode;
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public void service(HttpRequest request, HttpResponse response) {
+        try {
+            if (request.isMethod(HttpMethod.GET)) {
+                doGet(request, response);
+                return;
+            }
+            if (request.isMethod(HttpMethod.POST)) {
+                doPost(request, response);
+                return;
+            }
+            throw new IllegalArgumentException("HttpMethod not found");
+        } catch (IllegalArgumentException e) {
+            response.setStatusCode(StatusCode.FOUND);
+            response.addHeader(HeaderName.LOCATION, "/500.html");
+        }
+    }
+
+    protected void doPost(HttpRequest request, HttpResponse response) {
+        throw new IllegalArgumentException("HttpMethod unsupported");
+    }
+
+    protected void doGet(HttpRequest request, HttpResponse response) {
+        throw new IllegalArgumentException("HttpMethod unsupported");
+    }
+}
+

tomcat/src/main/java/org/apache/catalina/controller/Controller.java

@@ -0,0 +1,9 @@
+package org.apache.catalina.controller;
+
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
+
+public interface Controller {
+
+    void service(HttpRequest request, HttpResponse response);
+}

tomcat/src/main/java/org/apache/coyote/controller/HomeController.java → tomcat/src/main/java/org/apache/catalina/controller/HomeController.java

@@ -1,8 +1,8 @@
-package org.apache.coyote.controller;
+package org.apache.catalina.controller;
 
-import org.apache.coyote.http.StatusCode;
-import org.apache.coyote.request.HttpRequest;
-import org.apache.coyote.response.HttpResponse;
+import org.apache.catalina.http.StatusCode;
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
 
 public class HomeController extends AbstractController {
 

tomcat/src/main/java/org/apache/catalina/controller/LoginController.java

@@ -0,0 +1,61 @@
+package org.apache.catalina.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import java.util.Optional;
+import org.apache.catalina.http.HeaderName;
+import org.apache.catalina.http.StatusCode;
+import org.apache.catalina.manager.SessionManager;
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
+
+public class LoginController extends AbstractController {
+
+    private final SessionManager sessionManager;
+
+    public LoginController() {
+        this.sessionManager = SessionManager.getInstance();
+    }
+
+    @Override
+    protected void doPost(HttpRequest request, HttpResponse response) {
+        String account = request.getBodyParam("account");
+        String password = request.getBodyParam("password");
+        Optional<User> user = InMemoryUserRepository.findByAccount(account);
+        if (!isMember(user, password)) {
+            response.setStatusCode(StatusCode.FOUND);
+            response.addHeader(HeaderName.LOCATION, "/401.html");
+
+        }
+        if (isMember(user, password)) {
+            response.setStatusCode(StatusCode.FOUND);
+            response.addHeader(HeaderName.LOCATION, "/index.html");
+            login(response, user.get());
+        }
+    }
+
+    private boolean isMember(Optional<User> user, String password) {
+        return user.isPresent() && user.get().checkPassword(password);
+    }
+
+    private void login(HttpResponse response, User user) {
+        String sessionId = sessionManager.generateSession(user);
+        response.addSession(sessionId);
+    }
+
+    @Override
+    protected void doGet(HttpRequest request, HttpResponse response) {
+        if (hasLogined(request)) {
+            response.setStatusCode(StatusCode.FOUND);
+            response.addHeader(HeaderName.LOCATION, "/index.html");
+        }
+        if (!hasLogined(request)) {
+            response.setStatusCode(StatusCode.OK);
+            response.setBody("/login.html");
+        }
+    }
+
+    private boolean hasLogined(HttpRequest request) {
+        return request.hasSession() && sessionManager.isSessionExist(request.getSessionId());
+    }
+}

tomcat/src/main/java/org/apache/coyote/controller/RegisterController.java → tomcat/src/main/java/org/apache/catalina/controller/RegisterController.java

@@ -1,21 +1,19 @@
-package org.apache.coyote.controller;
+package org.apache.catalina.controller;
 
 import com.techcourse.db.InMemoryUserRepository;
 import com.techcourse.model.User;
-import org.apache.coyote.http.HeaderName;
-import org.apache.coyote.http.StatusCode;
-import org.apache.coyote.request.HttpRequest;
-import org.apache.coyote.request.RequestBody;
-import org.apache.coyote.response.HttpResponse;
+import org.apache.catalina.http.HeaderName;
+import org.apache.catalina.http.StatusCode;
+import org.apache.catalina.request.HttpRequest;
+import org.apache.catalina.response.HttpResponse;
 
 public class RegisterController extends AbstractController {
 
     @Override
     protected void doPost(HttpRequest request, HttpResponse response) {
-        RequestBody requestBody = request.getBody();
-        String account = requestBody.get("account");
-        String password = requestBody.get("password");
-        String email = requestBody.get("email");
+        String account = request.getBodyParam("account");
+        String password = request.getBodyParam("password");
+        String email = request.getBodyParam("email");
         InMemoryUserRepository.save(new User(account, password, email));
 
         response.setStatusCode(StatusCode.FOUND);

tomcat/src/main/java/org/apache/coyote/coockie/HttpCookie.java → tomcat/src/main/java/org/apache/catalina/coockie/HttpCookie.java

@@ -1,11 +1,18 @@
-package org.apache.coyote.coockie;
+package org.apache.catalina.coockie;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 public class HttpCookie {
 
+    public static final String COOKIE_DELIMITER = "; ";
+    public static final String COOKIE_VALUE_DELIMITER = "=";
+    public static final int KEY_INDEX = 0;
+    public static final int VALUE_INDEX = 1;
+    public static final int KEY_VALUE_COUNT = 2;
     private static final String JSESSIONID_VALUE = "JSESSIONID";
 
     private final Map<String, String> cookies;
@@ -19,18 +26,14 @@ public HttpCookie(String rawCookies) {
     }
 
     private static Map<String, String> mapCookies(String rawCookies) {
-        Map<String, String> cookieGroup = new HashMap<>();
-
-        if (rawCookies != null && !rawCookies.isBlank()) {
-            String[] cookiesElements = rawCookies.split("; ");
-            for (int i = 0; i < cookiesElements.length; i++) {
-                String[] cookiePair = cookiesElements[i].split("=");
-                if (cookiePair.length > 1) {
-                    cookieGroup.put(cookiePair[0], cookiePair[1]);
-                }
-            }
+        if (rawCookies == null || rawCookies.isBlank()) {
+            return Map.of();
         }
-        return cookieGroup;
+
+        return Arrays.stream(rawCookies.split(COOKIE_DELIMITER))
+                .map(cookie -> cookie.split(COOKIE_VALUE_DELIMITER))
+                .filter(cookiePair -> cookiePair.length == KEY_VALUE_COUNT)
+                .collect(Collectors.toMap(cookiePair -> cookiePair[KEY_INDEX], cookiePair -> cookiePair[VALUE_INDEX]));
     }
 
     public boolean hasSessionId() {
@@ -41,6 +44,10 @@ public String getSessionId() {
         return cookies.get(JSESSIONID_VALUE);
     }
 
+    public boolean hasCookie() {
+        return !cookies.isEmpty();
+    }
+
     public String getResponse() {
         if (cookies.isEmpty()) {
             return "";
@@ -49,7 +56,7 @@ public String getResponse() {
         StringBuilder response = new StringBuilder();
         for (Entry<String, String> stringStringEntry : cookies.entrySet()) {
             response.append(stringStringEntry.getKey())
-                    .append("=")
+                    .append(COOKIE_VALUE_DELIMITER)
                     .append(stringStringEntry.getValue())
                     .append(";");
         }

tomcat/src/main/java/com/techcourse/exception/UncheckedServletException.java → tomcat/src/main/java/org/apache/catalina/exception/UncheckedServletException.java

@@ -1,8 +1,8 @@
-package com.techcourse.exception;
+package org.apache.catalina.exception;
 
 public class UncheckedServletException extends RuntimeException {
 
     public UncheckedServletException(Exception e) {
-        super(e);
+        super("UncheckedServletException occured", e);
     }
 }

tomcat/src/main/java/org/apache/catalina/http/HeaderName.java

@@ -0,0 +1,21 @@
+package org.apache.catalina.http;
+
+public enum HeaderName {
+    CONTENT_LENGTH("Content-Length"),
+    COOKIE("Cookie"),
+    CONTENT_TYPE("Content-Type"),
+    LOCATION("Location"),
+    SET_COOKIE("Set-Cookie"),
+
+    ;
+
+    private final String value;
+
+    HeaderName(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http/HttpMethod.java → tomcat/src/main/java/org/apache/catalina/http/HttpMethod.java

@@ -1,4 +1,4 @@
-package org.apache.coyote.http;
+package org.apache.catalina.http;
 
 public enum HttpMethod {
     GET,

tomcat/src/main/java/org/apache/coyote/http11/ProtocolVersion.java → tomcat/src/main/java/org/apache/catalina/http/ProtocolVersion.java

@@ -1,4 +1,4 @@
-package org.apache.coyote.http11;
+package org.apache.catalina.http;
 
 public enum ProtocolVersion {
     HTTP1_1("HTTP/1.1"),

tomcat/src/main/java/org/apache/coyote/http/StatusCode.java → tomcat/src/main/java/org/apache/catalina/http/StatusCode.java

@@ -1,4 +1,4 @@
-package org.apache.coyote.http;
+package org.apache.catalina.http;
 
 public enum StatusCode {
     OK(200, "OK"),

tomcat/src/main/java/org/apache/coyote/manager/Manager.java → tomcat/src/main/java/org/apache/catalina/manager/Manager.java

@@ -1,7 +1,7 @@
-package org.apache.coyote.manager;
+package org.apache.catalina.manager;
 
 import java.io.IOException;
-import org.apache.coyote.session.Session;
+import org.apache.catalina.session.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a