[톰캣 구현하기 - 3, 4단계] 케로(김지현) 미션 제출합니다.

study/src/main/resources/application.yml

@@ -4,9 +4,9 @@ handlebars:
 server:
   tomcat:
     accept-count: 1
-    max-connections: 1
+    max-connections: 2
     threads:
-      max: 2
+      max: 5
   compression:
     enabled: true
     min-response-size: 10

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());

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

@@ -1,13 +1,13 @@
 package nextstep.jwp.controller;
 
-import org.apache.coyote.request.Request;
-import org.apache.coyote.response.ResponseEntity;
-import org.apache.coyote.response.ResponseStatus;
+import org.apache.coyote.request.HttpRequest;
+import org.apache.coyote.response.HttpResponse;
+import org.apache.front.AbstractController;
 
-public class HelloWorldController implements Controller{
+public class HelloWorldController extends AbstractController {
 
     @Override
-    public ResponseEntity handle(final Request request) {
-        return ResponseEntity.fromString(request, "Hello world!", ResponseStatus.OK);
+    protected void doGet(final HttpRequest request, final HttpResponse response) {
+        response.setStringAsBody("Hello world!");
     }
 }

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

@@ -4,74 +4,74 @@
 import nextstep.jwp.exception.MemberNotFoundException;
 import nextstep.jwp.model.User;
 import org.apache.coyote.request.Cookie;
-import org.apache.coyote.request.Request;
-import org.apache.coyote.response.ResponseEntity;
+import org.apache.coyote.request.HttpRequest;
+import org.apache.coyote.response.HttpResponse;
 import org.apache.coyote.response.ResponseStatus;
-import org.apache.exception.MethodMappingFailException;
 import org.apache.exception.PageRedirectException;
+import org.apache.front.AbstractController;
 import org.apache.session.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Optional;
 
-public class LoginController implements Controller {
+public class LoginController extends AbstractController {
 
-    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
     public static final String ACCOUNT_KEY = "account";
     public static final String PASSWORD_KEY = "password";
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 
     @Override
-    public ResponseEntity handle(final Request request) {
-        if (request.isPost()) {
-            return login(request);
-        }
-        if (request.isGet() && request.hasQueryString()) {
-            return loginInConsole(request);
-        }
-        if (request.isGet()) {
-            return loginPage(request);
+    protected void doPost(final HttpRequest request, final HttpResponse response) {
+        login(request, response);
+    }
+
+    @Override
+    protected void doGet(final HttpRequest request, final HttpResponse response) {
+        if (request.hasQueryString()) {
+            loginInConsole(request, response);
+            return;
         }
-        throw new MethodMappingFailException();
+        loginPage(request, response);
     }
 
-    private ResponseEntity loginInConsole(final Request request) {
-        final String account = request.getQueryValueBy(ACCOUNT_KEY);
-        final String password = request.getQueryValueBy(PASSWORD_KEY);
+    private void loginInConsole(final HttpRequest httpRequest, final HttpResponse httpResponse) {
+        final String account = httpRequest.getQueryValueBy(ACCOUNT_KEY);
+        final String password = httpRequest.getQueryValueBy(PASSWORD_KEY);
 
         final User user = InMemoryUserRepository.findByAccount(account)
                 .orElseThrow(MemberNotFoundException::new);
         if (user.checkPassword(password)) {
             log.info("user : {}", user);
         }
-        return ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.OK);
+        httpResponse.setViewPathAsBody(httpRequest.getPath());
     }
 
-    private ResponseEntity login(final Request request) {
-        final String account = request.getBodyValue(ACCOUNT_KEY);
-        final String password = request.getBodyValue(PASSWORD_KEY);
+    private void login(final HttpRequest httpRequest, final HttpResponse httpResponse) {
+        final String account = httpRequest.getBodyValue(ACCOUNT_KEY);
+        final String password = httpRequest.getBodyValue(PASSWORD_KEY);
         final User user = InMemoryUserRepository.findByAccount(account)
-                .orElseThrow(() -> new PageRedirectException.Unauthorized(request.httpVersion()));
+                .orElseThrow(() -> new PageRedirectException.Unauthorized(httpResponse));
 
         if (user.checkPassword(password)) {
-            final Session session = request.getSession(false);
+            final Session session = httpRequest.getSession(false);
             session.setAttribute("user", user);
-            final ResponseEntity responseEntity = ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.MOVED_TEMP);
-            responseEntity.setRedirect("/index.html");
-            responseEntity.addCookie(Cookie.ofJSessionId(session.getId()));
-            return responseEntity;
+            httpResponse.setViewPathAsBodyAndSetStatus(httpRequest.getPath(), ResponseStatus.MOVED_TEMP);
+            httpResponse.setRedirect("/index.html");
+            httpResponse.addCookie(Cookie.ofJSessionId(session.getId()));
+            return;
         }
-        throw new PageRedirectException.Unauthorized(request.httpVersion());
+        throw new PageRedirectException.Unauthorized(httpResponse);
     }
 
-    private ResponseEntity loginPage(final Request request) {
-        final Session session = request.getSession(false);
+    private void loginPage(final HttpRequest httpRequest, final HttpResponse httpResponse) {
+        final Session session = httpRequest.getSession(false);
         final Optional<Object> user = session.getAttribute("user");
-        if(user.isPresent()){
-            final ResponseEntity responseEntity = ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.MOVED_TEMP);
-            responseEntity.setRedirect("/index.html");
-            return responseEntity;
+        if (user.isPresent()) {
+            httpResponse.setViewPathAsBodyAndSetStatus(httpRequest.getPath(), ResponseStatus.MOVED_TEMP);
+            httpResponse.setRedirect("/index.html");
+            return;
         }
-        return ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.OK);
+        httpResponse.setViewPathAsBody(httpRequest.getPath());
     }
 }

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

@@ -3,47 +3,46 @@
 import nextstep.jwp.db.InMemoryUserRepository;
 import nextstep.jwp.exception.DuplicationMemberException;
 import nextstep.jwp.model.User;
-import org.apache.coyote.request.Request;
-import org.apache.coyote.response.ResponseEntity;
+import org.apache.coyote.request.HttpRequest;
+import org.apache.coyote.response.HttpResponse;
 import org.apache.coyote.response.ResponseStatus;
-import org.apache.exception.MethodMappingFailException;
+import org.apache.front.AbstractController;
 
 import java.util.Optional;
 
-public class RegisterController implements Controller {
+public class RegisterController extends AbstractController {
 
     public static final String ACCOUNT_KEY = "account";
     public static final String PASSWORD_KEY = "password";
     public static final String EMAIL_KEY = "email";
 
     @Override
-    public ResponseEntity handle(final Request request) {
-        if (request.isPost()) {
-            return join(request);
-        }
-        if (request.isGet()) {
-            return joinPage(request);
-        }
-        throw new MethodMappingFailException();
+    protected void doPost(final HttpRequest request, final HttpResponse response) {
+        join(request, response);
+    }
+
+    @Override
+    protected void doGet(final HttpRequest request, final HttpResponse response) {
+        joinPage(request, response);
     }
 
-    private ResponseEntity join(final Request request) {
-        final String account = request.getBodyValue(ACCOUNT_KEY);
-        final String password = request.getBodyValue(PASSWORD_KEY);
-        final String email = request.getBodyValue(EMAIL_KEY);
+    private void join(final HttpRequest httpRequest, final HttpResponse httpResponse) {
+        final String account = httpRequest.getBodyValue(ACCOUNT_KEY);
+        final String password = httpRequest.getBodyValue(PASSWORD_KEY);
+        final String email = httpRequest.getBodyValue(EMAIL_KEY);
 
         final Optional<User> user = InMemoryUserRepository.findByAccount(account);
         if (user.isPresent()) {
             throw new DuplicationMemberException();
         }
         final User newUser = new User(account, password, email);
         InMemoryUserRepository.save(newUser);
-        final ResponseEntity responseEntity = ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.MOVED_TEMP);
-        responseEntity.setRedirect("/index.html");
-        return responseEntity;
+
+        httpResponse.setViewPathAsBodyAndSetStatus(httpRequest.getPath(), ResponseStatus.MOVED_TEMP);
+        httpResponse.setRedirect("/index.html");
     }
 
-    private ResponseEntity joinPage(final Request request) {
-        return ResponseEntity.fromViewPath(request.httpVersion(), request.getPath(), ResponseStatus.OK);
+    private void joinPage(final HttpRequest httpRequest, final HttpResponse httpResponse) {
+        httpResponse.setViewPathAsBody(httpRequest.getPath());
     }
 }

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

@@ -8,24 +8,30 @@
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 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 = 30;
+    private static final int DEFAULT_MAX_THREAD = 30;
 
     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_MAX_THREAD);
     }
 
-    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,13 +73,14 @@ private void process(final Socket connection) {
             return;
         }
         var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        executorService.execute(processor);
     }
 
     public void stop() {
         stopped = true;
         try {
             serverSocket.close();
+            executorService.shutdown();
         } catch (IOException e) {
             log.error(e.getMessage(), e);
         }

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

@@ -2,8 +2,8 @@
 
 import nextstep.jwp.exception.UncheckedServletException;
 import org.apache.coyote.common.FileType;
-import org.apache.coyote.common.HttpVersion;
 import org.apache.coyote.common.PathUrl;
+import org.apache.coyote.response.HttpResponse;
 import org.apache.exception.PageRedirectException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,18 +25,18 @@ private FileUtil() {
         throw new IllegalStateException("Utility class");
     }
 
-    public static String getResource(final HttpVersion httpVersion, final PathUrl resourceUrl){
+    public static String getResource(final HttpResponse httpResponse, final PathUrl resourceUrl) {
         final URL resource = FileUtil.class.getClassLoader().getResource("static" + resourceUrl);
-        if(Objects.isNull(resource)){
-            throw new PageRedirectException.PageNotFound(httpVersion);
+        if (Objects.isNull(resource)) {
+            throw new PageRedirectException.PageNotFound(httpResponse);
         }
         return readResource(resource);
     }
 
-    public static String getResourceFromViewPath(final HttpVersion httpVersion, final String viewPath){
+    public static String getResourceFromViewPath(final HttpResponse httpResponse, final String viewPath) {
         final URL resource = FileUtil.class.getClassLoader().getResource("static" + viewPath + FileType.HTML.getExtension());
-        if(Objects.isNull(resource)){
-            throw new PageRedirectException.PageNotFound(httpVersion);
+        if (Objects.isNull(resource)) {
+            throw new PageRedirectException.PageNotFound(httpResponse);
         }
         return readResource(resource);
     }
@@ -45,8 +45,8 @@ private static String readResource(final URL resource) {
         final Path path = Paths.get(resource.getPath());
         try (final BufferedReader fileReader = new BufferedReader(new FileReader(path.toFile()))) {
             return fileReader.lines()
-                    .collect(Collectors.joining(System.lineSeparator()))
-                    + System.lineSeparator();
+                    .collect(Collectors.joining("\r\n"))
+                    + "\r\n";
         } catch (IOException | UncheckedServletException e) {
             log.error(e.getMessage(), e);
         }

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

@@ -2,9 +2,9 @@
 
 import nextstep.jwp.exception.UncheckedServletException;
 import org.apache.coyote.Processor;
-import org.apache.coyote.request.Request;
+import org.apache.coyote.request.HttpRequest;
 import org.apache.coyote.request.RequestReader;
-import org.apache.coyote.response.ResponseEntity;
+import org.apache.coyote.response.HttpResponse;
 import org.apache.front.Proxy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,16 +40,17 @@ public void process(final Socket connection) {
              final var outputStream = connection.getOutputStream();
              final BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))
         ) {
-            final Request request = Request.from(RequestReader.from(bufferedReader));
-            final ResponseEntity responseEntity = proxy.process(request);
-            writeResponse(outputStream, responseEntity);
+            final HttpRequest httpRequest = HttpRequest.from(RequestReader.from(bufferedReader));
+            final HttpResponse httpResponse = HttpResponse.create(httpRequest.httpVersion());
+            proxy.process(httpRequest, httpResponse);
+            writeResponse(outputStream, httpResponse);
         } catch (IOException | UncheckedServletException e) {
             log.error(e.getMessage(), e);
         }
     }
 
-    private void writeResponse(final OutputStream outputStream, final ResponseEntity responseEntity) throws IOException {
-        outputStream.write(responseEntity.toString().getBytes());
+    private void writeResponse(final OutputStream outputStream, final HttpResponse httpResponse) throws IOException {
+        outputStream.write(httpResponse.toString().getBytes());
         outputStream.flush();
     }
 }