[비밥] WAS 4단계 미션 제출합니다.

.gitignore

@@ -18,4 +18,6 @@ bin/
 .idea
 *.iws
 *.iml
-*.ipr
+*.ipr
+
+*/out/*

README.md

@@ -47,4 +47,10 @@
     - [x] 로그인하지 않은 상태이면 로그인 페이지(login.html)로 이동한다.
 
 #### 요구사항 3
-- [x] HttpSession API 중 getId(), setAttribute(String name, Object value), getAttribute(String name), removeAttribute(String name), invalidate() 를 구현한다.
+- [x] HttpSession API 중 getId(), setAttribute(String name, Object value), getAttribute(String name), removeAttribute(String name), invalidate() 를 구현한다.
+
+
+
+### 4단계
+#### 요구사항
+- [x] 멀티모듈로 분리

build.gradle

@@ -1,25 +1,30 @@
-plugins {
-    id 'java'
-    id 'idea'
-    id 'eclipse'
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+
+    }
 }
 
-version = '1.0.0'
-sourceCompatibility = 1.8
+subprojects {
+    group 'com.example'
+    version '1.0'
 
-repositories {
-    mavenCentral()
-}
+    apply plugin: 'java'
 
-dependencies {
-    implementation 'com.google.guava:guava:29.0-jre'
-    implementation 'ch.qos.logback:logback-classic:1.2.3'
-    implementation 'com.github.jknack:handlebars:4.2.0'
-    implementation 'org.springframework:spring-core:5.2.6.RELEASE'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
-}
+    sourceCompatibility = 1.8
+
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        testCompile 'org.junit.jupiter:junit-jupiter:5.6.2'
+        testCompile 'org.assertj:assertj-core:3.16.1'
+    }
 
-test {
-    useJUnitPlatform()
+    test {
+        useJUnitPlatform()
+    }
 }

client/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile project(":web-server")
+}

client/src/main/java/elbop/ClientApplication.java

@@ -0,0 +1,9 @@
+package elbop;
+
+import server.webserver.WebServer;
+
+public class ClientApplication {
+    public static void main(String[] args) throws Exception {
+        WebServer.main(ClientApplication.class, args);
+    }
+}

src/main/java/client/controller/LoginController.java → client/src/main/java/elbop/controller/LoginController.java

@@ -1,15 +1,18 @@
-package client.controller;
+package elbop.controller;
 
-import db.DataBase;
-import model.User;
-import web.controller.Controller;
-import web.request.HttpRequest;
-import web.response.HttpResponse;
-import web.view.HandlebarView;
-import web.view.ModelAndView;
+import elbop.db.DataBase;
+import elbop.model.User;
+import server.web.controller.Controller;
+import server.web.controller.RequestMapping;
+import server.web.request.HttpMethod;
+import server.web.request.HttpRequest;
+import server.web.response.HttpResponse;
+import server.web.view.HandlebarView;
+import server.web.view.ModelAndView;
 
 import java.util.Optional;
 
+@RequestMapping(uri = "/user/login", httpMethod = HttpMethod.POST)
 public class LoginController implements Controller {
 
     @Override

src/main/java/client/controller/UserCreateController.java → client/src/main/java/elbop/controller/UserCreateController.java

@@ -1,14 +1,17 @@
-package client.controller;
+package elbop.controller;
 
-import db.DataBase;
-import model.User;
-import web.controller.Controller;
-import web.request.HttpRequest;
-import web.request.RequestBody;
-import web.response.HttpResponse;
-import web.view.HandlebarView;
-import web.view.ModelAndView;
+import elbop.db.DataBase;
+import elbop.model.User;
+import server.web.controller.Controller;
+import server.web.controller.RequestMapping;
+import server.web.request.HttpMethod;
+import server.web.request.HttpRequest;
+import server.web.request.RequestBody;
+import server.web.response.HttpResponse;
+import server.web.view.HandlebarView;
+import server.web.view.ModelAndView;
 
+@RequestMapping(uri = "/user/create", httpMethod = HttpMethod.POST)
 public class UserCreateController implements Controller {
     @Override
     public ModelAndView doService(final HttpRequest httpRequest, final HttpResponse httpResponse) {

src/main/java/client/controller/UserListController.java → client/src/main/java/elbop/controller/UserListController.java

@@ -1,16 +1,19 @@
-package client.controller;
+package elbop.controller;
 
-import db.DataBase;
-import web.HttpSession;
-import web.controller.Controller;
-import web.model.Model;
-import web.request.HttpRequest;
-import web.response.HttpResponse;
-import web.view.HandlebarView;
-import web.view.ModelAndView;
+import elbop.db.DataBase;
+import server.web.HttpSession;
+import server.web.controller.Controller;
+import server.web.controller.RequestMapping;
+import server.web.model.Model;
+import server.web.request.HttpMethod;
+import server.web.request.HttpRequest;
+import server.web.response.HttpResponse;
+import server.web.view.HandlebarView;
+import server.web.view.ModelAndView;
 
 import java.util.Optional;
 
+@RequestMapping(uri = "/user/list", httpMethod = HttpMethod.GET)
 public class UserListController implements Controller {
 
     @Override

src/main/java/db/DataBase.java → client/src/main/java/elbop/db/DataBase.java

@@ -1,7 +1,7 @@
-package db;
+package elbop.db;
 
 import com.google.common.collect.Maps;
-import model.User;
+import elbop.model.User;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/model/User.java → client/src/main/java/elbop/model/User.java

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

src/main/java/model/Users.java → client/src/main/java/elbop/model/Users.java

@@ -1,4 +1,4 @@
-package model;
+package elbop.model;
 
 import java.util.List;