[톰캣 구현하기 - 3, 4단계] 아코(안석환) 미션 제출합니다.

README.md

@@ -25,3 +25,11 @@
   - [x] 로그인시 쿠키 생성해주기
 - [x] Session 구현하기
   - [x] 로그인시 세션저장하기
+## 3단계
+- [x] 전반적인 코드 리팩토링 하기
+  - [x] HttpRequest 및 HttpResponse 도입하기
+  - [x] controller 도입하기
+  - [x] 파일 읽어오는 기능 util 클래스로 분리
+## 4단계
+- [ ] Executors로 Thread Pool 적용
+- [ ] 동시성 컬렉션 사용하기

tomcat/src/main/java/org/apache/catalina/connector/Connector.java

@@ -1,31 +1,35 @@
 package org.apache.catalina.connector;
 
-import org.apache.coyote.http11.Http11Processor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.apache.coyote.http11.Http11Processor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Connector implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(Connector.class);
 
     private static final int DEFAULT_PORT = 8080;
     private static final int DEFAULT_ACCEPT_COUNT = 100;
+    private static final int DEFAULT_THREAD_COUNT = 250;
 
     private final ServerSocket serverSocket;
     private boolean stopped;
+    private final ExecutorService executorService;
 
     public Connector() {
-        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT);
+        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, DEFAULT_THREAD_COUNT);
     }
 
-    public Connector(final int port, final int acceptCount) {
+    public Connector(final int port, final int acceptCount, final int maxThreads) {
         this.serverSocket = createServerSocket(port, acceptCount);
         this.stopped = false;
+        this.executorService = Executors.newFixedThreadPool(maxThreads);
     }
 
     private ServerSocket createServerSocket(final int port, final int acceptCount) {
@@ -67,7 +71,7 @@ private void process(final Socket connection) {
             return;
         }
         var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        executorService.execute(processor);
     }
 
     public void stop() {

tomcat/src/main/java/org/apache/coyote/http11/Http11Processor.java

@@ -4,8 +4,8 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
-import nextstep.jwp.exception.UncheckedServletException;
 import org.apache.coyote.Processor;
+import org.apache.coyote.http11.controller.Controller;
 import org.apache.coyote.http11.httpmessage.request.HttpRequest;
 import org.apache.coyote.http11.httpmessage.response.HttpResponse;
 import org.slf4j.Logger;
@@ -35,23 +35,14 @@ public void process(final Socket connection) {
             final var reader = new BufferedReader(new InputStreamReader(inputStream))
         ) {
             final String request = readRequest(reader);
-
             final HttpRequest httpRequest = HttpRequest.from(request);
+            final HttpResponse httpResponse = new HttpResponse();
+            final Controller controller = RequestMapping.getController(httpRequest.getPath());
 
-            final HandlerMapping handlerMapping = HandlerMapping.find(
-                httpRequest.getPath(),
-                httpRequest.getHttpMethod());
-
-            final Handler handler = new Handler(
-                handlerMapping,
-                httpRequest.getQueryString(),
-                httpRequest.getRequestBody(),
-                httpRequest.getCookie());
-            final HttpResponse httpResponse = handler.makeResponse();
-
+            controller.service(httpRequest, httpResponse);
             outputStream.write(httpResponse.makeToString().getBytes());
             outputStream.flush();
-        } catch (IOException | UncheckedServletException e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }

tomcat/src/main/java/org/apache/coyote/http11/RequestMapping.java

@@ -0,0 +1,28 @@
+package org.apache.coyote.http11;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.coyote.http11.controller.Controller;
+import org.apache.coyote.http11.controller.LoginController;
+import org.apache.coyote.http11.controller.PageController;
+import org.apache.coyote.http11.controller.RegisterController;
+import org.apache.coyote.http11.controller.RootController;
+
+public class RequestMapping {
+
+    private static final Map<String, Controller> REQUEST_MAPPER = new HashMap<>();
+
+    static {
+        REQUEST_MAPPER.put("/", new RootController());
+        REQUEST_MAPPER.put("/login", new LoginController());
+        REQUEST_MAPPER.put("/register", new RegisterController());
+    }
+
+    public static Controller getController(final String path) {
+        if (REQUEST_MAPPER.containsKey(path)) {
+            return REQUEST_MAPPER.get(path);
+        }
+        return new PageController();
+    }
+
+}

tomcat/src/main/java/org/apache/coyote/http11/SessionManger.java → tomcat/src/main/java/org/apache/coyote/http11/SessionManager.java

@@ -1,13 +1,13 @@
 package org.apache.coyote.http11;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-public class SessionManger {
+public class SessionManager {
 
-    private static final Map<String, Session> SESSIONS = new HashMap<>();
+    private static final Map<String, Session> SESSIONS = new ConcurrentHashMap<>();
 
-    private SessionManger() {
+    private SessionManager() {
 
     }
 

tomcat/src/main/java/org/apache/coyote/http11/controller/AbstractController.java

@@ -0,0 +1,24 @@
+package org.apache.coyote.http11.controller;
+
+import org.apache.coyote.http11.httpmessage.request.HttpMethod;
+import org.apache.coyote.http11.httpmessage.request.HttpRequest;
+import org.apache.coyote.http11.httpmessage.response.HttpResponse;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public void service(final HttpRequest request, final HttpResponse response) throws Exception {
+        if (request.getHttpMethod() == HttpMethod.POST) {
+            doPost(request, response);
+        }
+        if (request.getHttpMethod() == HttpMethod.GET) {
+            doGet(request, response);
+        }
+    }
+
+    protected void doPost(HttpRequest request, HttpResponse response) throws Exception {
+    }
+
+    protected void doGet(HttpRequest request, HttpResponse response) throws Exception {
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/controller/Controller.java

@@ -0,0 +1,9 @@
+package org.apache.coyote.http11.controller;
+
+import org.apache.coyote.http11.httpmessage.request.HttpRequest;
+import org.apache.coyote.http11.httpmessage.response.HttpResponse;
+
+public interface Controller {
+
+    void service(final HttpRequest request, final HttpResponse response) throws Exception;
+}