[톰캣 구현하기 - 3, 4단계] 아마란스(송세연) 미션 제출합니다.

README.md

@@ -39,6 +39,22 @@
 
 - [x] Request, Response 객체 분리
 - [x] Http11Processor의 메서드 분리
-- [ ] Controller 분리
+- [x] Controller 분리
+- [x] 테스트 작성하기
+    - [x] / 페이지 리다이렉트 확인
+    - [x] /index.html 페이지 리다이렉트 확인
+    - [x] /login 페이지 리다이렉트 확인
+    - [x] 로그인 성공 시 index.html 리다이렉트 및 set-cookie 설정 여부 확인
+    - [x] 로그인 실패 시 401.html 파일 리다이렉트 확인
+    - [x] 로그인 후 /login 페이지 접근 시 index.html 리다이렉트 확인
+    - [x] /register 페이지 리다이렉트 확인
+    - [x] 회원가입 시 로그인 가능해지는지 확인
+    - [x] 회원가입 후 index.html 리다이렉트 확인
+    - [x] 404 페이지 리다이렉트 확인
+    - [x] 유효성 검증 테스트
 
-## 4단계 - 동시성 확장하기
+## 4단계 - 동시성 확장하기
+
+- [x] 학습테스트 마무리
+- [x] Connector의 동작을 ThreadPool에서 관리하도록 구현
+- [x] 세션을 저장하는 객체를 Concurrent Collection으로 변

study/src/main/java/cache/com/example/cachecontrol/CacheWebConfig.java

@@ -1,13 +1,27 @@
 package cache.com.example.cachecontrol;
 
+import cache.com.example.version.ResourceVersion;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.mvc.WebContentInterceptor;
+
+import static cache.com.example.version.CacheBustingWebConfig.PREFIX_STATIC_RESOURCES;
 
 @Configuration
 public class CacheWebConfig implements WebMvcConfigurer {
+    private final ResourceVersion version;
+
+    public CacheWebConfig(final ResourceVersion version) {
+        this.version = version;
+    }
 
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
+        WebContentInterceptor interceptor = new WebContentInterceptor();
+        interceptor.addCacheMapping(CacheControl.noCache().cachePrivate(), "/*");
+        registry.addInterceptor(interceptor)
+                .excludePathPatterns(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**");
     }
 }

study/src/main/java/cache/com/example/etag/EtagFilterConfiguration.java

@@ -1,12 +1,27 @@
 package cache.com.example.etag;
 
