Step2 PR (#40)

* 핸들러 매핑 람다로 구현

* 요구사항 3시작

* 요구사항3 적용완료

* 회원가입 완료 및 Socket Close 해결

* 전체 삭제 이전 임시 백업

* Step1

* MethodType Enum 추가

* list.html Mustache 문법 적용완료

* HandlerArgumehtResolver 적용

* Step2 PR

* 충돌 해결시 발생했던 중복 클래스 제거 및 피드백1, 피드백 3 반영

* 피드백 3 반영

* Method 추가 시, 중복적인 로직 제거

Author: lkhlkh23

src/main/java/db/DataBase.java

@@ -12,7 +12,7 @@ public class DataBase {
 
     static {
         /* 로그인 반복적으로 수행하는 것이 불편해서 테스트 아이디 생성 */
-        users.put("javajigi", new User("javajigi", "password", "MrPobi", "slipp@naver.com"));
+        users.put("javajigi", new User("javajigi", "password", "Pobi", "slipp@naver.com"));
     }
 
     public static void addUser(User user) {

src/main/java/model/HttpHeader.java

@@ -0,0 +1,38 @@
+package model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpHeader {
+
+    private Map<String, String> header;
+
+    public HttpHeader() {
+        header = new HashMap<>();
+    }
+
+    public HttpHeader(Map<String, String> header) {
+        this.header = header;
+    }
+
+    public void addHeader(String key, String value) {
+        this.header.put(key, value);
+    }
+
+    public String obtainHeader(String headerName) {
+        return this.header.get(headerName);
+    }
+
+    public boolean isResource() {
+        return header.get("Accept").contains("text/css");
+    }
+
+    public int obtainContentLength() {
+        if(header.containsKey("Content-Length")) {
+            return Integer.parseInt(header.get("Content-Length"));
+        }
+
+        return 0;
+    }
+
+}

src/main/java/model/HttpRequest.java

@@ -0,0 +1,83 @@
+package model;
+
+import util.HttpRequestUtils;
+import util.ParameterConverter;
+
+import java.util.Map;
+
+public class HttpRequest {
+
+    private static final String SPLIT_BLANK = " ";
+    private static final String QUESTION_MARK = "?";
+    private static final String SPLIT_QUESTION = "\\?";
+
+    private Mapping mapping;
+    private HttpHeader httpHeader;
+    private Map<String, String> body;
+
+    public HttpRequest(String path, MethodType method, String body, HttpHeader httpHeader) {
+        this.httpHeader = httpHeader;
+
+        if(path.contains(QUESTION_MARK)) {
+            body = path.split(SPLIT_QUESTION)[1];
+        }
+
+        this.body = HttpRequestUtils.parseQueryString(body);
+        this.mapping = new Mapping(path, method);
+    }
+
+    public Mapping getMapping() {
+        return mapping;
+    }
+
+    public Map<String, String> getBody() {
+        return body;
+    }
+
+    public String obtainHeader(String headerName) {
+        return httpHeader.obtainHeader(headerName);
+    }
+
+    public void addHeader(String headerName, String headerValue) {
+        httpHeader.addHeader(headerName, headerValue);
+    }
+
+    public boolean isResource() {
+        return httpHeader.isResource();
+    }
+
+    /*
+       @param  Header의 첫 라인
+       @return HttpHeader 에서 URL 추출
+    */
+    public static String obtainURL(String line) {
+        return line.split(SPLIT_BLANK)[1];
+    }
+
+    /*
+       @param  Header의 첫 라인
+       @return HttpHeader 에서 MethodType 추출
+    */
+    public static MethodType obtainMethod(String line) {
+        return MethodType.obtainMethodTypeByName(line.split(SPLIT_BLANK)[0]);
+    }
+
+    /*
+       @param
+       @return 파라미터의 필드값 반환 (URL Encoding 처리된 문자는 URL Decoding)
+    */
+    public String obtainParamElement(String field) {
+        if(!body.containsKey(field)) {
+            return "";
+        }
+        return ParameterConverter.urlDecoding(body.get(field));
+    }
+
+    @Override
+    public String toString() {
+        return "HttpRequest{" +
+                "mapping=" + mapping +
+                ", body=" + body +
+                '}';
+    }
+}

src/main/java/model/HttpResponse.java

@@ -0,0 +1,113 @@
+package model;
+
+import org.slf4j.Logger;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+public class HttpResponse {
+
+    private static final Logger logger = getLogger(HttpResponse.class);
+
+    private byte[] body;
+    private HttpHeader httpHeader;
+    private static Map<String, String> statusMapper = new HashMap<>();
+    private static Map<String, Consumer<DataOutputStream>> statusProcessor = new HashMap<>();
+
+    static {
+        statusMapper.put("200", "OK");
+        statusMapper.put("302", "FOUND");
+    }
+
+    public HttpResponse(byte[] body) {
+        this.httpHeader = new HttpHeader();
+        this.body = body;
+
+        initStatusMapper();
+    }
+
+    public void initStatusMapper() {
+        statusProcessor.put("200", (dos) -> response200Header(dos));
+        statusProcessor.put("302", (dos) -> response302Header(dos));
+    }
+
+    public byte[] getBody() {
+        return body;
+    }
+
+    public void setBody(byte[] body) {
+        this.body = body;
+    }
+
+    public HttpResponse addHeader(String key, String value) {
+        httpHeader.addHeader(key, value);
+        return this;
+    }
+
+    /*
+       @param
+       @return response에 대한 공통적인 속성을 작성한 템플
+    */
+    public HttpResponse responseHeader(DataOutputStream dos, boolean isResource) throws IOException {
+
+        String statusCode = httpHeader.obtainHeader("status");
+        dos.writeBytes(String.format("HTTP/1.1 %s %s\r\n", statusCode, obtainStatus(statusCode)));
+        String contentType = "Content-Type: text/html;charset=utf-8\r\n";
+        if(isResource) {
+            contentType = "Content-Type: text/css\r\n";
+        }
+        dos.writeBytes(contentType);
+
+        /* status에 따라 response 구성이 조금씩 다르기 때문에 다른 부분은 람다로 처리 */
+        statusProcessor.get(statusCode).accept(dos);
+        dos.writeBytes(String.format("Set-Cookie: %s\r\n", httpHeader.obtainHeader("Set-Cookie")));
+        dos.writeBytes("\r\n");
+
+        return this;
+    }
+
+    public String obtainStatus(String statusCode) {
+        return statusMapper.get(statusCode);
+    }
+
+    private void response302Header(DataOutputStream dos) {
+        try {
+            dos.writeBytes(String.format("Location: %s\r\n", httpHeader.obtainHeader("Location")));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void response200Header(DataOutputStream dos) {
+        try {
+            dos.writeBytes(String.format("Content-Length: %d\r\n", this.body.length));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public HttpResponse responseBody(DataOutputStream dos) {
+        try {
+            dos.write(this.body, 0, this.body.length);
+            dos.flush();
+        } catch (IOException e) {
+            logger.error(e.getMessage());
+            e.getStackTrace();
+        }
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "HttpResponse{" +
+                "body=" + Arrays.toString(body) +
+                ", httpHeader=" + httpHeader +
+                '}';
+    }
+}

src/main/java/model/Mapping.java

@@ -4,12 +4,14 @@
 
 public class Mapping {
 
-    private static final String RESOURCE_MARK = ".css";
+    public static final String RESOURCE_MARK = ".css";
+    public static final String SPLIT_QUESTION = "\\?";
+    public static final String QUESTION_MARK = "?";
 
-    private String method;
+    private MethodType method;
     private String path;
 
-    public Mapping(String path, String method) {
+    public Mapping(String path, MethodType method) {
         this.method = method;
         this.path = path;
     }
@@ -22,6 +24,19 @@ public boolean isResource() {
         return path.contains(RESOURCE_MARK);
     }
 
+    public static Mapping of(String path, String method) {
+        /* GET Method Parameter 존재할 경우에만 동작! */
+        if(path.contains(QUESTION_MARK)) {
+            path = initParams(path);
+        }
+
+        return new Mapping(path, MethodType.obtainMethodTypeByName(method));
+    }
+
+    private static String initParams(String path) {
+        return path.split(SPLIT_QUESTION)[0];
+    }
+
     @Override
     public String toString() {
         return "Mapping{" +

src/main/java/model/MethodType.java

@@ -0,0 +1,46 @@
+package model;
+
+import setting.GetMapping;
+import setting.PostMapping;
+
+import java.lang.reflect.Method;
+
+public enum MethodType {
+
+    GET("GET", GetMapping.class), POST("POST", PostMapping.class), NOT("NOT", null);
+
+    private String methodType;
+    private Class clazz;
+
+    MethodType(String methodType, Class clazz) {
+        this.methodType = methodType;
+        this.clazz = clazz;
+    }
+
+    public static MethodType obtainMethodTypeByName(String methodName) {
+        for (MethodType value : values()) {
+            if(value.methodType.equals(methodName)) {
+                return value;
+            }
+        }
+        return NOT;
+    }
+
+    public static MethodType obtainMethodTypeByClass(Class clazz) {
+        for (MethodType value : values()) {
+            if(value.clazz == clazz) {
+                return value;
+            }
+        }
+        return NOT;
+    }
+
+    public static Class obtainMethodClass(Method method) {
+        for (MethodType value : MethodType.values()) {
+            if(method.getDeclaredAnnotation(value.clazz) != null) {
+                return value.clazz;
+            }
+        }
+        return NOT.clazz;
+    }
+}

src/main/java/model/RequestEntity.java

@@ -17,7 +17,7 @@ public class RequestEntity {
     private Map<String, String> body = new HashMap<>();
     private Map<String, String> headerInfo;
 
-    public RequestEntity(String path, String method, String body, Map<String, String> headerInfo) {
+    public RequestEntity(String path, MethodType method, String body, Map<String, String> headerInfo) {
         this.headerInfo = headerInfo;
 
         /* POST Method Parameter 존재할 경우에만 동작 */

src/main/java/model/ResponseEntity.java

@@ -1,11 +1,9 @@
 package model;
 
 import org.slf4j.Logger;
-import webserver.ClientModel;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;

src/main/java/security/ClientSession.java

@@ -1,5 +1,6 @@
 package security;
 
+import model.User;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,6 +18,10 @@ public ClientSession registerSession(Object object) {
         return this;
     }
 
+    public User getLoginUser() {
+        return (User) session.get(LOGIN_SESSION);
+    }
+
     public boolean hasSession(String sessionName) {
         return session.containsKey(sessionName);
     }

src/main/java/security/HttpSession.java

@@ -1,5 +1,6 @@
 package security;
 
+import model.User;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,4 +43,8 @@ public boolean isLoginUser() {
         }
         return true;
     }
+
+    public User obtainLoginUser() {
+        return httpSessions.get(this.jSessionId).getLoginUser();
+    }
 }