[톰캣 구현하기 3, 4단계] 루카(백경환) 미션 제출합니다.

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

@@ -1,11 +1,20 @@
 package nextstep;
 
+import nextstep.jwp.controller.HomeController;
+import nextstep.jwp.controller.LoginController;
+import nextstep.jwp.controller.RegisterController;
 import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.controller.ControllerMapper;
 
 public class Application {
 
     public static void main(String[] args) {
         final var tomcat = new Tomcat();
+
+        ControllerMapper.register("/", new HomeController());
+        ControllerMapper.register("/login", new LoginController());
+        ControllerMapper.register("/register", new RegisterController());
+
         tomcat.start();
     }
 }

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

@@ -0,0 +1,20 @@
+package nextstep.jwp.controller;
+
+import org.apache.coyote.controller.AbstractController;
+import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.response.Response;
+
+import static org.apache.coyote.http11.response.StatusCode.METHOD_NOT_ALLOWED;
+
+public class HomeController extends AbstractController {
+
+    @Override
+    protected void doPost(final Request request, final Response response) {
+        response.setStatusCode(METHOD_NOT_ALLOWED);
+    }
+
+    @Override
+    protected void doGet(final Request request, final Response response) {
+        response.writeBody("Hello world!");
+    }
+}

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

@@ -0,0 +1,62 @@
+package nextstep.jwp.controller;
+
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.coyote.controller.AbstractController;
+import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.request.Session;
+import org.apache.coyote.http11.response.Response;
+import org.apache.coyote.http11.response.StatusCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;
+
+import static org.apache.coyote.http11.response.StatusCode.UNAUTHORIZED;
+
+public class LoginController extends AbstractController {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    @Override
+    protected void doPost(final Request request, final Response response) {
+        final Session session = request.getSession();
+        final Optional<String> account = request.getParameter("account");
+
+        if (account.isEmpty()) {
+            response.redirect("/login.html");
+            return;
+        }
+
+        final Optional<User> maybeUser = InMemoryUserRepository.findByAccount(account.get());
+        if (maybeUser.isEmpty()) {
+            response.setStatusCode(UNAUTHORIZED);
+            response.writeStaticResource("/401.html");
+            return;
+        }
+        final User findUser = maybeUser.get();
+        final Optional<String> password = request.getParameter("password");
+        if (password.isEmpty() || !findUser.checkPassword(password.get())) {
+            response.setStatusCode(UNAUTHORIZED);
+            response.writeStaticResource("/401.html");
+            return;
+        }
+        log.info("user: {}", findUser);
+
+        session.setAttribute("user", findUser);
+
+        response.redirect("/index.html");
+    }
+
+    @Override
+    protected void doGet(final Request request, final Response response) {
+        final Session session = request.getSession();
+        final User user = (User) session.getAttribute("user");
+        if (user != null) {
+            response.redirect("/index.html");
+            return;
+        }
+        response.setStatusCode(StatusCode.CREATED);
+        response.writeStaticResource("/login.html");
+    }
+}

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

@@ -0,0 +1,30 @@
+package nextstep.jwp.controller;
+
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.coyote.controller.AbstractController;
+import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.response.Response;
+
+public class RegisterController extends AbstractController {
+
+    @Override
+    protected void doPost(final Request request, final Response response) {
+        final String account = request.getParameter("account")
+                .orElseThrow(() -> new IllegalArgumentException("계정 입력이 잘못되었습니다."));
+        final String password = request.getParameter("password")
+                .orElseThrow(() -> new IllegalArgumentException("비밀번호 입력이 잘못되었습니다."));
+        final String email = request.getParameter("email")
+                .orElseThrow(() -> new IllegalArgumentException("이메일 입력이 잘못되었습니다."));
+
+        final User user = new User(account, password, email);
+        InMemoryUserRepository.save(user);
+
+        response.redirect("/login");
+    }
+
+    @Override
+    protected void doGet(final Request request, final Response response) {
+        response.writeStaticResource("/register.html");
+    }
+}

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

@@ -23,5 +23,6 @@ public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
 
-    private InMemoryUserRepository() {}
+    private InMemoryUserRepository() {
+    }
 }

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

@@ -36,14 +36,12 @@ public interface Manager {
      * specified session id (if any); otherwise return <code>null</code>.
      *
      * @param id The session id for the session to be returned
-     *
-     * @exception IllegalStateException if a new session cannot be
-     *  instantiated for any reason
-     * @exception IOException if an input/output error occurs while
-     *  processing this request
-     *
      * @return the request session or {@code null} if a session with the
-     *         requested ID could not be found
+     * requested ID could not be found
+     * @throws IllegalStateException if a new session cannot be
+     *                               instantiated for any reason
+     * @throws IOException           if an input/output error occurs while
+     *                               processing this request
      */
     HttpSession findSession(String id) throws IOException;
 

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

@@ -8,22 +8,36 @@
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.*;
 
 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 long DEFAULT_KEEP_ALIVE_ALIVE = 60;
+    public static final TimeUnit DEFAULT_TIME_UNIT = TimeUnit.SECONDS;
 
     private final ServerSocket serverSocket;
     private boolean stopped;
+    private final ExecutorService executorService;
 
     public Connector() {
         this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT);
     }
 
     public Connector(final int port, final int acceptCount) {
+        this.executorService = Executors.newCachedThreadPool();
+        this.serverSocket = createServerSocket(port, acceptCount);
+        this.stopped = false;
+    }
+
+    public Connector(final int port, final int acceptCount, final int maxThreads) {
+        final int coreThreadCount = Runtime.getRuntime().availableProcessors() * 2;
+        final BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(DEFAULT_ACCEPT_COUNT);
+
+        this.executorService = new ThreadPoolExecutor(coreThreadCount, maxThreads, DEFAULT_KEEP_ALIVE_ALIVE, DEFAULT_TIME_UNIT, workQueue);
         this.serverSocket = createServerSocket(port, acceptCount);
         this.stopped = false;
     }
