[1단계 - Tomcat 구현하기] 낙낙(이낙헌) 미션 제출합니다.

study/build.gradle

@@ -19,10 +19,9 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'ch.qos.logback:logback-classic:1.5.7'
     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/GreetingController.java

@@ -1,12 +1,11 @@
 package cache.com.example;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.CacheControl;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import jakarta.servlet.http.HttpServletResponse;
-
 @Controller
 public class GreetingController {
 

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

@@ -1,13 +1,34 @@
 package cache.com.example.cachecontrol;
 
+import cache.com.example.version.ResourceVersion;
+import java.time.Duration;
+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.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.mvc.WebContentInterceptor;
 
 @Configuration
 public class CacheWebConfig implements WebMvcConfigurer {
 
+    private final ResourceVersion version;
+
+    @Autowired
+    public CacheWebConfig(ResourceVersion version) {
+        this.version = version;
+    }
+
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
+        WebContentInterceptor noCacheInterceptor = new WebContentInterceptor();
+        noCacheInterceptor.addCacheMapping(CacheControl.noCache().cachePrivate(), "/**");
+        registry.addInterceptor(noCacheInterceptor);
+
+        WebContentInterceptor cacheInterceptor = new WebContentInterceptor();
+        cacheInterceptor.addCacheMapping(CacheControl.maxAge(Duration.ofDays(365L)), "/etag");
+        cacheInterceptor.addCacheMapping(CacheControl.maxAge(Duration.ofDays(365L)).cachePublic(),
+                "/resources/" + version.getVersion() + "/**");
+        registry.addInterceptor(cacheInterceptor);
     }
 }

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

@@ -1,12 +1,29 @@
 package cache.com.example.etag;
 
+import cache.com.example.version.ResourceVersion;
+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.web.filter.ShallowEtagHeaderFilter;
 
 @Configuration
 public class EtagFilterConfiguration {
 
-//    @Bean
-//    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
-//        return null;
-//    }
+    private final ResourceVersion version;
+
+    @Autowired
+    public EtagFilterConfiguration(ResourceVersion version) {
+        this.version = version;
+    }
+
+
+    @Bean
+    public FilterRegistrationBean<ShallowEtagHeaderFilter> shallowEtagHeaderFilter() {
+        FilterRegistrationBean<ShallowEtagHeaderFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new ShallowEtagHeaderFilter());
+        registrationBean.addUrlPatterns("/etag");
+        registrationBean.addUrlPatterns("/resources/" + version.getVersion() + "/*");
+        return registrationBean;
+    }
 }

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/ResourceVersion.java

@@ -1,10 +1,9 @@
 package cache.com.example.version;
 
