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

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

@@ -1,13 +1,18 @@
 package cache.com.example.cachecontrol;
 
 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;
 
 @Configuration
 public class CacheWebConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
+        final WebContentInterceptor interceptor = new WebContentInterceptor();
+        interceptor.addCacheMapping(CacheControl.noCache().cachePrivate(), "/*");
+        registry.addInterceptor(interceptor);
     }
 }

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

@@ -1,12 +1,29 @@
 package cache.com.example.etag;
 
+import static cache.com.example.version.CacheBustingWebConfig.PREFIX_STATIC_RESOURCES;
+
+import java.util.Collections;
+import java.util.List;
+import javax.servlet.Filter;
+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 FilterRegistrationBean<ShallowEtagHeaderFilter> bean = new FilterRegistrationBean<>();
+      final ShallowEtagHeaderFilter filter = new ShallowEtagHeaderFilter();
+      bean.setFilter(filter);
+      bean.setUrlPatterns(List.of(
+          "/etag",
+          PREFIX_STATIC_RESOURCES + "/*"
+      ));
+
+      return bean;
+    }
 }

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

@@ -1,25 +1,33 @@
 package cache.com.example.version;
 
+import java.time.Duration;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
+import org.springframework.web.filter.ShallowEtagHeaderFilter;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 public class CacheBustingWebConfig implements WebMvcConfigurer {
 
-    public static final String PREFIX_STATIC_RESOURCES = "/resources";
+  public static final String PREFIX_STATIC_RESOURCES = "/resources";
 
-    private final ResourceVersion version;
+  private final ResourceVersion version;
 
-    @Autowired
-    public CacheBustingWebConfig(ResourceVersion version) {
-        this.version = version;
-    }
+  @Autowired
+  public CacheBustingWebConfig(ResourceVersion version) {
+    this.version = version;
+  }
 
-    @Override
-    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
-        registry.addResourceHandler(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**")
-                .addResourceLocations("classpath:/static/");
-    }
+  @Override
+  public void addResourceHandlers(final ResourceHandlerRegistry registry) {
+    registry.addResourceHandler(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**")
+        .addResourceLocations("classpath:/static/")
+        .setUseLastModified(true)
+        .setCacheControl(CacheControl.maxAge(Duration.ofDays(365)).cachePublic());
+  }
 }

study/src/main/resources/application.yml

@@ -2,6 +2,9 @@ handlebars:
   suffix: .html
 
 server:
+  compression:
+    enabled: true
+    min-response-size: 10
   tomcat:
     accept-count: 1
     max-connections: 1

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

@@ -1,66 +1,62 @@
 package thread.stage0;
 
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * 스레드 풀은 무엇이고 어떻게 동작할까?
- * 테스트를 통과시키고 왜 해당 결과가 나왔는지 생각해보자.
- *
- * Thread Pools
- * https://docs.oracle.com/javase/tutorial/essential/concurrency/pools.html
- *
- * Introduction to Thread Pools in Java
- * https://www.baeldung.com/thread-pool-java-and-guava
+ * 스레드 풀은 무엇이고 어떻게 동작할까? 테스트를 통과시키고 왜 해당 결과가 나왔는지 생각해보자.
+ * <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
  */
 class ThreadPoolsTest {
 
-    private static final Logger log = LoggerFactory.getLogger(ThreadPoolsTest.class);
-
-    @Test
-    void testNewFixedThreadPool() {
-        final var executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
-        executor.submit(logWithSleep("hello fixed thread pools"));
-        executor.submit(logWithSleep("hello fixed thread pools"));
-        executor.submit(logWithSleep("hello fixed thread pools"));
-
-        // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
-        final int expectedQueueSize = 0;
-
-        assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
-        assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
-    }
-
-    @Test
-    void testNewCachedThreadPool() {
-        final var executor = (ThreadPoolExecutor) Executors.newCachedThreadPool();
-        executor.submit(logWithSleep("hello cached thread pools"));
-        executor.submit(logWithSleep("hello cached thread pools"));
-        executor.submit(logWithSleep("hello cached thread pools"));
-
-        // 올바른 값으로 바꿔서 테스트를 통과시키자.
-        final int expectedPoolSize = 0;
-        final int expectedQueueSize = 0;
-
-        assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
-        assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
-    }
-
-    private Runnable logWithSleep(final String message) {
-        return () -> {
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-            log.info(message);
-        };
-    }
+  private static final Logger log = LoggerFactory.getLogger(ThreadPoolsTest.class);
+
+  @Test
+  void testNewFixedThreadPool() {
+    final ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(2);
+    executor.submit(logWithSleep("hello fixed thread pools"));
+    executor.submit(logWithSleep("hello fixed thread pools"));
+    executor.submit(logWithSleep("hello fixed thread pools"));
+
+    // 올바른 값으로 바꿔서 테스트를 통과시키자.
+    final int expectedPoolSize = 2;
+    final int expectedQueueSize = 1;
+
+    assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
+    assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
+  }
+
+  @Test
+  void testNewCachedThreadPool() {
+    final var executor = (ThreadPoolExecutor) Executors.newCachedThreadPool();
+    executor.submit(logWithSleep("hello cached thread pools"));
+    executor.submit(logWithSleep("hello cached thread pools"));
+    executor.submit(logWithSleep("hello cached thread pools"));
+
+    // 올바른 값으로 바꿔서 테스트를 통과시키자.
+    final int expectedPoolSize = 3;
+    final int expectedQueueSize = 0;
+
+    assertThat(expectedPoolSize).isEqualTo(executor.getPoolSize());
+    assertThat(expectedQueueSize).isEqualTo(executor.getQueue().size());
+  }
+
+  private Runnable logWithSleep(final String message) {
+    return () -> {
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+      log.info(message);
+    };
+  }
 }

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

@@ -36,6 +36,20 @@ void testExtendedThread() throws InterruptedException {
          thread.join();
     }
 
+    private static final class ExtendedThread extends Thread {
+
+        private String message;
+
+        public ExtendedThread(final String message) {
+            this.message = message;
+        }
+
+        @Override
+        public void run() {
+            log.info(message);
+        }
+    }
+
     /**
      * Runnable 인터페이스를 사용하는 방법도 있다.
      * 주석을 참고하여 테스트 코드를 작성하고, 테스트를 실행시켜서 메시지가 잘 나오는지 확인한다.
@@ -52,20 +66,6 @@ void testRunnableThread() throws InterruptedException {
          thread.join();
     }
 
-    private static final class ExtendedThread extends Thread {
-
-        private String message;
-
-        public ExtendedThread(final String message) {
-            this.message = message;
-        }
-
-        @Override
-        public void run() {
-            log.info(message);
-        }
-    }
-
     private static final class RunnableThread implements Runnable {
 
         private String message;

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

@@ -3,6 +3,7 @@
 import jakarta.servlet.http.HttpSession;
 
 import java.io.IOException;
+import org.apache.coyote.request.Session;
 
 /**
  * A <b>Manager</b> manages the pool of Sessions that are associated with a
@@ -29,7 +30,7 @@ public interface Manager {
      *
      * @param session Session to be added
      */
-    void add(HttpSession session);
+    void add(Session session);
 
     /**
      * Return the active Session, associated with this Manager, with the
@@ -45,12 +46,12 @@ public interface Manager {
      * @return the request session or {@code null} if a session with the
      *         requested ID could not be found
      */
-    HttpSession findSession(String id) throws IOException;
+    Session findSession(String id) throws IOException;
 
     /**
      * Remove this Session from the active Sessions for this Manager.
      *
      * @param session Session to be removed
      */
-    void remove(HttpSession session);
+    void remove(Session session);
 }

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

