feat: Cookie 객체 분리

README.md

@@ -101,5 +101,5 @@ Thread Pool을 적용해 일정 수의 사용자 동시에 처리가 가능하
     - [x] void setAttribute(String name, Object value): 현재 세션에 value 인자로 전달되는 객체를 name 인자 이름으로 저장
     - [x] Object getAttribute(String name): 현재 세션에 name 인자로 저장되어 있는 객체 값을 찾아 반환
     - [x] void removeAttribute(String name): 현재 세션에 name 인자로 저장되어 있는 객체 값을 삭제
-    - [ ] void invalidate(): 현재 세션에 저장되어 있는 모든 값을 삭제
-- [ ] cookie 구조화
+    - [x] void invalidate(): 현재 세션에 저장되어 있는 모든 값을 삭제
+- [x] cookie 구조화

src/main/java/controller/UserController.java

@@ -1,18 +1,14 @@
 package controller;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
+import annotation.RequestMapping;
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Template;
 import com.github.jknack.handlebars.io.ClassPathTemplateLoader;
 import com.github.jknack.handlebars.io.TemplateLoader;
-
-import annotation.RequestMapping;
 import dto.JoinRequestDto;
 import dto.UserResponseDto;
 import http.ContentType;
@@ -46,11 +42,6 @@ protected void doPost(HttpRequest httpRequest, HttpResponse httpResponse) {
 
     @Override
     protected void doGet(HttpRequest httpRequest, HttpResponse httpResponse) {
-        String cookie = httpRequest.getCookie();
-        if (Objects.isNull(cookie)) {
-            unauthorized(httpResponse);
-            return;
-        }
         HttpSession session = httpRequest.getSession();
         String logined = String.valueOf(session.getAttribute("logined"));
         if (Objects.isNull(logined) || !"true".equals(logined)) {

src/main/java/http/Cookie.java

@@ -0,0 +1,39 @@
+package http;
+
+import static java.util.stream.Collectors.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+public class Cookie {
+    private String name;
+    private String value;
+
+    public static List<Cookie> listOf(String cookie) {
+        if(Objects.isNull(cookie) || cookie.isEmpty()){
+            return new ArrayList<>();
+        }
+        return Arrays.stream(cookie.split("; "))
+                .map(value -> new Cookie(value.split("=")[0], value.split("=")[1]))
+                .collect(toList());
+    }
+
+    public static Cookie of(String name, String value) {
+        return new Cookie(name, value);
+    }
+
+    private Cookie(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

src/main/java/http/HttpHeaders.java

@@ -39,7 +39,7 @@ public HttpHeaders() {
         this.headers = new HashMap<>();
     }
 
-    public HttpHeaders(Map<String, String> headers) {
+    private HttpHeaders(Map<String, String> headers) {
         this.headers = headers;
     }
 

src/main/java/http/HttpSession.java

@@ -6,4 +6,6 @@ public interface HttpSession {
     Object getAttribute(String name);
     void removeAttribute(String name);
     void invalidate();
+    boolean isNew();
+    void toOld();
 }

src/main/java/http/SimpleHttpSession.java

@@ -1,22 +1,24 @@
 package http;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class SimpleHttpSession implements HttpSession {
-    private static Map<String, HttpSession> HTTP_SESSION_STORAGE = new HashMap<>();
+    private static Map<String, HttpSession> HTTP_SESSION_STORAGE = new ConcurrentHashMap<>();
 
     private String id;
     private Map<String, Object> attributes;
+    private boolean isNew;
 
     public static HttpSession getHttpSessionStorage(String sessionId) {
         return HTTP_SESSION_STORAGE.getOrDefault(sessionId, new SimpleHttpSession());
     }
 
     private SimpleHttpSession() {
         this.id = UUID.randomUUID().toString();
-        this.attributes = new HashMap<>();
+        this.attributes = new ConcurrentHashMap<>();
+        this.isNew = true;
         HTTP_SESSION_STORAGE.put(id, this);
     }
 
@@ -44,4 +46,14 @@ public void removeAttribute(String name) {
     public void invalidate() {
         attributes.clear();
     }
+
+    @Override
+    public boolean isNew(){
+        return isNew;
+    }
+
+    @Override
+    public void toOld(){
+        this.isNew = false;
+    }
 }

src/main/java/http/request/HttpRequest.java

@@ -21,7 +21,5 @@ public interface HttpRequest {
 
     HttpBody getBody();
 
-    String getCookie();
-
     HttpSession getSession();
 }

src/main/java/http/request/SimpleHttpRequest.java

@@ -2,11 +2,10 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
+import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
+import http.Cookie;
 import http.HttpBody;
 import http.HttpHeaders;
 import http.HttpMethod;
@@ -19,6 +18,7 @@ public class SimpleHttpRequest implements HttpRequest {
     private HttpHeaders headers;
     private HttpBody httpBody;
     private HttpSession httpSession;
+    private List<Cookie> cookies;
     private String rawRequest;
 
     public static SimpleHttpRequest of(BufferedReader bufferedReader) throws IOException {
@@ -42,34 +42,34 @@ private static String extractRequestHeader(BufferedReader bufferedReader) throws
     }
 
     private static String joinRequest(String startLine, String httpHeaders, String requestBody) {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(startLine);
-        stringBuilder.append(System.lineSeparator());
-        stringBuilder.append(httpHeaders);
-        stringBuilder.append(System.lineSeparator());
-        stringBuilder.append(System.lineSeparator());
-        stringBuilder.append(requestBody);
-        return stringBuilder.toString();
+        return startLine
+                + System.lineSeparator()
+                + httpHeaders
+                + System.lineSeparator()
+                + System.lineSeparator()
+                + requestBody;
     }
 
     private SimpleHttpRequest(StartLine startLine, HttpHeaders httpHeaders, HttpBody httpBody,
         String rawRequest) {
         this.startLine = startLine;
         this.headers = httpHeaders;
         this.httpBody = httpBody;
-        String cookie = getCookie();
-        if (Objects.isNull(cookie)) {
-            this.httpSession = SimpleHttpSession.getHttpSessionStorage("");
-        } else {
-            Map<String, String> cookies = Arrays.stream(cookie.split("; "))
-                    .map(value -> value.split("="))
-                    .collect(Collectors.toMap(arr -> arr[0], arr -> arr[1]));
-            String logined = cookies.get("JSESSIONID");
-            this.httpSession = SimpleHttpSession.getHttpSessionStorage(logined);
-        }
+        String cookie = headers.getCookie();
+        this.cookies = Cookie.listOf(cookie);
+        String jSessionId = getSessionId();
+        this.httpSession = SimpleHttpSession.getHttpSessionStorage(jSessionId);
         this.rawRequest = rawRequest;
     }
 
+    private String getSessionId() {
+        Cookie jSessionCookie = cookies.stream()
+            .filter(cookie -> "JSESSIONID".equals(cookie.getName()))
+            .findFirst()
+            .orElse(null);
+        return Objects.isNull(jSessionCookie) ? "" : jSessionCookie.getValue();
+    }
+
     @Override
     public HttpMethod getMethod() {
         return startLine.getHttpMethod();
@@ -95,11 +95,6 @@ public HttpBody getBody() {
         return httpBody;
     }
 
-    @Override
-    public String getCookie() {
-        return headers.getCookie();
-    }
-
     @Override
     public HttpSession getSession() {
         return httpSession;

src/main/java/webserver/RequestHandler.java

@@ -31,7 +31,6 @@ public RequestHandler(Socket connectionSocket) {
     public void run() {
         logger.debug("New Client Connect! Connected IP : {}, Port : {}", connection.getInetAddress(),
             connection.getPort());
-
         try (
             InputStream inputStream = connection.getInputStream();
             OutputStream outputStream = connection.getOutputStream();
@@ -54,9 +53,11 @@ private void doDispatch(DataOutputStream dos, HttpRequest httpRequest, HttpRespo
             HttpServlet dispatcherServlet = new DispatcherServlet();
             dispatcherServlet.service(httpRequest, httpResponse);
         } finally {
-            // TODO: 2020/11/21 나중에 분리 생각하기
             HttpSession session = httpRequest.getSession();
-            httpResponse.setCookie("JSESSIONID=" + session.getId() + "; Path=/");
+            if(session.isNew()){
+                httpResponse.setCookie("JSESSIONID=" + session.getId() + "; Path=/");
+                session.toOld();
+            }
             httpResponse.send(dos);
         }
     }

src/test/java/http/HttpHeadersTest.java

@@ -22,13 +22,7 @@ void create() {
             "Accept-Language: ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7" + "\n" +
             "Cookie: _ga=GA1.1.1818307867.1604572661" + "\n";
 
-        Map<String, String> headers = Arrays.stream(headerRequest.split(System.lineSeparator()))
-            .map(header -> header.split(": "))
-            .collect(Collectors.toMap(
-                pair -> pair[0], pair -> pair[1]
-            ));
-
-        HttpHeaders httpHeaders = new HttpHeaders(headers);
+        HttpHeaders httpHeaders = HttpHeaders.from(headerRequest);
 
         assertAll(
             () -> assertThat(httpHeaders.getHeader("Host")).isEqualTo("localhost:8080"),