-import org.springframework.stereotype.Component;
-
 import jakarta.annotation.PostConstruct;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import org.springframework.stereotype.Component;
 
 @Component
 public class ResourceVersion {

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,9 +1,10 @@
-handlebars:
-  suffix: .html
-
 server:
   tomcat:
     accept-count: 1
     max-connections: 1
     threads:
+      min-spare: 2
       max: 2
+  compression:
+    enabled: true
+    min-response-size: 10

study/src/test/java/study/FileTest.java

@@ -1,5 +1,10 @@
 package study;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -26,9 +31,7 @@ class FileTest {
     @Test
     void resource_디렉터리에_있는_파일의_경로를_찾는다() {
         final String fileName = "nextstep.txt";
-
-        // todo
-        final String actual = "";
+        final String actual = getClass().getClassLoader().getResource(fileName).getPath();
 
         assertThat(actual).endsWith(fileName);
     }
@@ -40,14 +43,13 @@ class FileTest {
      * File, Files 클래스를 사용하여 파일의 내용을 읽어보자.
      */
     @Test
-    void 파일의_내용을_읽는다() {
+    void 파일의_내용을_읽는다() throws IOException {
         final String fileName = "nextstep.txt";
 
-        // todo
-        final Path path = null;
+        URL resource = getClass().getClassLoader().getResource(fileName);
+        File file = new File(resource.getPath());
 
-        // todo
-        final List<String> actual = Collections.emptyList();
+        final List<String> actual = Files.readAllLines(file.toPath());
 
         assertThat(actual).containsOnly("nextstep");
     }

study/src/test/java/study/IOStreamTest.java

@@ -1,12 +1,15 @@
 package study;
 
+import java.util.StringJoiner;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.in;
 import static org.mockito.Mockito.*;
 
 /**
@@ -49,10 +52,7 @@ class OutputStream_학습_테스트 {
             final byte[] bytes = {110, 101, 120, 116, 115, 116, 101, 112};
             final OutputStream outputStream = new ByteArrayOutputStream(bytes.length);
 
-            /**
-             * todo
-             * OutputStream 객체의 write 메서드를 사용해서 테스트를 통과시킨다
-             */
+            outputStream.write(bytes);
 
             final String actual = outputStream.toString();
 
@@ -73,11 +73,7 @@ class OutputStream_학습_테스트 {
         void BufferedOutputStream을_사용하면_버퍼링이_가능하다() throws IOException {
             final OutputStream outputStream = mock(BufferedOutputStream.class);
 
-            /**
-             * todo
-             * flush를 사용해서 테스트를 통과시킨다.
-             * ByteArrayOutputStream과 어떤 차이가 있을까?
-             */
+            outputStream.flush();
 
             verify(outputStream, atLeastOnce()).flush();
             outputStream.close();
@@ -90,14 +86,17 @@ class OutputStream_학습_테스트 {
         @Test
         void OutputStream은_사용하고_나서_close_처리를_해준다() throws IOException {
             final OutputStream outputStream = mock(OutputStream.class);
+            try (outputStream) {
+            } catch (IOException e) {
+            }
 
+            verify(outputStream, atLeastOnce()).close();
             /**
              * todo
              * try-with-resources를 사용한다.
              * java 9 이상에서는 변수를 try-with-resources로 처리할 수 있다.
              */
 
-            verify(outputStream, atLeastOnce()).close();
         }
     }
 
@@ -128,7 +127,7 @@ class InputStream_학습_테스트 {
              * todo
              * inputStream에서 바이트로 반환한 값을 문자열로 어떻게 바꿀까?
              */
-            final String actual = "";
+            final String actual = new String(inputStream.readAllBytes());
 
             assertThat(actual).isEqualTo("🤩");
             assertThat(inputStream.read()).isEqualTo(-1);
@@ -143,11 +142,9 @@ class InputStream_학습_테스트 {
         void InputStream은_사용하고_나서_close_처리를_해준다() throws IOException {
             final InputStream inputStream = mock(InputStream.class);
 
-            /**
-             * todo
-             * try-with-resources를 사용한다.
-             * java 9 이상에서는 변수를 try-with-resources로 처리할 수 있다.
-             */
+            try (inputStream) {
+            } catch (IOException e) {
+            }
 
             verify(inputStream, atLeastOnce()).close();
         }
@@ -169,12 +166,12 @@ class FilterStream_학습_테스트 {
          * 버퍼 크기를 지정하지 않으면 버퍼의 기본 사이즈는 얼마일까?
          */
         @Test
-        void 필터인_BufferedInputStream를_사용해보자() {
+        void 필터인_BufferedInputStream를_사용해보자() throws IOException {
             final String text = "필터에 연결해보자.";
             final InputStream inputStream = new ByteArrayInputStream(text.getBytes());
-            final InputStream bufferedInputStream = null;
+            final InputStream bufferedInputStream = new BufferedInputStream(inputStream);
 
-            final byte[] actual = new byte[0];
+            final byte[] actual = bufferedInputStream.readAllBytes();
 
             assertThat(bufferedInputStream).isInstanceOf(FilterInputStream.class);
             assertThat(actual).isEqualTo("필터에 연결해보자.".getBytes());
@@ -197,17 +194,21 @@ class InputStreamReader_학습_테스트 {
          * 필터인 BufferedReader를 사용하면 readLine 메서드를 사용해서 문자열(String)을 한 줄 씩 읽어올 수 있다.
          */
         @Test
-        void BufferedReader를_사용하여_문자열을_읽어온다() {
+        void BufferedReader를_사용하여_문자열을_읽어온다() throws IOException {
             final String emoji = String.join("\r\n",
                     "😀😃😄😁😆😅😂🤣🥲☺️😊",
                     "😇🙂🙃😉😌😍🥰😘😗😙😚",
                     "😋😛😝😜🤪🤨🧐🤓😎🥸🤩",
                     "");
             final InputStream inputStream = new ByteArrayInputStream(emoji.getBytes());
+            final Reader reader = new InputStreamReader(inputStream);
+            final BufferedReader bufferedReader = new BufferedReader(reader);
 
-            final StringBuilder actual = new StringBuilder();
+            String actual = bufferedReader.lines()
+                    .collect(Collectors.joining("\r\n")) + "\r\n";
 
             assertThat(actual).hasToString(emoji);
+            System.out.println(System.lineSeparator());
         }
     }
 }

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

@@ -0,0 +1,38 @@
+package com.techcourse.controller;
+
+import com.techcourse.model.User;
+import com.techcourse.service.UserService;
+import java.io.IOException;
+import org.apache.coyote.http11.handler.HttpHandler;
+import org.apache.coyote.http11.handler.ViewHttpHandler;
+import org.apache.coyote.http11.message.request.HttpRequest;
+import org.apache.coyote.http11.message.request.QueryParameters;
+import org.apache.coyote.http11.message.response.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoginController implements HttpHandler {
+
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    private final UserService service;
+    private final ViewHttpHandler viewHttpHandler;
+
+    public LoginController(UserService service) {
+        this.service = service;
+        this.viewHttpHandler = new ViewHttpHandler("login");
+    }
+
+    @Override
+    public HttpResponse handle(HttpRequest request) throws IOException {
+        QueryParameters queryParameters = request.getQueryParameters();
+
+        String account = queryParameters.getSingleValueByKey("account");
+        String password = queryParameters.getSingleValueByKey("password");
+
+        User user = service.findUserByAccountAndPassword(account, password);
+        log.info("user: {}", user);
+
+        return viewHttpHandler.handle(request);
+    }
+}