[톰캣 구현하기 - 3, 4단계] 저문(유정훈) 미션 제출합니다.

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

@@ -1,6 +1,6 @@
 package org.apache.catalina;
 
-import org.apache.coyote.http11.Session;
+import org.apache.coyote.http11.auth.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a particular Container.  Different Manager

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

@@ -1,30 +1,34 @@
 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 final ExecutorService executorService;
     private boolean stopped;
 
     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.executorService = Executors.newFixedThreadPool(maxThreads);
         this.stopped = false;
     }
 
@@ -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

@@ -1,16 +1,20 @@
 package org.apache.coyote.http11;
 
 import java.io.BufferedReader;
-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.auth.SessionManager;
+import org.apache.coyote.http11.controller.Controller;
+import org.apache.coyote.http11.controller.RequestMapping;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class Http11Processor implements Runnable, Processor {
 
+    public static final SessionManager SESSION_MANAGER = new SessionManager();
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
 
     private final Socket connection;
@@ -33,13 +37,15 @@ public void process(final Socket connection) {
              final BufferedReader bufferedReader = new BufferedReader(inputStreamReader)
         ) {
             final HttpRequest request = HttpRequest.from(bufferedReader);
-            final HttpRequestHandler requestHandler = new HttpRequestHandler(request);
-            final HttpResponseEntity responseEntity = requestHandler.handle();
-            final String response = HttpResponse.getResponse(responseEntity);
+            final HttpResponse response = new HttpResponse();
 
-            outputStream.write(response.getBytes());
+            final RequestMapping requestMapping = new RequestMapping();
+            final Controller controller = requestMapping.getController(request);
+            controller.service(request, response);
+
+            outputStream.write(response.get().getBytes());
             outputStream.flush();
-        } catch (IOException | UncheckedServletException e) {
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }

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

@@ -6,6 +6,9 @@
 
 public class HttpCookie {
 
+    private static final String COOKIE_DELIMITER = "; ";
+    private static final String COOKIE_SEPARATOR = "=";
+
     private final Map<String, String> values;
 
     public static HttpCookie ofJSessionId(final String jSessionId) {
@@ -19,10 +22,10 @@ public HttpCookie(final Map<String, String> values) {
         this.values = values;
     }
 
-    public String getValues() {
+    public String printValues() {
         return values.keySet()
                 .stream()
-                .map(key -> key + "=" + values.get(key) + "; ")
+                .map(key -> key + COOKIE_SEPARATOR + values.get(key) + COOKIE_DELIMITER)
                 .collect(Collectors.joining());
     }