[2단계 - 로그인 구현하기] 상돌(이상진) 미션 제출합니다.

study/build.gradle

@@ -19,10 +19,11 @@ 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 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
 
     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,13 +1,38 @@
 package cache.com.example.cachecontrol;
 
+import java.time.Duration;
+
 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) {
+        registry.addInterceptor(getNoCacheInterceptor());
+        registry.addInterceptor(getResourceCacheInterceptor());
+    }
+
+    // add no-cache, private cache
+    private WebContentInterceptor getNoCacheInterceptor() {
+        CacheControl cacheControl = CacheControl.noCache().cachePrivate();
+
+        return createWebContentInterceptorByCache(cacheControl, "/");
+    }
+
+    private WebContentInterceptor getResourceCacheInterceptor() {
+        CacheControl cacheControl = CacheControl.maxAge(Duration.ofDays(365)).cachePublic();
+
+        return createWebContentInterceptorByCache(cacheControl, "/resources/**");
+    }
+
+    private WebContentInterceptor createWebContentInterceptorByCache(CacheControl cacheControl, String path) {
+        WebContentInterceptor webContentInterceptor = new WebContentInterceptor();
+        webContentInterceptor.addCacheMapping(cacheControl, path);
+        return 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() {
+		FilterRegistrationBean<ShallowEtagHeaderFilter> registrationBean = new FilterRegistrationBean<>();
+		registrationBean.setFilter(new ShallowEtagHeaderFilter());
+		registrationBean.addUrlPatterns("/etag", "/resources/*");
+		return registrationBean;
+	}
 }

study/src/main/resources/application.yml

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

tomcat/src/main/java/com/techcourse/Application.java

@@ -4,8 +4,8 @@
 
 public class Application {
 
-    public static void main(String[] args) {
-        final var tomcat = new Tomcat();
-        tomcat.start();
-    }
+	public static void main(String[] args) {
+		final var tomcat = new Tomcat();
+		tomcat.start();
+	}
 }

tomcat/src/main/java/com/techcourse/db/InMemoryUserRepository.java

@@ -1,27 +1,39 @@
 package com.techcourse.db;
 
-import com.techcourse.model.User;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class InMemoryUserRepository {
-
-    private static final Map<String, User> database = new ConcurrentHashMap<>();
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-    static {
-        final User user = new User(1L, "gugu", "password", "hkkang@woowahan.com");
-        database.put(user.getAccount(), user);
-    }
-
-    public static void save(User user) {
-        database.put(user.getAccount(), user);
-    }
+import com.techcourse.model.User;
 
-    public static Optional<User> findByAccount(String account) {
-        return Optional.ofNullable(database.get(account));
-    }
+public class InMemoryUserRepository {
 
-    private InMemoryUserRepository() {}
+    private static final Logger log = LoggerFactory.getLogger(InMemoryUserRepository.class);
+	private static final Map<String, User> database = new ConcurrentHashMap<>();
+
+	static {
+		final User user = new User(1L, "gugu", "password", "hkkang@woowahan.com");
+		database.put(user.getAccount(), user);
+	}
+
+	public static void save(User user) {
+		if (database.containsKey(user.getAccount())) {
+			throw new IllegalArgumentException("account is already exist");
+		}
+		database.put(user.getAccount(), user);
+	}
+
+	public static Optional<User> findByAccount(String account) {
+        if (account == null) {
+            log.info("account not exist");
+            return Optional.empty();
+        }
+		return Optional.ofNullable(database.get(account));
+	}
+
+	private InMemoryUserRepository() {
+	}
 }

tomcat/src/main/java/com/techcourse/exception/UncheckedServletException.java

@@ -2,7 +2,7 @@
 
 public class UncheckedServletException extends RuntimeException {
 
-    public UncheckedServletException(Exception e) {
-        super(e);
-    }
+	public UncheckedServletException(Exception e) {
+		super(e);
+	}
 }

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

@@ -1,38 +1,59 @@
 package com.techcourse.model;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class User {
 
-    private final Long id;
-    private final String account;
-    private final String password;
-    private final String email;
-
-    public User(Long id, String account, String password, String email) {
-        this.id = id;
-        this.account = account;
-        this.password = password;
-        this.email = email;
-    }
-
-    public User(String account, String password, String email) {
-        this(null, account, password, email);
-    }
-
-    public boolean checkPassword(String password) {
-        return this.password.equals(password);
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", account='" + account + '\'' +
-                ", email='" + email + '\'' +
-                ", password='" + password + '\'' +
-                '}';
-    }
+    private static final Logger log = LoggerFactory.getLogger(User.class);
+	private final Long id;
+	private final String account;
+	private final String password;
+	private final String email;
+
+	public User(Long id, String account, String password, String email) {
+		validateIsNotEmptyValue(account, password, email);
+		this.id = id;
+		this.account = account;
+		this.password = password;
+		this.email = email;
+	}
+
+	private void validateIsNotEmptyValue(String account, String password, String email) {
+		if (account == null || account.isBlank()) {
+			throw new IllegalArgumentException("Account is empty");
+		}
+		if (password == null || password.isBlank()) {
+			throw new IllegalArgumentException("Password is empty");
+		}
+		if (email == null || email.isBlank()) {
+			throw new IllegalArgumentException("Email is empty");
+		}
+	}
+
+	public User(String account, String password, String email) {
+		this(null, account, password, email);
+	}
+
+	public boolean checkPassword(String password) {
+        if (password == null) {
+            log.info("password not exist");
+            return false;
+        }
+		return this.password.equals(password);
+	}
+
+	public String getAccount() {
+		return account;
+	}
+
+	@Override
+	public String toString() {
+		return "User{" +
+			"id=" + id +
+			", account='" + account + '\'' +
+			", email='" + email + '\'' +
+			", password='" + password + '\'' +
+			'}';
+	}
 }