+import cache.com.example.version.ResourceVersion;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.ShallowEtagHeaderFilter;
+
+import static cache.com.example.version.CacheBustingWebConfig.PREFIX_STATIC_RESOURCES;
 
 @Configuration
 public class EtagFilterConfiguration {
 
-//    @Bean
-//    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
-//        return null;
-//    }
+    private final ResourceVersion version;
+
+    public EtagFilterConfiguration(final ResourceVersion version) {
+        this.version = version;
+    }
+
+    @Bean
+    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
+        final FilterRegistrationBean<ShallowEtagHeaderFilter> registration = new FilterRegistrationBean<>();
+        registration.setFilter(new ShallowEtagHeaderFilter());
+        registration.addUrlPatterns("/etag", PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/*");
+        return registration;
+    }
 }

study/src/main/java/cache/com/example/version/CacheBustingWebConfig.java

@@ -2,9 +2,12 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.time.Duration;
+
 @Configuration
 public class CacheBustingWebConfig implements WebMvcConfigurer {
 
@@ -20,6 +23,7 @@ public CacheBustingWebConfig(ResourceVersion version) {
     @Override
     public void addResourceHandlers(final ResourceHandlerRegistry registry) {
         registry.addResourceHandler(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**")
-                .addResourceLocations("classpath:/static/");
+                .addResourceLocations("classpath:/static/")
+                .setCacheControl(CacheControl.maxAge(Duration.ofDays(365)).cachePublic());
     }
 }

study/src/main/resources/application.yml

@@ -7,3 +7,6 @@ server:
     max-connections: 1
     threads:
       max: 2
+  compression:
+    enabled: true
+    min-response-size: 10

study/src/test/java/thread/stage0/SynchronizationTest.java

@@ -12,7 +12,7 @@
  * 다중 스레드 환경에서 두 개 이상의 스레드가 변경 가능한(mutable) 공유 데이터를 동시에 업데이트하면 경쟁 조건(race condition)이 발생한다.
  * 자바는 공유 데이터에 대한 스레드 접근을 동기화(synchronization)하여 경쟁 조건을 방지한다.
  * 동기화된 블록은 하나의 스레드만 접근하여 실행할 수 있다.
- *
+ * <p>
  * Synchronization
  * https://docs.oracle.com/javase/tutorial/essential/concurrency/sync.html
  */
@@ -21,7 +21,7 @@ class SynchronizationTest {
     /**
      * 테스트가 성공하도록 SynchronizedMethods 클래스에 동기화를 적용해보자.
      * synchronized 키워드에 대하여 찾아보고 적용하면 된다.
-     *
+     * <p>
      * Guide to the Synchronized Keyword in Java
      * https://www.baeldung.com/java-synchronized
      */
@@ -41,7 +41,7 @@ private static final class SynchronizedMethods {
 
         private int sum = 0;
 
-        public void calculate() {
+        synchronized public void calculate() {
             setSum(getSum() + 1);
         }
 

study/src/test/java/thread/stage0/ThreadPoolsTest.java

@@ -12,10 +12,10 @@
 /**
  * 스레드 풀은 무엇이고 어떻게 동작할까?
  * 테스트를 통과시키고 왜 해당 결과가 나왔는지 생각해보자.
- *
+ * <p>
  * Thread Pools
  * https://docs.oracle.com/javase/tutorial/essential/concurrency/pools.html
- *
+ * <p>
  * Introduction to Thread Pools in Java
  * https://www.baeldung.com/thread-pool-java-and-guava
  */
@@ -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/build.gradle

@@ -20,6 +20,7 @@ dependencies {
 
     testImplementation "org.assertj:assertj-core:3.24.2"
     testImplementation "org.mockito:mockito-core:5.4.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.0"
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.2"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2"
 }

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

@@ -0,0 +1,27 @@
+package nextstep.jwp.controller;
+
+import org.apache.coyote.http11.controller.AbstractController;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseHeader;
+import org.apache.coyote.http11.response.HttpResponseStatus;
+
+public class DefaultGetController extends AbstractController {
+
+
+    @Override
+    public boolean isSupported(HttpRequest request) {
+        return request.isGET() && request.isSamePath("/");
+    }
+
+    @Override
+    protected void doGet(HttpRequest request, HttpResponse response) {
+        String responseBody = "Hello world!";
+
+        HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                readContentType(request.getAccept(), request.getPath()),
+                String.valueOf(responseBody.getBytes().length))
+                .build();
+        response.updateResponse(HttpResponseStatus.OK, responseHeader, responseBody);
+    }
+}

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

@@ -0,0 +1,51 @@
+package nextstep.jwp.controller;
+
+import org.apache.catalina.SessionManager;
+import org.apache.coyote.http11.controller.AbstractController;
+import org.apache.coyote.http11.request.HttpCookie;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseHeader;
+import org.apache.coyote.http11.response.HttpResponseStatus;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class LoginGetController extends AbstractController {
+    public static final String JSESSIONID = "JSESSIONID";
+
+    @Override
+    public boolean isSupported(HttpRequest request) {
+        return request.isGET() && request.isSamePath("/login");
+    }
+
+
+    @Override
+    protected void doGet(HttpRequest request, HttpResponse response) throws URISyntaxException, IOException {
+        final HttpCookie cookie = request.getCookie();
+        URL filePathUrl;
+        if (isLogin(cookie)) {
+            HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                    readContentType(request.getAccept(), request.getPath()),
+                    String.valueOf(0))
+                    .addLocation("/index.html")
+                    .build();
+            response.updateResponse(HttpResponseStatus.FOUND, responseHeader, "");
+            return;
+        }
+        filePathUrl = getClass().getResource("/static/login.html");
+        String responseBody = readHtmlFile(filePathUrl);
+
+        HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                readContentType(request.getAccept(), request.getPath()),
+                String.valueOf(responseBody.getBytes().length))
+                .build();
+        response.updateResponse(HttpResponseStatus.OK, responseHeader, responseBody);
+    }
+
+    private boolean isLogin(HttpCookie cookie) {
+        return cookie.isExist(JSESSIONID)
+                && SessionManager.getInstance().findSession(cookie.findCookie(JSESSIONID)) != null;
+    }
+}

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

@@ -0,0 +1,60 @@
+package nextstep.jwp.controller;
+
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.catalina.SessionManager;
+import org.apache.coyote.http11.controller.AbstractController;
+import org.apache.coyote.http11.exception.UnauthorizeException;
+import org.apache.coyote.http11.request.HttpCookie;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseHeader;
+import org.apache.coyote.http11.response.HttpResponseStatus;
+
+import java.util.Map;
+import java.util.UUID;
+
+public class LoginPostController extends AbstractController {
+    public static final String JSESSIONID = "JSESSIONID";
+
+    @Override
+    public boolean isSupported(HttpRequest request) {
+        return request.isPOST() && request.isSamePath("/login");
+    }
+
+    @Override
+    protected void doPost(HttpRequest request, HttpResponse response) {
+        if (request.isNotExistBody()) {
+            throw new IllegalArgumentException("로그인 정보가 입력되지 않았습니다.");
+        }
+        final HttpCookie cookie = request.getCookie();
+        Map<String, String> parsedRequestBody = request.parseBody();
+        User user = InMemoryUserRepository.findByAccount(parsedRequestBody.get("account"))
+                .orElseThrow(() -> new UnauthorizeException("입력한 회원 ID가 존재하지 않습니다."));
+        if (isLoginFail(user, parsedRequestBody)) {
+            throw new UnauthorizeException("입력한 회원 ID가 존재하지 않습니다.");
+        }
+        if (!cookie.isExist(JSESSIONID)) {
+            String jSessionId = String.valueOf(UUID.randomUUID());
+            String setCookie = JSESSIONID + "=" + jSessionId;
+            SessionManager.getInstance().addLoginSession(jSessionId, user);
+            HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                    readContentType(request.getAccept(), request.getPath()), String.valueOf(0))
+                    .addLocation("/index.html")
+                    .addSetCookie(setCookie)
+                    .build();
+            response.updateResponse(HttpResponseStatus.FOUND, responseHeader, "");
+            return;
+        }
+        HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                readContentType(request.getAccept(), request.getPath()), String.valueOf(0))
+                .addLocation("/index.html")
+                .build();
+        response.updateResponse(HttpResponseStatus.FOUND, responseHeader, "");
+
+    }
+
+    private boolean isLoginFail(User user, Map<String, String> parsedRequestBody) {
+        return !user.checkPassword(parsedRequestBody.get("password"));
+    }
+}

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

