[Shion, Jane] HTTP 웹 서버 2단계 - 리팩토링

README.md

@@ -52,7 +52,9 @@
 ### 요구사항 7
 - 지금까지 구현한 소스 코드는 stylesheet 파일을 지원하지 못하고 있다. Stylesheet 파일을 지원하도록 구현하도록 한다.
 
+## 2단계 - 리팩토링
 
-
-
-
+- 리팩토링 접근 방법 - 메소드 분리 및 클래스 분리
+- 클라이언트 요청 데이터를 처리하는 로직을 별도의 클래스로 분리한다.(HttpRequest)
+- 클라이언트 응답 데이터를 처리하는 로직을 별도의 클래스로 분리한다.(HttpResponse)
+- 다형성을 활용해 클라이언트 요청 URL에 대한 분기 처리를 제거한다.

build.gradle

@@ -16,11 +16,11 @@ dependencies {
     implementation 'org.apache.commons:commons-dbcp2:2.5.0'
     implementation 'org.reflections:reflections:0.9.11'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.assertj:assertj-core:3.18.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
     runtimeOnly 'com.h2database:h2:1.4.200'
 }
 
 test {
     useJUnitPlatform()
-}
+}

src/main/java/controller/BaseController.java

@@ -0,0 +1,27 @@
+package controller;
+
+import http.HttpMethod;
+import http.HttpRequest;
+import http.HttpResponse;
+
+public class BaseController implements Controller {
+
+    @Override
+    public void service(HttpRequest request, HttpResponse response) {
+        HttpMethod method = request.getMethod();
+
+        if (method.isPost()) {
+            doPost(request, response);
+        } else {
+            doGet(request, response);
+        }
+    }
+
+    public void doPost(HttpRequest request, HttpResponse response) {
+
+    }
+
+    public void doGet(HttpRequest request, HttpResponse response) {
+
+    }
+}

src/main/java/controller/Controller.java

@@ -0,0 +1,8 @@
+package controller;
+
+import http.HttpRequest;
+import http.HttpResponse;
+
+public interface Controller {
+    void service(HttpRequest request, HttpResponse response);
+}

src/main/java/controller/CreateUserController.java

@@ -0,0 +1,28 @@
+package controller;
+
+import db.DataBase;
+import model.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import http.HttpRequest;
+import http.HttpResponse;
+
+public class CreateUserController extends BaseController {
+    private static final Logger log = LoggerFactory.getLogger(CreateUserController.class);
+
+    @Override
+    public void doPost(HttpRequest request, HttpResponse response) {
+        User user = getUserFrom(request);
+        DataBase.addUser(user);
+        response.sendRedirect("/index.html");
+        log.debug("{}님이 회원가입에 성공하셨습니다.", user.getUserId());
+    }
+
+    private User getUserFrom(HttpRequest request) {
+        String userId = request.getParameter("userId");
+        String password = request.getParameter("password");
+        String name = request.getParameter("name");
+        String email = request.getParameter("email");
+        return new User(userId, password, name, email);
+    }
+}

src/main/java/controller/ListUserController.java

