[3단계- Tomcat 구현하기] 배키(백은희) 미션 제출합니다.

README.md

@@ -44,3 +44,9 @@
   - [x] 쿠키에서 전달 받은 JSESSIONID의 값으로 로그인 여부를 체크
   - [x] 로그인에 성공하면 Session 객체의 값으로 User 객체를 저장
   - [x] 로그인된 상태에서 /login 페이지에 HTTP GET method로 접근하면 이미 로그인한 상태니 index.html 페이지로 리다이렉트
+
+### 3단계 리팩토링
+- [x] HttpRequest 구현하기
+- [x] HttpResponse 구현하기
+- [x] Controller 인터페이스 추가하기
+  - [x] 컨트롤러 인터페이스를 추가하고 각 분기에 있는 로직마다 AbstractController를 상속한 구현체로 만들기

tomcat/src/main/java/com/techcourse/controller/LoginController.java

@@ -0,0 +1,45 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.catalina.servlet.http.Cookie;
+import org.apache.catalina.servlet.http.Session;
+import org.apache.catalina.servlet.http.SessionManager;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoginController {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    public String getLoginPage(HttpRequest request, HttpResponse response) {
+        if (request.hasCookie()) {
+            Cookie cookie = request.getCookie();
+            SessionManager sessionManager = SessionManager.getInstance();
+            if (sessionManager.hasSession(cookie.getValue())) {
+                response.sendRedirect("/index.html");
+            }
+        }
+        return "/login";
+    }
+
+    public void login(HttpRequest request, HttpResponse response) {
+        String account = request.getParameter("account");
+        InMemoryUserRepository.findByAccount(account)
+                .ifPresentOrElse(user -> login(request, response, user), () -> response.sendRedirect("/401.html"));
+    }
+
+    private void login(HttpRequest request, HttpResponse response, User user) {
+        if (user.checkPassword(request.getParameter("password"))) {
+            log.info("user : {}", user);
+            Session session = request.getSession();
+            session.setAttribute("user", user);
+            response.addCookie(new Cookie("JSESSIONID", session.getId()));
+            response.sendRedirect("/index.html");
+            return;
+        }
+        response.sendRedirect("/401.html");
+    }
+}

tomcat/src/main/java/com/techcourse/controller/RegisterController.java

@@ -0,0 +1,23 @@
+package com.techcourse.controller;
+
+import com.techcourse.db.InMemoryUserRepository;
+import com.techcourse.model.User;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
+import org.apache.catalina.servlet.http.response.HttpStatus;
+
+public class RegisterController {
+
+    public String getRegisterPage() {
+        return "/register";
+    }
+
+    public void register(HttpRequest request, HttpResponse response) {
+        String account = request.getParameter("account");
+        String email = request.getParameter("email");
+        String password = request.getParameter("password");
+        InMemoryUserRepository.save(new User(account, password, email));
+        response.setStatus(HttpStatus.OK.getStatusCode());
+        response.sendRedirect("/index.html");
+    }
+}

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

@@ -1,7 +1,7 @@
 package org.apache.catalina;
 
 import java.io.IOException;
-import org.apache.catalina.servlets.http.Session;
+import org.apache.catalina.servlet.http.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a

tomcat/src/main/java/org/apache/catalina/mapper/Mapper.java → tomcat/src/main/java/org/apache/catalina/mapper/ControllerMapper.java

@@ -1,33 +1,32 @@
 package org.apache.catalina.mapper;
 
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.regex.Pattern;
-import org.apache.catalina.servlets.DefaultServlet;
-import org.apache.catalina.servlets.LoginServlet;
-import org.apache.catalina.servlets.RegisterServlet;
-import org.apache.catalina.servlets.Servlet;
+import org.apache.catalina.servlet.DefaultServlet;
+import org.apache.catalina.servlet.LoginServlet;
+import org.apache.catalina.servlet.RegisterServlet;
+import org.apache.catalina.servlet.Servlet;
 
 /**
  * 요청의 URL을 실제 정적 파일 절대 경로로 매핑해준다.(동적 파일만)
  */
