[톰캣 구현하기 - 3, 4단계] 땡칠(박성철) 미션 제출합니다.

tomcat/src/main/java/nextstep/jwp/handler/LoginHandler.java

@@ -1,69 +1,73 @@
 package nextstep.jwp.handler;
 
+import java.util.Objects;
 import java.util.Optional;
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.model.User;
 import org.apache.coyote.http11.HttpRequest;
 import org.apache.coyote.http11.HttpResponse;
 import org.apache.coyote.http11.body.FormData;
 import org.apache.coyote.http11.handler.FileHandler;
-import org.apache.coyote.http11.handler.Handler;
+import org.apache.coyote.http11.handler.GetAndPostHandler;
 import org.apache.coyote.http11.header.Cookies;
 import org.apache.coyote.http11.session.Session;
 import org.apache.coyote.http11.session.SessionManager;
 
-public class LoginHandler implements Handler {
+public class LoginHandler extends GetAndPostHandler {
 
     private static final String SESSION_KEY = "JSESSIONID";
     private static final String UNAUTHORIZED_LOCATION = "/401";
     private static final String MAIN_LOCATION = "/index";
+    private static final String SESSION_USER_KEY = "user";
 
     private final FileHandler fileHandler = new FileHandler();
 
     @Override
-    public HttpResponse handle(final HttpRequest httpRequest) {
-        if (httpRequest.getMethod().isPost()) {
-            FormData formData = FormData.of(httpRequest.getBody());
-            String account = formData.get("account");
-            String password = formData.get("password");
+    protected HttpResponse doGet(final HttpRequest httpRequest) {
+        Session session = getSessionFrom(httpRequest.getCookies());
+        if (session != null && hasUserOn(session)) {
+            return HttpResponse.redirectTo(MAIN_LOCATION);
+        }
+        return fileHandler.handle(httpRequest);
+    }
 
-            Optional<User> found = InMemoryUserRepository.findByAccount(account);
-            if (found.isEmpty()) {
-                return HttpResponse.redirectTo(UNAUTHORIZED_LOCATION);
-            }
-            User user = found.get();
-            return signIn(httpRequest, user, password);
+    private Session getSessionFrom(final Cookies cookies) {
+        String sessionId = cookies.get(SESSION_KEY);
+        if (sessionId == null) {
+            return null;
         }
-        if (httpRequest.getMethod().isGet()) {
-            String jsessionId = httpRequest.getCookies().get(SESSION_KEY);
-            if (jsessionId == null) {
-                return fileHandler.handle(httpRequest);
-            }
-            Session session = SessionManager.findSession(jsessionId);
-            if (session != null) {
-                return HttpResponse.redirectTo(MAIN_LOCATION);
-            }
+        return SessionManager.findSession(sessionId);
+    }
+
+    private boolean hasUserOn(Session session) {
+        return Objects.nonNull(session.getAttribute(SESSION_USER_KEY));
+    }
+
+    @Override
+    protected HttpResponse doPost(final HttpRequest httpRequest) {
+        FormData formData = FormData.of(httpRequest.getBody());
+        String account = formData.get("account");
+        String password = formData.get("password");
+
+        Optional<User> found = InMemoryUserRepository.findByAccount(account);
+        if (found.isEmpty()) {
+            return HttpResponse.redirectTo(UNAUTHORIZED_LOCATION);
         }
-        return fileHandler.handle(httpRequest);
+        User user = found.get();
+        return signIn(user, password);
     }
 
-    private HttpResponse signIn(final HttpRequest httpRequest, final User user, final String password) {
+    private HttpResponse signIn(final User user, final String password) {
         if (user.checkPassword(password)) {
             Session session = new Session();
-            session.addAttribute("user", user);
+            session.addAttribute(SESSION_USER_KEY, user);
             SessionManager.add(session);
 
-            Cookies cookies = httpRequest.getCookies();
+            Cookies cookies = new Cookies();
             cookies.add(SESSION_KEY, session.getId());
 
-            return redirectToMainWith(cookies);
+            return HttpResponse.redirectTo(MAIN_LOCATION).with(cookies);
         }
         return HttpResponse.redirectTo(UNAUTHORIZED_LOCATION);
     }
-
-    private HttpResponse redirectToMainWith(Cookies cookies) {
-        HttpResponse httpResponse = HttpResponse.redirectTo(MAIN_LOCATION);
-        httpResponse.putHeader(cookies.toHeader("Set-Cookie"));
-        return httpResponse;
-    }
 }

tomcat/src/main/java/nextstep/jwp/handler/RegisterHandler.java

@@ -6,24 +6,27 @@
 import org.apache.coyote.http11.HttpResponse;
 import org.apache.coyote.http11.body.FormData;
 import org.apache.coyote.http11.handler.FileHandler;
-import org.apache.coyote.http11.handler.Handler;
+import org.apache.coyote.http11.handler.GetAndPostHandler;
 
-public class RegisterHandler implements Handler {
+public class RegisterHandler extends GetAndPostHandler {
 
+    private static final String MAIN_LOCATION = "/index";
     private final FileHandler fileHandler = new FileHandler();
 
     @Override
-    public HttpResponse handle(final HttpRequest httpRequest) {
-        if (httpRequest.getMethod().isPost()) {
-            FormData formData = FormData.of(httpRequest.getBody());
+    protected HttpResponse doGet(final HttpRequest httpRequest) {
+        return fileHandler.handle(httpRequest);
+    }
 
-            String account = formData.get("account");
-            String password = formData.get("password");
-            String email = formData.get("email");
+    @Override
+    protected HttpResponse doPost(final HttpRequest httpRequest) {
+        FormData formData = FormData.of(httpRequest.getBody());
 
-            InMemoryUserRepository.save(new User(account, password, email));
-            return HttpResponse.redirectTo("/index");
-        }
-        return fileHandler.handle(httpRequest);
+        String account = formData.get("account");
+        String password = formData.get("password");
+        String email = formData.get("email");
+
+        InMemoryUserRepository.save(new User(account, password, email));
+        return HttpResponse.redirectTo(MAIN_LOCATION);
     }
 }

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

@@ -1,31 +1,38 @@
 package org.apache.catalina.connector;
 
-import java.net.SocketException;
-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.net.SocketException;
+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_ACCEPT_COUNT = 100; // 모든 쓰레드가 사용중일 때 들어오는 연결에 대한 대기열의 길이
+    private static final int MAX_THREADS = 250; // 동시에 연결 후 처리 가능한 요청의 최대 개수
+    // 최대 ThradPool의 크기는 250, 모든 Thread가 사용 중인(Busy) 상태이면 100명까지 대기 상태로 만들려면 어떻게 할까?
+    // acceptCount를 100으로 한다
+    // 처리중인 연결이 250개 이므로 나머지는 OS 큐에서 대기하게 된다.
     private static final int SOCKET_TIMEOUT_SECONDS = 10;
 
     private final ServerSocket serverSocket;
     private boolean stopped;
+    private final ExecutorService pool;
 
     public Connector() {
-        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT);
+        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, MAX_THREADS);
     }
 
-    public Connector(final int port, final int acceptCount) {
+    public Connector(final int port, final int acceptCount, final int maxThreads) {
+        this.pool = Executors.newFixedThreadPool(maxThreads);
         this.serverSocket = createServerSocket(port, acceptCount);
         this.stopped = false;
     }
@@ -60,6 +67,7 @@ private void connect() {
         try {
             process(serverSocket.accept());
         } catch (IOException e) {
+            pool.shutdown();
             log.error(e.getMessage(), e);
         }
     }
@@ -70,7 +78,7 @@ private void process(final Socket connection) throws SocketException {
         }
         connection.setSoTimeout(SOCKET_TIMEOUT_SECONDS * 1000);
         var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        pool.execute(processor);
     }
 
     public void stop() {

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

@@ -20,7 +20,6 @@ public class Http11Processor implements Runnable, Processor {
 
     private static final Logger log = LoggerFactory.getLogger(Http11Processor.class);
 
-    private static final String HTTP_VERSION = "HTTP/1.1 ";
     private static final String CRLF = "\r\n";
 
     private static final Handler DEFAULT_HANDLER = new FileHandler();
@@ -58,7 +57,7 @@ public void process(final Socket connection) {
                     .map(HttpHeader::toLine)
                     .collect(Collectors.joining(CRLF));
             final var response = String.join(CRLF,
-                    HTTP_VERSION + httpResponse.getStatus().toLine(),
+                    HttpResponse.HTTP_VERSION + httpResponse.getStatus().toLine(),
                     headerLines,
                     "",
                     httpResponse.getBody()

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

@@ -9,28 +9,19 @@
 
 public class HttpRequest {
 
-    private static final String WHITE_SPACE = " ";
-
-    private final HttpMethod method;
-    private final HttpTarget target;
-    private final String version;
+    private final RequestLine requestLine;
     private final Headers headers;
     private final String body;
 
-    private HttpRequest(final String method, final String target, final String version,
-                        final Headers headers,
-                        final String body) {
-        this.method = new HttpMethod(method);
-        this.target = new HttpTarget(target);
-        this.version = version;
+    public HttpRequest(final RequestLine requestLine, final Headers headers, final String body) {
+        this.requestLine = requestLine;
         this.headers = headers;
         this.body = body;
     }
 
     public static HttpRequest from(BufferedReader reader) {
         try {
-            String[] requestLineElements = reader.readLine().split(WHITE_SPACE);
-
+            RequestLine requestLine = new RequestLine(reader.readLine());
             Headers headers = new Headers();
             String next;
             while (reader.ready() && !(next = reader.readLine()).isEmpty()) {
@@ -45,9 +36,7 @@ public static HttpRequest from(BufferedReader reader) {
             }
 
             return new HttpRequest(
-                    requestLineElements[0],
-                    requestLineElements[1],
-                    requestLineElements[2],
+                    requestLine,
                     headers,
                     new String(bodyBuffer)
             );
@@ -58,15 +47,15 @@ public static HttpRequest from(BufferedReader reader) {
 
 
     public HttpMethod getMethod() {
-        return method;
+        return requestLine.getMethod();
     }
 
     public HttpTarget getTarget() {
-        return target;
+        return requestLine.getTarget();
     }
 
     public String getVersion() {
-        return version;
+        return requestLine.getHttpVersion();
     }
 
     public List<HttpHeader> getHeaders() {

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

@@ -5,10 +5,12 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.coyote.http11.header.ContentType;
+import org.apache.coyote.http11.header.Cookies;
 import org.apache.coyote.http11.header.HttpHeader;
 
 public class HttpResponse {
 
+    public static final String HTTP_VERSION = "HTTP/1.1";
     private static final String EMPTY_BODY = "";
 
     private final HttpStatus status;
@@ -58,4 +60,9 @@ public void putHeader(HttpHeader header) {
     public List<HttpHeader> getHeaders() {
         return new ArrayList<>(headers.values());
     }
+
+    public HttpResponse with(Cookies cookies) {
+        putHeader(cookies.toHeader("Set-Cookie"));
+        return this;
+    }
 }

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

@@ -0,0 +1,37 @@
+package org.apache.coyote.http11;
+
+public class RequestLine {
+
+    private static final String SP = " ";
+    private static final int STANDARD_ELEMENT_COUNT = 3;
+
+    private final HttpMethod method;
+    private final HttpTarget target;
+    private final String httpVersion;
+
+    public RequestLine(String rawRequestLine) {
+        String[] elements = rawRequestLine.split(SP);
+        validateLengthOf(elements);
+        this.method = new HttpMethod(elements[0]);
+        this.target = new HttpTarget(elements[1]);
+        this.httpVersion = elements[2];
+    }
+
+    private void validateLengthOf(String[] elements) {
+        if (elements.length != STANDARD_ELEMENT_COUNT) {
+            throw new IllegalArgumentException("RequestLine의 요소 개수는 3개여야 합니다");
+        }
+    }
+
+    public HttpMethod getMethod() {
+        return method;
+    }
+
+    public HttpTarget getTarget() {
+        return target;
+    }
+
+    public String getHttpVersion() {
+        return httpVersion;
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/handler/GetAndPostHandler.java

@@ -0,0 +1,19 @@
+package org.apache.coyote.http11.handler;
+
+import org.apache.coyote.http11.HttpRequest;
+import org.apache.coyote.http11.HttpResponse;
+
+public abstract class GetAndPostHandler implements Handler {
+
+    @Override
+    public HttpResponse handle(final HttpRequest httpRequest) {
+        if (httpRequest.getMethod().isGet()) {
+            return doGet(httpRequest);
+        }
+        return doPost(httpRequest);
+    }
+
+    protected abstract HttpResponse doGet(final HttpRequest httpRequest);
+
+    protected abstract HttpResponse doPost(final HttpRequest httpRequest);
+}

tomcat/src/main/java/org/apache/coyote/http11/header/Cookies.java

@@ -1,6 +1,7 @@
 package org.apache.coyote.http11.header;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -11,6 +12,10 @@ public class Cookies {
 
     private final Map<String, String> cookies;
 
+    public Cookies() {
+        this(Collections.emptyMap());
+    }
+
     private Cookies(Map<String, String> cookies) {
         this.cookies = cookies;
     }