[ALL] 프로젝트 패키지 구조 변경

build.gradle

@@ -16,6 +16,12 @@ dependencies {
     implementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.assertj:assertj-core:3.16.1'
 
+    testImplementation 'org.mockito:mockito-core:4.11.0'
+    testImplementation('org.mockito:mockito-junit-jupiter:4.11.0') {
+        exclude group: 'org.junit.jupiter'
+        exclude group: 'org.junit.platform'
+    }
+
 
 }
 

src/main/java/db/Database.java → src/main/java/app/db/Database.java

@@ -1,6 +1,6 @@
-package db;
+package app.db;
 
-import model.User;
+import app.model.User;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/app/handler/RegisterHandlerImpl.java

@@ -0,0 +1,25 @@
+package app.handler;
+
+import app.db.Database;
+import app.model.User;
+import http.HttpMethod;
+import http.request.HttpRequest;
+import web.handler.DynamicViewHandler;
+import web.response.ViewResponse;
+
+public class RegisterHandlerImpl extends DynamicViewHandler {
+    public RegisterHandlerImpl() {
+        super(HttpMethod.GET,
+                "/create");
+    }
+
+    @Override
+    public ViewResponse handle(HttpRequest request) {
+        String userId = request.getQueryValue("userId");
+        String password = request.getQueryValue("password");
+        String name = request.getQueryValue("name");
+        String email = request.getQueryValue("email");
+        Database.addUser(new User(userId, password, name, email));
+        return ViewResponse.of("/login");
+    }
+}

src/main/java/model/User.java → src/main/java/app/model/User.java