@@ -39,7 +53,7 @@ private ServerSocket createServerSocket(final int port, final int acceptCount) {
     }
 
     public void start() {
-        var thread = new Thread(this);
+        final var thread = new Thread(this);
         thread.setDaemon(true);
         thread.start();
         stopped = false;
@@ -66,14 +80,15 @@ private void process(final Socket connection) {
         if (connection == null) {
             return;
         }
-        var processor = new Http11Processor(connection);
-        new Thread(processor).start();
+        final var processor = new Http11Processor(connection);
+        executorService.submit(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/catalina/startup/Tomcat.java

@@ -11,7 +11,7 @@ public class Tomcat {
     private static final Logger log = LoggerFactory.getLogger(Tomcat.class);
 
     public void start() {
-        var connector = new Connector();
+        var connector = new Connector(8080, 100, 250);
         connector.start();
 
         try {

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

@@ -0,0 +1,31 @@
+package org.apache.coyote.controller;
+
+import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.response.Response;
+
+import static org.apache.coyote.http11.request.RequestMethod.GET;
+import static org.apache.coyote.http11.request.RequestMethod.POST;
+import static org.apache.coyote.http11.response.StatusCode.METHOD_NOT_ALLOWED;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public void service(final Request request,
+                        final Response response) {
+        if (request.getRequestLine().getRequestMethod() == GET) {
+            doGet(request, response);
+            return;
+        }
+        if (request.getRequestLine().getRequestMethod() == POST) {
+            doPost(request, response);
+            return;
+        }
+        response.setStatusCode(METHOD_NOT_ALLOWED);
+    }
+
+    protected abstract void doPost(final Request request,
+                                   final Response response);
+
+    protected abstract void doGet(final Request request,
+                                  final Response response);
+}

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

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

tomcat/src/main/java/org/apache/coyote/controller/ControllerMapper.java

@@ -0,0 +1,29 @@
+package org.apache.coyote.controller;
+
+import org.apache.coyote.http11.request.Request;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ControllerMapper {
+
+    private static final Controller STATIC_RESOURCE_CONTROLLER = new StaticResourceController();
+
+    private static final Map<String, Controller> CONTROLLER_MAP = new HashMap<>();
+
+    private ControllerMapper() {
+    }
+
+    public static void register(final String path,
+                                final Controller controller) {
+        CONTROLLER_MAP.put(path, controller);
+    }
+
+    public static Controller getController(final Request request) {
+        final String path = request.getRequestLine().getRequestPath();
+        if (CONTROLLER_MAP.containsKey(path)) {
+            return CONTROLLER_MAP.get(path);
+        }
+        return STATIC_RESOURCE_CONTROLLER;
+    }
+}

tomcat/src/main/java/org/apache/coyote/controller/StaticResourceController.java

@@ -0,0 +1,56 @@
+package org.apache.coyote.controller;
+
+import org.apache.coyote.http11.request.Request;
+import org.apache.coyote.http11.response.Response;
+
+import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Paths;
+
+import static org.apache.coyote.http11.response.StatusCode.*;
+
+public class StaticResourceController extends AbstractController {
+
+    @Override
+    protected void doPost(final Request request, final Response response) {
+        response.setStatusCode(METHOD_NOT_ALLOWED);
+    }
+
+    @Override
+    protected void doGet(final Request request, final Response response) {
+        final ClassLoader classLoader = getClass().getClassLoader();
+        final String name = "static" + request.getRequestLine().getRequestPath();
+        final URL fileURL = classLoader.getResource(name);
+
+        if (fileURL == null) {
+            response.setStatusCode(NOT_FOUND);
+            response.writeStaticResource("/404.html");
+            return;
+        }
+
+        final URI fileURI;
+        try {
+            fileURI = fileURL.toURI();
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException(e);
+        }
+
+        final StringBuilder stringBuilder = new StringBuilder();
+        try (final InputStream inputStream = new FileInputStream(Paths.get(fileURI).toFile());
+             final InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
+             final BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+
+            String nextLine;
+            while ((nextLine = bufferedReader.readLine()) != null) {
+                stringBuilder.append(nextLine)
+                        .append(System.lineSeparator());
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+
+        response.writeBody(stringBuilder.toString());
+    }
+}