[톰캣 구현하기 3, 4단계] 키아라(김도희) 미션 제출합니다 (#487)

* feat: 휴리스틱 캐싱 제거하기

* feat: HTTP Compression 설정하기

* feat: ETag/If-None-Match 적용하기

* feat: 캐시 무효화(Cache Busting)

* refactor: http 요청 응답 클래스명 변경

* refactor: 세션id로 유저 가져오는 기능 구현

* refactor: 응답 디폴트 지정 및 바디 호출 기능 분리

* refactor: AbstractController 상속하도록 구현

* test: ThreadPoolsTest 통과하도록 변경

* feat: Executors로 Thread Pool 적용

* feat: 동시성 컬렉션 사용하기

* refactor: FileReader 패키지 이동

* refactor: RequestBody 확장성 열어두기

* test: 테스트 코드 수정

Author: kiarakim

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

@@ -0,0 +1,20 @@
+package cache.com.example.cachecontrol;
+
+import org.springframework.http.CacheControl;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.springframework.http.HttpHeaders.CACHE_CONTROL;
+
+public class CacheControlInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        CacheControl cacheControl = CacheControl.noCache().cachePrivate();
+        String cacheControlValue = cacheControl.getHeaderValue();
+        response.addHeader(CACHE_CONTROL, cacheControlValue);
+        return true;
+    }
+}

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

@@ -1,5 +1,6 @@
 package cache.com.example.cachecontrol;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -9,5 +10,11 @@ public class CacheWebConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
+        registry.addInterceptor(cacheControlInterceptor()).addPathPatterns("/**");
+    }
+
+    @Bean
+    public CacheControlInterceptor cacheControlInterceptor() {
+        return new CacheControlInterceptor();
     }
 }

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

@@ -1,12 +1,18 @@
 package cache.com.example.etag;
 
+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;
 
 @Configuration
 public class EtagFilterConfiguration {
 
-//    @Bean
-//    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
-//        return null;
-//    }
+    @Bean
+    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
+        final var registration = new FilterRegistrationBean<>(new ShallowEtagHeaderFilter());
+        registration.addUrlPatterns("/etag");
+        registration.addUrlPatterns("/resources/*");
+        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() + "/**")
+                .setCacheControl(CacheControl.maxAge(Duration.ofDays(365)).cachePublic())
                 .addResourceLocations("classpath:/static/");
     }
 }

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/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/exception/ResourceNotFoundException.java

@@ -0,0 +1,8 @@
+package nextstep.jwp.exception;
+
+public class ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException(Exception e) {
+        super(e);
+    }
+}

tomcat/src/main/java/nextstep/jwp/presentation/AbstractController.java

@@ -0,0 +1,25 @@
+package nextstep.jwp.presentation;
+
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+
+import static org.apache.coyote.http11.Method.*;
+
+public abstract class AbstractController implements Controller {
+
+    @Override
+    public HttpResponse service(HttpRequest httpRequest, HttpResponse httpResponse) {
+
+        if (GET.matches(httpRequest.getMethod())) {
+            return doGet(httpRequest, httpResponse);
+        }
+        if (POST.matches(httpRequest.getMethod())) {
+            return doPost(httpRequest, httpResponse);
+        }
+        throw new IllegalArgumentException("지원하지 않는 HTTP Method 입니다.");
+    }
+
+    protected abstract HttpResponse doGet(HttpRequest httpRequest, HttpResponse httpResponse);
+
+    protected abstract HttpResponse doPost(HttpRequest httpRequest, HttpResponse httpResponse);
+}

tomcat/src/main/java/nextstep/jwp/presentation/Controller.java

@@ -1,11 +1,9 @@
 package nextstep.jwp.presentation;
 
-import org.apache.coyote.http11.request.RequestReader;
-import org.apache.coyote.http11.response.Response;
-
-import java.io.IOException;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
 
 public interface Controller {
 
-    Response service(RequestReader requestReader) throws IOException;
+    HttpResponse service(HttpRequest httpRequest, HttpResponse httpResponse);
 }

tomcat/src/main/java/nextstep/jwp/presentation/ControllerType.java

@@ -4,10 +4,10 @@
 
 public enum ControllerType {
 
-    MAIN("/", new MainController()),
-    LOGIN("/login.html", new LoginController()),
-    REGISTER("/register.html", new RegisterController()),
-    INDEX("/index.html", new IndexController()),
+    MAIN("/", MainController.getInstance()),
+    LOGIN("/login.html", LoginController.getInstance()),
+    REGISTER("/register.html", RegisterController.getInstance()),
+    INDEX("/index.html", IndexController.getInstance()),
     ;
 
     private final String requestUri;
@@ -24,6 +24,6 @@ public static Controller findController(String requestUri) {
                 .filter(findController -> findController.requestUri.equals(requestUri))
                 .findFirst()
                 .map(findController -> findController.controller)
-                .orElse(new OtherController());
+                .orElse(OtherController.getInstance());
     }
 }