@@ -0,0 +1,32 @@
+package nextstep.jwp.controller;
+
+import org.apache.coyote.http11.controller.AbstractController;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseHeader;
+import org.apache.coyote.http11.response.HttpResponseStatus;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class RegisterGetController extends AbstractController {
+
+
+    @Override
+    public boolean isSupported(HttpRequest request) {
+        return request.isGET() && request.isSamePath("/register");
+    }
+
+    @Override
+    protected void doGet(HttpRequest request, HttpResponse response) throws URISyntaxException, IOException {
+        URL filePathUrl = getClass().getResource("/static/register.html");
+        String responseBody = readHtmlFile(filePathUrl);
+
+        HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                readContentType(request.getAccept(), request.getPath()),
+                String.valueOf(responseBody.getBytes().length))
+                .build();
+        response.updateResponse(HttpResponseStatus.OK, responseHeader, responseBody);
+    }
+}

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

@@ -0,0 +1,40 @@
+package nextstep.jwp.controller;
+
+import nextstep.jwp.db.InMemoryUserRepository;
+import nextstep.jwp.model.User;
+import org.apache.coyote.http11.controller.AbstractController;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponseHeader;
+import org.apache.coyote.http11.response.HttpResponseStatus;
+
+import java.util.Map;
+
+public class RegisterPostController extends AbstractController {
+
+    @Override
+    public boolean isSupported(HttpRequest request) {
+        return request.isPOST() && request.isSamePath("/register");
+    }
+
+
+    @Override
+    protected void doPost(HttpRequest request, HttpResponse response) {
+        if (request.isNotExistBody()) {
+            throw new IllegalArgumentException("회원가입 정보가 입력되지 않았습니다.");
+        }
+        Map<String, String> parsedRequestBody = request.parseBody();
+        InMemoryUserRepository.save(new User(
+                Long.getLong(parsedRequestBody.get("id")),
+                parsedRequestBody.get("account"),
+                parsedRequestBody.get("password"),
+                parsedRequestBody.get("email")
+        ));
+        HttpResponseHeader responseHeader = new HttpResponseHeader.Builder(
+                readContentType(request.getAccept(), request.getPath()),
+                String.valueOf(0))
+                .addLocation("/index.html")
+                .build();
+        response.updateResponse(HttpResponseStatus.FOUND, responseHeader, "");
+    }
+}