-public class Mapper {
+public class ControllerMapper {
 
     private static final Map<Pattern, Servlet> values = Map.of(
-            Pattern.compile(".*\\..*"), new DefaultServlet(),
-            Pattern.compile("/"), new DefaultServlet(),
-            Pattern.compile("^/login$"), new LoginServlet(),
-            Pattern.compile("^/register$"), new RegisterServlet()
+            Pattern.compile(".*\\..*"), DefaultServlet.getInstance(),
+            Pattern.compile("/"), DefaultServlet.getInstance(),
+            Pattern.compile("^/login$"), LoginServlet.getInstance(),
+            Pattern.compile("^/register$"), RegisterServlet.getInstance()
     );
 
-    private static Mapper instance;
+    private static ControllerMapper instance;
 
-    private Mapper() {}
+    private ControllerMapper() {}
 
-    public static Mapper getInstance() {
+    public static ControllerMapper getInstance() {
         if (instance == null) {
-            instance = new Mapper();
+            instance = new ControllerMapper();
         }
         return instance;
     }

tomcat/src/main/java/org/apache/catalina/servlets/HttpServlet.java → tomcat/src/main/java/org/apache/catalina/servlet/AbstractServlet.java

@@ -1,18 +1,19 @@
-package org.apache.catalina.servlets;
+package org.apache.catalina.servlet;
 
 import java.io.IOException;
-import org.apache.catalina.servlets.http.request.HttpRequest;
-import org.apache.catalina.servlets.http.response.HttpResponse;
+import org.apache.catalina.servlet.http.request.HttpMethod;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
 
-public abstract class HttpServlet implements Servlet {
+public abstract class AbstractServlet implements Servlet {
 
     @Override
     public void service(HttpRequest request, HttpResponse response) throws IOException {
-        if (request.getMethod().equals("GET")) {
+        if (request.getMethod() == HttpMethod.GET) {
             doGet(request, response);
             return;
         }
-        if (request.getMethod().equals("POST")) {
+        if (request.getMethod() == HttpMethod.POST) {
             doPost(request, response);
         }
     }

tomcat/src/main/java/org/apache/catalina/servlets/DefaultServlet.java → tomcat/src/main/java/org/apache/catalina/servlet/DefaultServlet.java

@@ -1,36 +1,39 @@
-package org.apache.catalina.servlets;
+package org.apache.catalina.servlet;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
-import java.util.Map;
 import java.util.stream.Collectors;
-import org.apache.catalina.servlets.http.request.HttpRequest;
-import org.apache.catalina.servlets.http.response.HttpResponse;
+import org.apache.catalina.servlet.http.ContentType;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
 
 /**
  * 정적 리소스를 관리하는 서블릿입니다.
  */
 public class DefaultServlet implements Servlet {
 
-    private final Map<String, String> contentTypes = Map.of(
-            "html", "text/html;charset=utf-8",
-            "css", "text/css",
-            "js", "application/javascript"
-    );
+    private static DefaultServlet instance;
 
-    @Override
-    public void service(HttpRequest request, HttpResponse response) throws IOException {
+    public static DefaultServlet getInstance() {
+        if (instance == null) {
+            instance = new DefaultServlet();
+        }
+        return instance;
+    }
 
-        URL resource = getClass().getClassLoader().getResource("static" + request.getRequestURI());
+    private DefaultServlet() {}
 
+    @Override
+    public void service(HttpRequest request, HttpResponse response) {
+        URL resource = getClass().getClassLoader().getResource("static" + request.getRequestURI());
         String fileContent = getFileContent(resource);
         String resourceType = getResourceType(resource);
-        String contentType = contentTypes.getOrDefault(resourceType, "text/html;charset=utf-8");
 
-        response.setContentType(contentType);
+        ContentType contentType = ContentType.of(resourceType);
+        response.setContentType(contentType.getValue());
         response.setContentLength(fileContent.getBytes().length);
         response.setResponseBody(fileContent);
     }

tomcat/src/main/java/org/apache/catalina/servlet/LoginServlet.java

@@ -0,0 +1,55 @@
+package org.apache.catalina.servlet;
+
+import com.techcourse.controller.LoginController;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URL;
+import java.util.stream.Collectors;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
+
+public class LoginServlet extends AbstractServlet {
+
+    private static LoginServlet instance;
+    private final LoginController loginController = new LoginController();
+
+    private LoginServlet() {
+    }
+
+    public static LoginServlet getInstance() {
+        if (instance == null) {
+            instance = new LoginServlet();
+        }
+        return instance;
+    }
+
+    @Override
+    public void doGet(HttpRequest request, HttpResponse response) {
+        loginController.getLoginPage(request, response);
+        URL resource = getClass().getClassLoader().getResource("static" + request.getRequestURI() + ".html");
+        String fileContent = getFileContent(resource);
+        response.setContentType("text/html");
+        response.setContentLength(fileContent.getBytes().length);
+        response.setResponseBody(fileContent);
+    }
+
+    private String getFileContent(URL resourceURL) {
+        if (resourceURL == null) {
+            return "";
+        }
+        File file = new File(resourceURL.getFile());
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String collect = reader.lines().collect(Collectors.joining("\n"));
+            return collect + "\n";
+        } catch (IOException e) {
+            return "Hello world!";
+        }
+    }
+
+    @Override
+    public void doPost(HttpRequest request, HttpResponse response) {
+        loginController.login(request, response);
+    }
+}

tomcat/src/main/java/org/apache/catalina/servlets/RegisterServlet.java → tomcat/src/main/java/org/apache/catalina/servlet/RegisterServlet.java

@@ -1,22 +1,34 @@
-package org.apache.catalina.servlets;
+package org.apache.catalina.servlet;
 
-import com.techcourse.db.InMemoryUserRepository;
-import com.techcourse.model.User;
+import com.techcourse.controller.RegisterController;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
 import java.util.stream.Collectors;
-import org.apache.catalina.servlets.http.request.HttpRequest;
-import org.apache.catalina.servlets.http.response.HttpResponse;
-import org.apache.catalina.servlets.http.response.HttpStatus;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
 
-public class RegisterServlet extends HttpServlet {
+public class RegisterServlet extends AbstractServlet {
+
+    private static RegisterServlet instance;
+    private final RegisterController registerController = new RegisterController();
+
+    private RegisterServlet() {
+    }
+
+    public static RegisterServlet getInstance() {
+        if (instance == null) {
+            instance = new RegisterServlet();
+        }
+        return instance;
+    }
 
     @Override
     public void doGet(HttpRequest request, HttpResponse response) throws IOException {
-        URL resource = getClass().getClassLoader().getResource("static" + request.getRequestURI() + ".html");
+        String registerPage = registerController.getRegisterPage();
+        URL resource = getClass().getClassLoader().getResource("static" + registerPage + ".html");
         String fileContent = getFileContent(resource);
 
         response.setContentType("text/html");
@@ -38,14 +50,8 @@ private String getFileContent(URL resourceURL) {
     }
 
     @Override
-    public void doPost(HttpRequest request, HttpResponse response) throws IOException {
-        String account = request.getParameter("account");
-        String email = request.getParameter("email");
-        String password = request.getParameter("password");
-        InMemoryUserRepository.save(new User(account, password, email));
-
+    public void doPost(HttpRequest request, HttpResponse response) {
+        registerController.register(request, response);
         response.setContentType("text/html");
-        response.setStatus(HttpStatus.OK.getStatusCode());
-        response.sendRedirect("/index.html");
     }
 }

tomcat/src/main/java/org/apache/catalina/servlet/Servlet.java

@@ -0,0 +1,9 @@
+package org.apache.catalina.servlet;
+
+import java.io.IOException;
+import org.apache.catalina.servlet.http.request.HttpRequest;
+import org.apache.catalina.servlet.http.response.HttpResponse;
+
+public interface Servlet {
+    void service(HttpRequest request, HttpResponse response) throws IOException;
+}

tomcat/src/main/java/org/apache/catalina/servlet/http/ContentType.java

@@ -0,0 +1,33 @@
+package org.apache.catalina.servlet.http;
+
+import java.util.Arrays;
+
+public enum ContentType {
+
+    HTML("text/html;charset=utf-8", "html"),
+    CSS("text/css", "css"),
+    JS("application/javascript", "js");
+
+    private final String value;
+    private final String resourceType;
+
+    ContentType(String value, String resourceType) {
+        this.value = value;
+        this.resourceType = resourceType;
+    }
+
+    public static ContentType of(String resourceType) {
+        return Arrays.stream(values())
+                .filter(contentType -> contentType.resourceType.equals(resourceType))
+                .findFirst()
+                .orElse(HTML);
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+}

tomcat/src/main/java/org/apache/catalina/servlets/http/Cookie.java → tomcat/src/main/java/org/apache/catalina/servlet/http/Cookie.java

@@ -1,4 +1,4 @@
-package org.apache.catalina.servlets.http;
+package org.apache.catalina.servlet.http;
 
 public class Cookie {