@@ -1,7 +1,10 @@
 package org.apache.catalina.connector;
 
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import org.apache.coyote.handler.Handler;
+import org.apache.coyote.handler.HandlerComposite;
 import org.apache.coyote.http11.Http11Processor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,19 +20,27 @@ public class Connector implements Runnable {
 
     private static final int DEFAULT_PORT = 8080;
     private static final int DEFAULT_ACCEPT_COUNT = 100;
+    private static final int MAX_THREADS = 200;
 
     private final ServerSocket serverSocket;
     private boolean stopped;
     private final List<Handler> handlers;
+    private final Executor executor;
 
     public Connector(final List<Handler> handlers) {
-        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, handlers);
+        this(DEFAULT_PORT, DEFAULT_ACCEPT_COUNT, handlers, MAX_THREADS);
     }
 
-    public Connector(final int port, final int acceptCount, final List<Handler> handlers) {
+    public Connector(
+        final int port,
+        final int acceptCount,
+        final List<Handler> handlers,
+        final int maxThreads
+    ) {
         this.serverSocket = createServerSocket(port, acceptCount);
         this.stopped = false;
         this.handlers = handlers;
+        executor = Executors.newFixedThreadPool(maxThreads);
     }
 
     private ServerSocket createServerSocket(final int port, final int acceptCount) {
@@ -70,8 +81,8 @@ private void process(final Socket connection) {
         if (connection == null) {
             return;
         }
-        var processor = new Http11Processor(connection, handlers);
-        new Thread(processor).start();
+        var processor = new Http11Processor(connection, new HandlerComposite(handlers));
+        executor.execute(processor);
     }
 
     public void stop() {

tomcat/src/main/java/org/apache/catalina/startup/Tomcat.java

@@ -5,6 +5,9 @@
 import org.apache.catalina.connector.Connector;
 import org.apache.coyote.handler.Handler;
 import org.apache.coyote.handler.LoginHandler;
+import org.apache.coyote.handler.LoginPageHandler;
+import org.apache.coyote.handler.RegisterHandler;
+import org.apache.coyote.handler.RegisterPageHandler;
 import org.apache.coyote.handler.StaticFileHandler;
 import org.apache.coyote.handler.WelcomePageHandler;
 import org.slf4j.Logger;
@@ -34,7 +37,10 @@ public List<Handler> getContext() {
     return List.of(
         new LoginHandler(),
         new StaticFileHandler(),
-        new WelcomePageHandler()
+        new LoginPageHandler(),
+        new WelcomePageHandler(),
+        new RegisterHandler(),
+        new RegisterPageHandler()
     );
   }
 }

tomcat/src/main/java/org/apache/coyote/handler/Handler.java

@@ -2,16 +2,17 @@
 
 import java.io.IOException;
 import org.apache.coyote.request.HttpRequest;
+import org.apache.coyote.response.HttpResponse;
 
 public interface Handler {
 
   boolean canHandle(final HttpRequest httpRequest);
 
-  String handle(final HttpRequest httpRequest) throws IOException;
+  void handle(final HttpRequest httpRequest, final HttpResponse httpResponse) throws IOException;
 
-  default String safeHandle(final HttpRequest httpRequest) {
+  default void safeHandle(final HttpRequest httpRequest, final HttpResponse httpResponse) {
     try {
-      return handle(httpRequest);
+      handle(httpRequest, httpResponse);
     } catch (IOException e) {
       throw new IllegalArgumentException("I/O 작업 관련 에러가 발생했습니다.");
     }