@@ -1,4 +1,4 @@
-package model;
+package app.model;
 
 public class User {
     private String userId;

src/main/java/webserver/WebServer.java → src/main/java/bootstrap/WebServer.java

@@ -1,14 +1,20 @@
-package webserver;
+package bootstrap;
 
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
+import config.DependencyLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import web.dispatch.ConnectionHandler;
 
 public class WebServer {
     private static final Logger logger = LoggerFactory.getLogger(WebServer.class);
     private static final int DEFAULT_PORT = 8080;
+    private static final DependencyLoader LOADER = new DependencyLoader();
+    private static final ExecutorService executor = Executors.newFixedThreadPool(32);
 
     public static void main(String args[]) throws Exception {
         int port = 0;
@@ -25,8 +31,15 @@ public static void main(String args[]) throws Exception {
             // 클라이언트가 연결될때까지 대기한다.
             Socket connection;
             while ((connection = listenSocket.accept()) != null) {
-                Thread thread = new Thread(new RequestHandler(connection));
-                thread.start();
+                Socket singleConnection = connection;
+                executor.submit(() -> {
+                    ConnectionHandler connectionHandler = new ConnectionHandler(LOADER.dispatcher,
+                            LOADER.exceptionHandlerMapping,
+                            LOADER.httpResponseConverter,
+                            LOADER.httpRequestConverter,
+                            singleConnection);
+                    connectionHandler.run();
+                });
             }
         }
     }

src/main/java/config/AppConfig.java

@@ -0,0 +1,94 @@
+package config;
+
+import app.handler.RegisterHandlerImpl;
+import exception.ExceptionHandlerMapping;
+import exception.handler.ErrorExceptionHandler;
+import exception.handler.ServiceExceptionHandler;
+import exception.handler.UnhandledErrorHandler;
+import http.request.HttpBufferedReaderRequestConverter;
+import http.request.HttpRequestConverter;
+import http.response.HttpBufferedStreamResponseConverter;
+import http.response.HttpResponseConverter;
+import web.dispatch.Dispatcher;
+import web.handler.StaticContentHandler;
+import web.handler.WebHandler;
+import web.posthandler.StaticContentResponseHandler;
+import web.posthandler.ViewResponseHandler;
+import web.posthandler.WebHandlerResponseHandler;
+
+import java.util.List;
+
+public class AppConfig {
+    //Http
+    public HttpBufferedReaderRequestConverter httpBufferedReaderRequestConverter(){
+        return new HttpBufferedReaderRequestConverter();
+    }
+
+    public HttpBufferedStreamResponseConverter httpBufferedStreamResponseConverter(){
+        return new HttpBufferedStreamResponseConverter();
+    }
+
+    public HttpRequestConverter httpRequestConverter(){
+        return httpBufferedReaderRequestConverter();
+    }
+    public HttpResponseConverter httpResponseConverter(){
+        return httpBufferedStreamResponseConverter();
+    }
+
+
+    //Web
+    public Dispatcher wasServlet(){
+        return new Dispatcher(
+                webHandlerList(),
+                webHandlerResponseHandlerList()
+        );
+    }
+
+    private List<WebHandler> webHandlerList(){
+        return List.of(
+                staticContentHandler(),
+                registerHandlerImpl()
+        );
+    }
+    private RegisterHandlerImpl registerHandlerImpl(){
+        return new RegisterHandlerImpl();
+    }
+
+    private List<WebHandlerResponseHandler> webHandlerResponseHandlerList(){
+        return List.of(
+                staticContentResponseHandler(),
+                viewResponseHandler()
+        );
+    }
+    private StaticContentHandler staticContentHandler(){
+        return new StaticContentHandler();
+    }
+    private ViewResponseHandler viewResponseHandler(){
+        return new ViewResponseHandler();
+    }
+    private StaticContentResponseHandler staticContentResponseHandler(){
+        return new StaticContentResponseHandler();
+    }
+
+
+    //Exception
+    public ExceptionHandlerMapping exceptionHandlerMapping(){
+        return new ExceptionHandlerMapping(
+                List.of(
+                        serviceExceptionHandler(),
+                        errorExceptionHandler(),
+                        unhandledErrorHandler()
+                )
+        );
+    }
+
+    private ServiceExceptionHandler serviceExceptionHandler(){
+        return new ServiceExceptionHandler();
+    }
+    private UnhandledErrorHandler unhandledErrorHandler(){
+        return new UnhandledErrorHandler();
+    }
+    private ErrorExceptionHandler errorExceptionHandler(){
+        return new ErrorExceptionHandler();
+    }
+}

src/main/java/config/DependencyLoader.java

@@ -0,0 +1,23 @@
+package config;
+
+import exception.ExceptionHandlerMapping;
+import http.request.HttpRequestConverter;
+import http.response.HttpResponseConverter;
+import web.dispatch.Dispatcher;
+
+public class DependencyLoader {
+    private final AppConfig appConfig;
+
+    public final HttpRequestConverter httpRequestConverter;
+    public final HttpResponseConverter httpResponseConverter;
+    public final ExceptionHandlerMapping exceptionHandlerMapping;
+    public final Dispatcher dispatcher;
+
+    public DependencyLoader(){
+        this.appConfig = new AppConfig();
+        this.httpRequestConverter = appConfig.httpRequestConverter();
+        this.httpResponseConverter = appConfig.httpResponseConverter();
+        this.exceptionHandlerMapping = appConfig.exceptionHandlerMapping();
+        this.dispatcher = appConfig.wasServlet();
+    }
+}

src/main/java/config/VariableConfig.java

@@ -0,0 +1,9 @@
+package config;
+
+import java.util.List;
+
+public class VariableConfig {
+    public static final List<String> STATIC_RESOURCE_ROOTS = List.of(
+            "./src/main/resources",
+            "./src/main/resources/static");
+}

src/main/java/exception/ErrorCode.java

@@ -0,0 +1,44 @@
+package exception;
+
+
+import http.HttpStatus;
+
+public enum ErrorCode {
+    /* Internal Error */
+    INTERNAL_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "500_INTERNAL", "서버 내부 오류가 발생했습니다."),
+
+    /* Request Error */
+    INVALID_INPUT(HttpStatus.BAD_REQUEST, "400_INVALID_INPUT", "입력 값이 올바르지 않습니다."),
+    MISSING_PARAMETER(HttpStatus.BAD_REQUEST, "400_MISSING_PARAM", "필수 파라미터가 누락되었습니다."),
+    VALIDATION_FAILED(HttpStatus.BAD_REQUEST, "400_VALIDATION_FAIL", "유효성 검증에 실패했습니다."),
+
+    FORBIDDEN(HttpStatus.FORBIDDEN, "403_FORBIDDEN", "권한이 없습니다."),
+
+    NO_SUCH_RESOURCE(HttpStatus.NOT_FOUND, "404_NO_SUCH_RESOURCE", "요청한 리소스를 찾을 수 없습니다."),
+
+    METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED, "405_METHOD_NOT_ALLOWED", "허용되지 않은 HTTP 메서드입니다."),
+    ;
+
+
+    private final HttpStatus status;
+    private final String code;
+    private final String message;
+
+    public HttpStatus getStatus() {
+        return status;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    ErrorCode(HttpStatus status, String code, String message) {
+        this.status = status;
+        this.code = code;
+        this.message = message;
+    }
+}

src/main/java/exception/ErrorException.java

@@ -0,0 +1,26 @@
+package exception;
+
+public class ErrorException extends RuntimeException {
+    private final ErrorCode errorCode;
+    private final Throwable throwable;
+
+    public ErrorException(String message) {
+        super(message);
+        this.errorCode = ErrorCode.INTERNAL_ERROR;
+        this.throwable = null;
+    }
+
+    public ErrorException(String message, Throwable t) {
+        super(message);
+        this.errorCode = ErrorCode.INTERNAL_ERROR;
+        this.throwable = t;
+    }
+
+    public ErrorCode getErrorCode() {
+        return errorCode;
+    }
+
+    public Throwable getThrowable() {
+        return throwable;
+    }
+}

src/main/java/exception/ExceptionHandler.java

@@ -0,0 +1,8 @@
+package exception;
+
+import java.net.Socket;
+
+public interface ExceptionHandler {
+    boolean support(Throwable e);
+    void handle(Throwable e, Socket connection);
+}

src/main/java/webserver/exception/ExceptionHandlerMapping.java → src/main/java/exception/ExceptionHandlerMapping.java

@@ -1,4 +1,4 @@
-package webserver.exception;
+package exception;
 
 import java.net.Socket;
 import java.util.List;
@@ -10,9 +10,9 @@ public ExceptionHandlerMapping (List<ExceptionHandler> handlers){
         this.handlers = handlers;
     }
 
-    public void handle(Exception e, Socket connection){
-        ExceptionHandler handlerAdaptor = handlers.stream().filter(handler -> handler.support(e)).findFirst().orElseThrow();
-        handlerAdaptor.handle(e, connection);
+    public void handle(Throwable e, Socket connection){
+        ExceptionHandler handler = handlers.stream().filter(h -> h.support(e)).findFirst().orElseThrow();
+        handler.handle(e, connection);
     }
 
 }

src/main/java/exception/ServiceException.java

@@ -0,0 +1,19 @@
+package exception;
+
+public class ServiceException extends RuntimeException {
+    private final ErrorCode errorCode;
+
+    public ServiceException(ErrorCode errorCode) {
+        super(errorCode.getMessage());
+        this.errorCode = errorCode;
+    }
+
+    public ServiceException(ErrorCode errorCode, String customMsg) {
+        super((customMsg == null || customMsg.isBlank()) ? errorCode.getMessage() : customMsg);
+        this.errorCode = errorCode;
+    }
+
+    public ErrorCode getErrorCode() {
+        return errorCode;
+    }
+}