[톰캣 구현하기 3,4단계] 리오(오영택) 미션 제출합니다.

README.md

@@ -12,10 +12,18 @@
 -[x] Cookie에 JSESSIONID 값 저장하기
 -[x] Session 구현하기
 
+## 3단계 - 리팩터링
+-[x] HttpRequest 클래스 구현
+-[x] HttpResponse 클래스 구현
+-[x] Controller 인터페이스 구현
+-[x] AbstractController 추상 클래스 구현
+-[x] RequestMapping 클래스 구현
+
 ### TODO
 -[x] 예외 처리
 -[x] 매직 넘버 정리
 -[x] 리팩터링(클래스 분리, 패키지 정리)
--[ ] 상태코드, http 메서드 종류 추가 
--[ ] 테스트 - 회원가입, 정적리소스
--[ ] 로깅
+-[x] 상태코드, http 메서드 종류 추가 
+-[x] 테스트 - 회원가입, 정적리소스
+-[x] 로깅
+-[X] 예외 처리

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) {
+        WebContentInterceptor webContentInterceptor = new WebContentInterceptor();
+        webContentInterceptor.addCacheMapping(CacheControl.noCache().cachePrivate(), "/**");
+        registry.addInterceptor(webContentInterceptor);
     }
 }

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() {
+        ShallowEtagHeaderFilter shallowEtagHeaderFilter = new ShallowEtagHeaderFilter();
+        FilterRegistrationBean<ShallowEtagHeaderFilter> filterRegistrationBean = new FilterRegistrationBean<>(shallowEtagHeaderFilter);
+        filterRegistrationBean.addUrlPatterns("/etag", "/resources/*");
+        return filterRegistrationBean;
+    }
 }

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.util.concurrent.TimeUnit;
+
 @Configuration
 public class CacheBustingWebConfig implements WebMvcConfigurer {
 
@@ -20,6 +23,8 @@ public CacheBustingWebConfig(ResourceVersion version) {
     @Override
     public void addResourceHandlers(final ResourceHandlerRegistry registry) {
         registry.addResourceHandler(PREFIX_STATIC_RESOURCES + "/" + version.getVersion() + "/**")
+                .setCacheControl(CacheControl.maxAge(365L, TimeUnit.DAYS).cachePublic())
+                .setUseLastModified(true)
                 .addResourceLocations("classpath:/static/");
     }
 }

study/src/main/resources/application.yml

@@ -4,6 +4,10 @@ handlebars:
 server:
   tomcat:
     accept-count: 1
-    max-connections: 1
+    max-connections: 2
     threads:
       max: 2
+
+  compression:
+    min-response-size: 10
+    enabled: true

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

@@ -41,7 +41,7 @@ private static final class SynchronizedMethods {
 
         private int sum = 0;
 
-        public void calculate() {
+        public synchronized void calculate() {
             setSum(getSum() + 1);
         }
 

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());

study/src/test/java/thread/stage1/UserServlet.java

@@ -11,7 +11,7 @@ public void service(final User user) {
         join(user);
     }
 
-    private void join(final User user) {
+    private synchronized void join(final User user) {
         if (!users.contains(user)) {
             users.add(user);
         }

tomcat/src/main/java/common/http/AbstractController.java

@@ -0,0 +1,50 @@
+package common.http;
+
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+import static common.http.HttpMethod.DELETE;
+import static common.http.HttpMethod.GET;
+import static common.http.HttpMethod.PATCH;
+import static common.http.HttpMethod.POST;
+import static common.http.HttpMethod.PUT;
+
+public abstract class AbstractController implements Controller {
+
+    public static final String EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD = "요청에 해당하는 메서드가 없습니다.";
+    private final Map<HttpMethod, BiConsumer<Request, Response>> methodMapping = new EnumMap<>(HttpMethod.class);
+
+    protected AbstractController() {
+        methodMapping.put(GET, this::doGet);
+        methodMapping.put(POST, this::doPost);
+        methodMapping.put(PUT, this::doPut);
+        methodMapping.put(PATCH, this::doPatch);
+        methodMapping.put(DELETE, this::doDelete);
+    }
+
+    @Override
+    public void service(Request request, Response response) {
+        methodMapping.get(request.getHttpMethod()).accept(request, response);
+    }
+
+    protected void doGet(Request request, Response response) {
+        throw new IllegalArgumentException(EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD);
+    }
+
+    protected void doPost(Request request, Response response) {
+        throw new IllegalArgumentException(EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD);
+    }
+
+    protected void doPut(Request request, Response response) {
+        throw new IllegalArgumentException(EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD);
+    }
+
+    protected void doPatch(Request request, Response response) {
+        throw new IllegalArgumentException(EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD);
+    }
+
+    protected void doDelete(Request request, Response response) {
+        throw new IllegalArgumentException(EXCEPTION_MESSAGE_WHEN_CALL_NOT_DECLARED_METHOD);
+    }
+}

tomcat/src/main/java/common/http/ContentType.java

@@ -0,0 +1,42 @@
+package common.http;
+
+import java.util.Arrays;
+
+public enum ContentType {
+    HTML("text/html", "html"),
+    CSS("text/css", "css"),
+    JS("text/javascript", "js"),
+    ICO("image/ico", "ico"),
+    ;
+
+    public static final String DELIMITER_FOR_EXTENSION = ".";
+
+    private final String type;
+    private final String extension;
+
+    ContentType(String type, String extension) {
+        this.type = type;
+        this.extension = extension;
+    }
+
+    public static ContentType findByExtension(String extension) {
+        return Arrays.stream(ContentType.values())
+                .filter(contentType -> contentType.extension.equals(extension))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("유효하지 않은 확장자명 입니다."));
+    }
+
+    public static ContentType findByPath(String path) {
+        int indexBeforeExtension = path.lastIndexOf(DELIMITER_FOR_EXTENSION);
+        if (indexBeforeExtension == -1) {
+            throw new IllegalArgumentException("파일의 확장자명이 없습니다.");
+        }
+
+        String extension = path.substring(indexBeforeExtension + 1);
+        return findByExtension(extension);
+    }
+
+    public String getType() {
+        return type;
+    }
+}

tomcat/src/main/java/common/http/Controller.java

@@ -0,0 +1,5 @@
+package common.http;
+
+public interface Controller {
+    void service(Request request, Response response);
+}

tomcat/src/main/java/common/http/ControllerManager.java

@@ -0,0 +1,8 @@
+package common.http;
+
+public interface ControllerManager {
+
+    void add(String path, Controller controller);
+
+    void service(Request request, Response response);
+}

tomcat/src/main/java/common/http/Cookie.java

@@ -0,0 +1,57 @@
+package common.http;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Cookie {
+
+    private static final String SEPARATOR = "; ";
+    public static final String DELIMITER = "=";
+
+    private static final int ATTRIBUTE_INDEX = 0;
+    private static final int VALUE_INDEX = 1;
+
+    private final Map<String, String> items;
+
+    private Cookie(Map<String, String> items) {
+        this.items = items;
+    }
+
+    public static Cookie from(String cookieHeader) {
+        if (cookieHeader == null || cookieHeader.isEmpty()) {
+            return new Cookie(new HashMap<>());
+        }
+        return new Cookie(parse(cookieHeader));
+    }
+
+    private static Map<String, String> parse(String values) {
+        Map<String, String> items = new HashMap<>();
+        String[] attributesAndValues = values.split(SEPARATOR);
+        for (String cookie : attributesAndValues) {
+            String[] attributeAndValue = cookie.split(DELIMITER);
+            items.put(attributeAndValue[ATTRIBUTE_INDEX], attributeAndValue[VALUE_INDEX].trim());
+        }
+        return items;
+    }
+
+    public void addAttribute(String attribute, String value) {
+        items.put(attribute, value);
+    }
+
+    boolean hasAttribute(String attribute) {
+        return items.containsKey(attribute);
+    }
+
+    String getAttribute(String attribute) {
+        return items.get(attribute);
+    }
+
+    public String getValue() {
+        StringBuilder stringBuilder = new StringBuilder();
+        for (Map.Entry<String, String> item : items.entrySet()) {
+            stringBuilder.append(item.getKey()).append(DELIMITER).append(item.getValue()).append(SEPARATOR);
+        }
+        String cookie = stringBuilder.toString();
+        return cookie.substring(0, cookie.length()-2);
+    }
+}

tomcat/src/main/java/common/http/Cookies.java

@@ -0,0 +1,19 @@
+package common.http;
+
+public class Cookies {
+
+    private static final String JSESSIONID = "JSESSIONID";
+
+    private Cookies() {}
+
+    public static Cookie ofJSessionId(String id) {
+        return Cookie.from(JSESSIONID + Cookie.DELIMITER + id);
+    }
+
+    public static String getJsessionid(Cookie cookie) {
+        if (cookie.hasAttribute(JSESSIONID)) {
+            return cookie.getAttribute(JSESSIONID);
+        }
+        throw new IllegalArgumentException("쿠키에 세션 아이디가 없습니다.");
+    }
+}

tomcat/src/main/java/org/apache/coyote/http11/HttpMethod.java → tomcat/src/main/java/common/http/HttpMethod.java

@@ -1,4 +1,4 @@
-package org.apache.coyote.http11;
+package common.http;
 
 public enum HttpMethod {
     GET,

tomcat/src/main/java/common/http/HttpStatus.java

@@ -0,0 +1,33 @@
+package common.http;
+
+public enum HttpStatus {
+    OK("OK", 200),
+    CREATED("Created", 201),
+    ACCEPTED("Accepted", 202),
+    NO_CONTENT("No Content", 204),
+    MOVED_PERMANENTLY("Moved Permanently", 301),
+    FOUND("Found", 302),
+    PERMANENT_REDIRECT("Permanent Redirect", 308),
+    BAD_REQUEST("Bad Request", 400),
+    UNAUTHORIZED("Unauthorized", 401),
+    FORBIDDEN("Forbidden", 403),
+    NOT_FOUND("Not Found", 404),
+    CONFLICT("Conflict", 409),
+    INTERNAL_SERVER_ERROR("Internal Server Error", 500);
+
+    private final String statusMessage;
+    private final int statusCode;
+
+    HttpStatus(String statusMessage, int statusCode) {
+        this.statusMessage = statusMessage;
+        this.statusCode = statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+}

tomcat/src/main/java/common/http/Request.java

@@ -0,0 +1,28 @@
+package common.http;
+
+public interface Request {
+
+    HttpMethod getHttpMethod();
+
+    String getVersionOfTheProtocol();
+
+    String getAccount();
+
+    String getPassword();
+
+    Session getSession(boolean create);
+
+    Session getSession();
+
+    String getCookie();
+
+    String getPath();
+
+    boolean hasValidSession();
+
+    String getEmail();
+
+    void addSession(Session session);
+
+    boolean hasStaticResourcePath();
+}