[3단계 - Tomcat 구현하기] 새양(양경호) 미션 제출합니다.

study/build.gradle

@@ -21,8 +21,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.apache.commons:commons-lang3:3.14.0'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
-    implementation 'pl.allegro.tech.boot:handlebars-spring-boot-starter:0.4.1'
+    implementation 'com.github.jknack:handlebars-springmvc:4.4.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.assertj:assertj-core:3.26.0'

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

@@ -1,28 +1,28 @@
 package cache.com.example.cachecontrol;
 
-import com.google.common.net.HttpHeaders;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import static cache.com.example.version.CacheBustingWebConfig.PREFIX_STATIC_RESOURCES;
+
 import java.time.Duration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.CacheControl;
-import org.springframework.web.servlet.HandlerInterceptor;
 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) {
-        registry.addInterceptor(new CacheHandlerInterceptor()).addPathPatterns("/");
-        registry.addInterceptor(new HandlerInterceptor() {
-            @Override
-            public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-                CacheControl cacheControl = CacheControl.maxAge(Duration.ofDays(365)).cachePublic();
-                response.addHeader(HttpHeaders.CACHE_CONTROL, cacheControl.getHeaderValue());
-                return true;
-            }
-        }).addPathPatterns("/resources/**");
+        WebContentInterceptor cacheInterceptor = new WebContentInterceptor();
+        cacheInterceptor.setCacheControl(CacheControl.noCache().cachePrivate());
+        registry.addInterceptor(cacheInterceptor)
+                .addPathPatterns("/");
+
+        WebContentInterceptor resourceInterceptor = new WebContentInterceptor();
+        CacheControl cacheControl = CacheControl.maxAge(Duration.ofDays(365)).cachePublic();
+        resourceInterceptor.setCacheControl(cacheControl);
+        registry.addInterceptor(resourceInterceptor)
+                .addPathPatterns(PREFIX_STATIC_RESOURCES + "/**");
     }
 }

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

@@ -10,6 +10,11 @@ public class EtagFilterConfiguration {
 
     @Bean
     public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
-        return new FilterRegistrationBean<>(new ShallowEtagHeaderFilter());
+        FilterRegistrationBean<ShallowEtagHeaderFilter> filterFilterRegistrationBean = new FilterRegistrationBean<>(
+                new ShallowEtagHeaderFilter());
+        filterFilterRegistrationBean.addUrlPatterns("/etag");
+        filterFilterRegistrationBean.addUrlPatterns("/resources/*");
+
+        return filterFilterRegistrationBean;
     }
 }

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

@@ -0,0 +1,26 @@
+package cache.com.example.version;
+
+import com.github.jknack.handlebars.springmvc.HandlebarsViewResolver;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+
+@Configuration
+public class HandlebarsConfig {
+
+    private final VersionHandlebarsHelper versionHandlebarsHelper;
+
+    public HandlebarsConfig(VersionHandlebarsHelper versionHandlebarsHelper) {
+        this.versionHandlebarsHelper = versionHandlebarsHelper;
+    }
+
+    @Bean
+    public ViewResolver handlebarsViewResolver() {
+        HandlebarsViewResolver viewResolver = new HandlebarsViewResolver();
+        viewResolver.registerHelper("staticUrls", versionHandlebarsHelper);
+        viewResolver.setPrefix("classpath:/templates/");
+        viewResolver.setSuffix(".html");
+
+        return viewResolver;
+    }
+}

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

@@ -1,13 +1,14 @@
 package cache.com.example.version;
 
+import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import pl.allegro.tech.boot.autoconfigure.handlebars.HandlebarsHelper;
+import org.springframework.stereotype.Component;
 