@@ -0,0 +1,74 @@
+package controller;
+
+import db.DataBase;
+import db.SessionDataBase;
+import model.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import util.HttpRequestUtils;
+import http.HttpRequest;
+import http.HttpResponse;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.Map;
+
+public class ListUserController extends BaseController {
+    private static final Logger log = LoggerFactory.getLogger(ListUserController.class);
+
+    @Override
+    public void doGet(HttpRequest request, HttpResponse response) {
+        String sessionId = request.getHeader("Cookie");
+        if (!isLogin(sessionId)) {
+            response.sendRedirect("/user/login.html");
+        } else {
+            String body = getBody("/user/list.html");
+            int tbodyIndex = body.indexOf("<tbody>");
+            String result = addUserList(body, tbodyIndex).toString();
+            response.forwardBody(result);
+        }
+    }
+
+    private boolean isLogin(String id) {
+        Map<String, String> cookieStringMap = HttpRequestUtils.parseCookies(id);
+        log.info("Cookie: {}", cookieStringMap.toString());
+        return SessionDataBase.isLoginUser(cookieStringMap.get("JSESSIONID"));
+    }
+
+    private String getBody(String url) {
+        byte[] body = new byte[0];
+        try {
+            body = Files.readAllBytes(new File("./webapp" + url).toPath());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new String(body);
+    }
+
+    private StringBuilder processUserList(String body, int tbodyIndex) {
+        StringBuilder result = new StringBuilder(body.substring(0, tbodyIndex + 7));
+        Collection<User> users = DataBase.findAll();
+        int id = 0;
+        for (User user : users) {
+            id++;
+            result.append("<tr><th scope=\"row\">")
+                    .append(id)
+                    .append("</th> <td>")
+                    .append(user.getUserId())
+                    .append("</td> <td>")
+                    .append(user.getName())
+                    .append("</td> <td>")
+                    .append(user.getEmail())
+                    .append("</td> <td>")
+                    .append("<a href=\"#\" class=\"btn btn - success\" role=\"button\">수정</a></td>");
+        }
+        return result;
+    }
+
+    private StringBuilder addUserList(String body, int tbodyIndex) {
+        StringBuilder result = processUserList(body, tbodyIndex);
+        return result.append(body.substring(tbodyIndex + 7));
+    }
+}

src/main/java/controller/LoginController.java

@@ -0,0 +1,32 @@
+package controller;
+
+import db.DataBase;
+import db.SessionDataBase;
+import model.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import http.HttpRequest;
+import http.HttpResponse;
+
+import java.util.UUID;
+
+public class LoginController extends BaseController {
+    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+
+    @Override
+    public void doPost(HttpRequest request, HttpResponse response) {
+        String userId = request.getParameter("userId");
+        String password = request.getParameter("password");
+        User targetUser = DataBase.findUserById(userId);
+        if (targetUser == null || !targetUser.isValidPassword(password)) {
+            response.addHeader("Set-Cookie", "loggedIn=false");
+            response.sendRedirect("/user/login_failed.html");
+            return;
+        }
+        UUID uuid = UUID.randomUUID();
+        SessionDataBase.sessions.put(uuid.toString(), targetUser);
+        response.addHeader("Set-Cookie", SessionDataBase.JSESSIONID + "=" + uuid);
+        response.sendRedirect("/index.html");
+        log.info("{}님이 로그인하셨습니다.", userId);
+    }
+}

src/main/java/db/SessionDataBase.java

@@ -0,0 +1,20 @@
+package db;
+
+import com.google.common.collect.Maps;
+import model.User;
+
+import java.util.Map;
+
+public class SessionDataBase {
+    public static Map<String, User> sessions = Maps.newHashMap();
+
+    public static final String JSESSIONID = "JSESSIONID";
+
+    public static boolean isLoginUser(String sessionId) {
+        return getSessionUser(sessionId) != null;
+    }
+
+    public static User getSessionUser(String sessionId) {
+        return sessions.get(sessionId);
+    }
+}

src/main/java/http/HttpMethod.java

@@ -0,0 +1,9 @@
+package http;
+
+public enum HttpMethod {
+    GET, POST;
+
+    public boolean isPost() {
+        return this == POST;
+    }
+}

src/main/java/http/HttpRequest.java

@@ -0,0 +1,85 @@
+package http;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import util.HttpRequestUtils;
+import util.IOUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpRequest {
+    private static final Logger log = LoggerFactory.getLogger(HttpRequest.class);
+
+    private String requestLine;
+    private final Map<String, String> headers = new HashMap<>();
+    private Map<String, String> parameters;
+
+    public HttpRequest(InputStream in) {
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            requestLine = br.readLine();
+            processHeaders(br);
+            processParameters(br);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void processHeaders(BufferedReader br) throws IOException {
+        String line = br.readLine();
+        while (!line.isEmpty()) {
+            log.debug("headers : {}", line);
+            line = br.readLine();
+            if (line == null) {
+                return;
+            }
+            parseHeader(line);
+        }
+    }
+
+    private void parseHeader(String line) {
+        String[] headerTokens = line.split(": ");
+        if (headerTokens.length == 2) {
+            headers.put(headerTokens[0], headerTokens[1]);
+        }
+    }
+
+    private void processParameters(BufferedReader br) throws IOException {
+        String[] tokens = requestLine.split(" ");
+        String queryString = "";
+        String requestBody = "";
+        if (tokens[1].contains("?")) {
+            queryString = tokens[1].substring(tokens[1].indexOf("?") + 1);
+        }
+        if (headers.get("Content-Length") != null) {
+            requestBody = IOUtils.readData(br, Integer.parseInt(headers.get("Content-Length")));
+        }
+        queryString = queryString + "&" + requestBody;
+        parameters = HttpRequestUtils.parseQueryString(queryString);
+    }
+
+    public HttpMethod getMethod() {
+        String[] tokens = requestLine.split(" ");
+        String method = tokens[0];
+        return HttpMethod.valueOf(method);
+    }
+
+    public String getPath() {
+        String[] tokens = requestLine.split(" ");
+        if (tokens[1].contains("?")) {
+            return tokens[1].substring(0, tokens[1].indexOf("?"));
+        }
+        return tokens[1];
+    }
+
+    public String getHeader(String fieldName) {
+        return headers.get(fieldName);
+    }
+
+    public String getParameter(String fieldName) {
+        return parameters.get(fieldName);
+    }
+}