[톰캣 구현하기 - 3, 4단계] 포이(김보준) 미션 제출합니다.

study/src/main/resources/application.yml

@@ -3,7 +3,7 @@ handlebars:
 
 server:
   tomcat:
-    accept-count: 1
-    max-connections: 1
+    accept-count: 0
+    max-connections: 2
     threads:
       max: 2

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

@@ -41,7 +41,7 @@ private static final class SynchronizedMethods {
 
         private int sum = 0;
 
-        public void calculate() {
+        public synchronized void calculate() {
             setSum(getSum() + 1);
         }
 

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

@@ -31,8 +31,8 @@ void testNewFixedThreadPool() {
         executor.submit(logWithSleep("hello fixed thread pools"));
 
         // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
-        final int expectedQueueSize = 0;
+        final int expectedPoolSize = 2;
+        final int expectedQueueSize = 1;
 
         assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
         assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
@@ -46,7 +46,7 @@ void testNewCachedThreadPool() {
         executor.submit(logWithSleep("hello cached thread pools"));
 
         // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
+        final int expectedPoolSize = 3;
         final int expectedQueueSize = 0;
 
         assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());

study/src/test/java/thread/stage1/ConcurrencyTest.java

@@ -1,5 +1,6 @@
 package thread.stage1;
 
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

tomcat/src/main/java/nextstep/Application.java

@@ -1,12 +1,52 @@
 package nextstep;
 
+import java.util.List;
+import java.util.Map;
+import nextstep.jwp.controller.Controller;
+import nextstep.jwp.controller.HomeController;
+import nextstep.jwp.controller.LoginController;
+import nextstep.jwp.controller.RegisterController;
 import nextstep.servlet.DispatcherServletManager;
+import nextstep.servlet.StaticResourceResolver;
+import nextstep.servlet.interceptor.Interceptor;
+import nextstep.servlet.interceptor.SessionInterceptor;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.http11.message.HttpMethod;
+import org.apache.coyote.http11.message.request.RequestLine;
 
 public class Application {
 
     public static void main(String[] args) {
-        final var tomcat = new Tomcat(new DispatcherServletManager());
+        final var tomcat = configTomcat();
         tomcat.start();
     }
+
+    private static Tomcat configTomcat() {
+        final DispatcherServletManager servletManger = configServletManager();
+        return new Tomcat(servletManger);
+    }
+
+    private static DispatcherServletManager configServletManager() {
+        final Map<List<RequestLine>, Interceptor> interceptors = Map.of(
+                List.of(
+                        new RequestLine(HttpMethod.GET, "/login"),
+                        new RequestLine(HttpMethod.POST, "/login")
+                )
+                , new SessionInterceptor()
+        );
+
+        final List<Controller> controllers = List.of(
+                new HomeController(),
+                new LoginController(),
+                new RegisterController()
+        );
+
+        final StaticResourceResolver staticResourceResolver = new StaticResourceResolver();
+
+        return new DispatcherServletManager(
+                interceptors,
+                controllers,
+                staticResourceResolver
+        );
+    }
 }

tomcat/src/main/java/nextstep/jwp/controller/AbstractController.java

@@ -0,0 +1,19 @@
+package nextstep.jwp.controller;
+
+import org.apache.coyote.http11.message.HttpMethod;
+import org.apache.coyote.http11.message.request.HttpRequest;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public ResponseEntity handle(HttpRequest request) {
+        if (request.getMethod() == HttpMethod.GET) {
+            return doGet();
+        }
+        return doPost(request);
+    }
+
+    abstract ResponseEntity doGet();
+
+    abstract ResponseEntity doPost(HttpRequest request);
+}

tomcat/src/main/java/nextstep/jwp/controller/Controller.java

@@ -1,11 +1,10 @@
 package nextstep.jwp.controller;
 
-import java.io.IOException;
-import org.apache.coyote.http11.HttpRequest;
+import org.apache.coyote.http11.message.request.HttpRequest;
 
 public interface Controller {
 
     boolean canHandle(HttpRequest request);
 
-    ResponseEntity handle(HttpRequest request) throws IOException;
+    ResponseEntity handle(HttpRequest request);
 }

tomcat/src/main/java/nextstep/jwp/controller/HomeController.java

@@ -0,0 +1,24 @@
+package nextstep.jwp.controller;
+
+import static nextstep.servlet.StaticResourceResolver.HOME_PAGE;
+
+import org.apache.coyote.http11.message.HttpStatusCode;
+import org.apache.coyote.http11.message.request.HttpRequest;
+
+public class HomeController extends AbstractController {
+
+    @Override
+    public boolean canHandle(HttpRequest request) {
+        return request.isPathMatch("/") || request.isPathMatch("/index.html");
+    }
+
+    @Override
+    ResponseEntity doGet() {
+        return ResponseEntity.forward(HttpStatusCode.OK, HOME_PAGE);
+    }
+
+    @Override
+    ResponseEntity doPost(HttpRequest request) {
+        throw new IllegalArgumentException("지원하지 않는 HTTP Method 입니다.");
+    }
+}

tomcat/src/main/java/nextstep/jwp/controller/rest/LoginController.java → tomcat/src/main/java/nextstep/jwp/controller/LoginController.java

@@ -1,26 +1,30 @@
-package nextstep.jwp.controller.rest;
+package nextstep.jwp.controller;
 
-import static nextstep.jwp.controller.StaticResourceController.HOME_PAGE;
-import static nextstep.jwp.controller.StaticResourceController.UNAUTHORIZED_PAGE;
+import static nextstep.servlet.StaticResourceResolver.HOME_PAGE;
+import static nextstep.servlet.StaticResourceResolver.LOGIN_PAGE;
+import static nextstep.servlet.StaticResourceResolver.UNAUTHORIZED_PAGE;
 
 import java.util.NoSuchElementException;
-import nextstep.jwp.controller.ResponseEntity;
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
-import org.apache.coyote.http11.HttpHeaders;
-import org.apache.coyote.http11.HttpMethod;
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpStatusCode;
+import org.apache.coyote.http11.message.HttpHeaders;
+import org.apache.coyote.http11.message.HttpStatusCode;
+import org.apache.coyote.http11.message.request.HttpRequest;
 
-public class LoginController implements RestController {
+public class LoginController extends AbstractController {
 
     @Override
     public boolean canHandle(HttpRequest request) {
-        return request.getPath().equals("/login") && request.getMethod() == HttpMethod.POST;
+        return request.isPathMatch("/login");
     }
 
     @Override
-    public ResponseEntity handle(HttpRequest request) {
+    ResponseEntity doGet() {
+        return ResponseEntity.forward(HttpStatusCode.OK, LOGIN_PAGE);
+    }
+
+    @Override
+    ResponseEntity doPost(HttpRequest request) {
         try {
             final User user = InMemoryUserRepository.findByAccount(request.getJsonProperty("account"))
                                                     .orElseThrow(() -> new NoSuchElementException("존재하지 않는 계정입니다."));
@@ -30,7 +34,7 @@ public ResponseEntity handle(HttpRequest request) {
                 session.setAttribute("user", user);
                 headers.setCookie("JSESSIONID", session.getId());
                 headers.put(HttpHeaders.LOCATION, HOME_PAGE);
-                return new ResponseEntity(HttpStatusCode.FOUND, headers, "");
+                return new ResponseEntity(HttpStatusCode.FOUND, headers, "", true);
             }
             return ResponseEntity.found(UNAUTHORIZED_PAGE);
         } catch (NoSuchElementException e) {

tomcat/src/main/java/nextstep/jwp/controller/rest/RegisterController.java → tomcat/src/main/java/nextstep/jwp/controller/RegisterController.java

@@ -1,23 +1,27 @@
-package nextstep.jwp.controller.rest;
+package nextstep.jwp.controller;
 
-import static nextstep.jwp.controller.StaticResourceController.HOME_PAGE;
-import static nextstep.jwp.controller.StaticResourceController.REGISTER_PAGE;
+import static nextstep.servlet.StaticResourceResolver.HOME_PAGE;
+import static nextstep.servlet.StaticResourceResolver.REGISTER_PAGE;
 
-import nextstep.jwp.controller.ResponseEntity;
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
-import org.apache.coyote.http11.HttpMethod;
-import org.apache.coyote.http11.HttpRequest;
+import org.apache.coyote.http11.message.HttpStatusCode;
+import org.apache.coyote.http11.message.request.HttpRequest;
 
-public class RegisterController implements RestController {
+public class RegisterController extends AbstractController {
 
     @Override
     public boolean canHandle(HttpRequest request) {
-        return request.getPath().equals("/register") && request.getMethod() == HttpMethod.POST;
+        return request.isPathMatch("/register");
     }
 
     @Override
-    public ResponseEntity handle(HttpRequest request) {
+    ResponseEntity doGet() {
+        return ResponseEntity.forward(HttpStatusCode.OK, REGISTER_PAGE);
+    }
+
+    @Override
+    ResponseEntity doPost(HttpRequest request) {
         final var user = new User(
                 request.getJsonProperty("account"),
                 request.getJsonProperty("password"),

tomcat/src/main/java/nextstep/jwp/controller/ResponseEntity.java

@@ -1,29 +1,32 @@
 package nextstep.jwp.controller;
 
 import java.util.Map;
-import org.apache.coyote.http11.HttpHeaders;
-import org.apache.coyote.http11.HttpStatusCode;
+import org.apache.coyote.http11.message.HttpHeaders;
+import org.apache.coyote.http11.message.HttpStatusCode;
 
 public class ResponseEntity {
 
     private final HttpStatusCode statusCode;
     private final HttpHeaders headers;
     private final String body;
+    private final boolean isRestResponse;
 
-    public ResponseEntity(HttpStatusCode statusCode, HttpHeaders headers, String body) {
+    public ResponseEntity(HttpStatusCode statusCode, HttpHeaders headers, String body, boolean isRestResponse) {
         this.statusCode = statusCode;
         this.headers = headers;
         this.body = body;
+        this.isRestResponse = isRestResponse;
     }
 
-    public static ResponseEntity ok(String body) {
-        return new ResponseEntity(HttpStatusCode.OK, HttpHeaders.defaultHeaders(), body);
+    public static ResponseEntity forward(HttpStatusCode statusCode, String path) {
+        final var headers = HttpHeaders.defaultHeaders();
+        return new ResponseEntity(statusCode, headers, path, false);
     }
 
     public static ResponseEntity found(String location) {
         final var headers = HttpHeaders.defaultHeaders();
         headers.put(HttpHeaders.LOCATION, location);
-        return new ResponseEntity(HttpStatusCode.FOUND, headers, "");
+        return new ResponseEntity(HttpStatusCode.FOUND, headers, "", true);
     }
 
     public String getBody() {
@@ -37,4 +40,8 @@ public HttpStatusCode getStatusCode() {
     public Map<String, String> getHeaders() {
         return headers.getHeaders();
     }
+
+    public boolean isRestResponse() {
+        return isRestResponse;
+    }
 }

tomcat/src/main/java/nextstep/jwp/db/InMemoryUserRepository.java

@@ -3,26 +3,28 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
 import nextstep.jwp.model.User;
 
 public class InMemoryUserRepository {
 
     private static final Map<String, User> database = new ConcurrentHashMap<>();
-    private static long sequence = 1L;
+    private static final AtomicLong sequence = new AtomicLong(1);
 
     static {
-        final var user = new User(sequence++, "gugu", "password", "hkkang@woowahan.com");
+        final var user = new User(sequence.getAndIncrement(), "gugu", "password", "hkkang@woowahan.com");
         database.put(user.getAccount(), user);
     }
 
+    private InMemoryUserRepository() {
+    }
+
     public static void save(User user) {
-        final var newUser = new User(sequence++, user.getAccount(), user.getPassword(), user.getEmail());
+        final var newUser = new User(sequence.getAndIncrement(), user.getAccount(), user.getPassword(), user.getEmail());
         database.put(user.getAccount(), newUser);
     }
 
     public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
-
-    private InMemoryUserRepository() {}
 }