-@HandlebarsHelper
-public class VersionHandlebarsHelper {
+@Component
+public class VersionHandlebarsHelper implements Helper<Object> {
 
     private static final Logger log = LoggerFactory.getLogger(VersionHandlebarsHelper.class);
 
@@ -22,4 +23,9 @@ public String staticUrls(String path, Options options) {
         log.debug("static url : {}", path);
         return String.format("/resources/%s%s", version.getVersion(), path);
     }
+
+    @Override
+    public Object apply(Object context, Options options) {
+        return staticUrls(context.toString(), options);
+    }
 }

study/src/main/resources/application.yml

@@ -1,6 +1,3 @@
-handlebars:
-  suffix: .html
-
 server:
   tomcat:
     accept-count: 1

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

@@ -1,16 +1,17 @@
 package com.techcourse.controller;
 
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.request.Method;
+import org.apache.coyote.http11.response.HttpResponse;
 
 public abstract class AbstractController implements Controller {
 
     @Override
     public void service(HttpRequest request, HttpResponse.Builder responseBuilder) {
-        if (request.method().equals("GET")) {
+        if (request.isMethod(Method.GET)) {
             doGet(request, responseBuilder);
         }
-        if (request.method().equals("POST")) {
+        if (request.isMethod(Method.POST)) {
             doPost(request, responseBuilder);
         }
     }

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

@@ -1,7 +1,7 @@
 package com.techcourse.controller;
 
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
 
 public interface Controller {
     void service(HttpRequest request, HttpResponse.Builder responseBuilder);

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

@@ -1,11 +1,15 @@
 package com.techcourse.controller;
 
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
-import org.apache.coyote.http11.Status;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HomeController extends AbstractController {
 
+    private static final Logger log = LoggerFactory.getLogger(HomeController.class);
+
     @Override
     protected void doGet(HttpRequest request, HttpResponse.Builder responseBuilder) {
         responseBuilder.status(Status.OK)

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

@@ -5,15 +5,13 @@
 import com.techcourse.db.InMemoryUserRepository;
 import com.techcourse.model.User;
 import jakarta.servlet.http.HttpSession;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.Map;
 import org.apache.catalina.session.JSession;
 import org.apache.catalina.session.SessionManager;
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
-import org.apache.coyote.http11.HttpResponse.Builder;
-import org.apache.coyote.http11.Status;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.HttpResponse.Builder;
+import org.apache.coyote.http11.response.Status;
 
 public class LoginController extends AbstractController {
 
@@ -23,52 +21,50 @@ public LoginController() {
         this.resourceController = new ResourceController();
     }
 
-    private static void processSessionLogin(Builder responseBuilder, HttpSession session) {
-        User user = (User) Objects.requireNonNull(session).getAttribute("user");
-
-        log.info("이미 로그인한 사용자 입니다. - 아이디 : {}, 세션 ID : {}", user.getAccount(), session.getId());
-
-        responseBuilder.status(Status.FOUND)
-                .location("/index.html");
-    }
-
-    private static void processAccountLogin(Builder responseBuilder, User user) {
-        String sessionId = UUID.randomUUID().toString();
-        JSession jSession = new JSession(sessionId);
-        jSession.setAttribute("user", user);
-        SessionManager.getInstance().add(jSession);
-
-        log.info("계정 정보 로그인 성공! - 아이디 : {}, 세션 ID : {}", user.getAccount(), sessionId);
-
-        responseBuilder.status(Status.FOUND)
-                .location("/index.html")
-                .addCookie(JSession.COOKIE_NAME, sessionId);
-    }
-
     @Override
     protected void doGet(HttpRequest request, HttpResponse.Builder responseBuilder) {
-        HttpSession session = SessionManager.getInstance().getSession(request);
-        if (session != null) {
-            processSessionLogin(responseBuilder, session);
+        if (SessionManager.getInstance().getSession(request) != null) {
+            responseBuilder.status(Status.FOUND)
+                    .location("/index.html");
             return;
         }
+        resourceController.doGet(request.updatePath("login.html"), responseBuilder);
+    }
 
-        if (request.parameters().containsKey("account") && request.parameters().containsKey("password")) {
-            findValidUser(request).ifPresentOrElse(
-                    user -> processAccountLogin(responseBuilder, user),
-                    () -> responseBuilder.status(Status.FOUND).location("/401.html")
-            );
+    @Override
+    protected void doPost(HttpRequest request, Builder responseBuilder) {
+        Map<String, String> body = request.extractUrlEncodedBody();
+        if (isInvalidBody(body)) {
+            responseBuilder.status(Status.FOUND)
+                    .location("/login");
             return;
         }
+        processAccountLogin(body, responseBuilder);
+    }
 
-        resourceController.doGet(request.updatePath("login.html"), responseBuilder);
+    private boolean isInvalidBody(Map<String, String> body) {
+        return !body.containsKey("account") ||
+                !body.containsKey("password");
     }
 
-    private Optional<User> findValidUser(HttpRequest request) {
-        String account = request.parameters().get("account");
-        String password = request.parameters().get("password");
+    private void processAccountLogin(Map<String, String> body, HttpResponse.Builder responseBuilder) {
+        String account = body.get("account");
+        String password = body.get("password");
 
-        return InMemoryUserRepository.findByAccount(account)
-                .filter(user -> user.checkPassword(password));
+        InMemoryUserRepository.findByAccount(account)
+                .filter(user -> user.checkPassword(password))
+                .ifPresentOrElse(
+                        user -> processLoginSuccess(responseBuilder, user),
+                        () -> responseBuilder.status(Status.FOUND).location("/401.html"));
+    }
+
+    private void processLoginSuccess(Builder responseBuilder, User user) {
+        HttpSession session = SessionManager.getInstance().createSession(user);
+
+        log.info("로그인 성공! - 아이디 : {}, 세션 ID : {}", user.getAccount(), session.getId());
+
+        responseBuilder.status(Status.FOUND)
+                .location("/index.html")
+                .addCookie(JSession.COOKIE_NAME, session.getId());
     }
 }

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

@@ -3,9 +3,9 @@
 import com.techcourse.db.InMemoryUserRepository;
 import com.techcourse.model.User;
 import java.util.Map;
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
-import org.apache.coyote.http11.Status;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.Status;
 
 public class RegisterController extends AbstractController {
 
@@ -22,22 +22,30 @@ protected void doGet(HttpRequest request, HttpResponse.Builder responseBuilder)
 
     @Override
     protected void doPost(HttpRequest request, HttpResponse.Builder responseBuilder) {
-        Map<String, String> body = HttpRequest.extractParameters(request.body());
-
-        if (!body.containsKey("account") ||
-                !body.containsKey("password") ||
-                !body.containsKey("email")) {
+        Map<String, String> body = request.extractUrlEncodedBody();
+        if (isInvalidBody(body)) {
             responseBuilder.status(Status.BAD_REQUEST);
             return;
         }
-
-        String account = body.get("account");
-        if (InMemoryUserRepository.findByAccount(account).isPresent()) {
+        if (existsAccount(body.get("account"))) {
             responseBuilder.status(Status.CONFLICT);
             return;
         }
+        saveUserAndRedirectHome(responseBuilder, body);
+    }
+
+    private boolean isInvalidBody(Map<String, String> body) {
+        return !body.containsKey("account") ||
+                !body.containsKey("password") ||
+                !body.containsKey("email");
+    }
+
+    private boolean existsAccount(String account) {
+        return InMemoryUserRepository.findByAccount(account).isPresent();
+    }
 
-        InMemoryUserRepository.save(new User(account, body.get("password"), body.get("email")));
+    private void saveUserAndRedirectHome(HttpResponse.Builder responseBuilder, Map<String, String> body) {
+        InMemoryUserRepository.save(new User(body));
         responseBuilder.status(Status.FOUND)
                 .location("/index.html");
     }

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

@@ -2,7 +2,7 @@
 
 import java.util.Map;
 import java.util.function.Predicate;
-import org.apache.coyote.http11.HttpRequest;
+import org.apache.coyote.http11.request.HttpRequest;
 
 public class RequestMapping {
 

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

@@ -3,9 +3,9 @@
 import com.techcourse.StaticResourceReader;
 import java.io.IOException;
 import java.net.URLConnection;
-import org.apache.coyote.http11.HttpRequest;
-import org.apache.coyote.http11.HttpResponse;
-import org.apache.coyote.http11.Status;
+import org.apache.coyote.http11.request.HttpRequest;
+import org.apache.coyote.http11.response.HttpResponse;
+import org.apache.coyote.http11.response.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

tomcat/src/main/java/com/techcourse/model/User.java

@@ -1,5 +1,7 @@
 package com.techcourse.model;
 
+import java.util.Map;
+
 public class User {
 
     private final Long id;
@@ -18,6 +20,10 @@ public User(String account, String password, String email) {
         this(null, account, password, email);
     }
 
+    public User(Map<String, String> body) {
+        this(body.get("account"), body.get("password"), body.get("email"));
+    }
+
     public boolean checkPassword(String password) {
         return this.password.equals(password);
     }