[MVC - Step 2] 효오 미션 제출합니다.

nextstep-mvc/src/main/java/nextstep/mvc/DispatcherServlet.java

@@ -58,7 +58,10 @@ private void renderByHandler(HttpServletRequest req, HttpServletResponse resp, H
         try {
             ModelAndView mav = handler.handle(req, resp);
             View view = mav.getView();
-            view.render(mav.getModel(), req, resp);
+
+            if (view != null) {
+                view.render(mav.getModel(), req, resp);
+            }
         } catch (Exception e) {
             logger.debug(e.getMessage());
             throw new ServletException();

nextstep-mvc/src/main/java/nextstep/mvc/tobe/JsonView.java

@@ -1,12 +1,43 @@
 package nextstep.mvc.tobe;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import nextstep.web.support.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 public class JsonView implements View {
+    private static final Logger logger = LoggerFactory.getLogger(JsonView.class);
+
     @Override
     public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+
+        if (model.isEmpty()) {
+            return;
+        }
+
+        String json = toJson(model);
+        logger.debug("Json : {}", json);
+        response.getWriter().write(json);
+    }
+
+    private String toJson(Map<String, ?> model) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+
+        if (model.size() == 1) {
+            Object value = model.values()
+                    .stream()
+                    .findFirst()
+                    .orElseThrow(IllegalArgumentException::new);
+
+            return mapper.writeValueAsString(value);
+        }
 
+        return mapper.writeValueAsString(model);
     }
 }

slipp/src/main/java/slipp/ManualHandlerMapping.java

@@ -6,7 +6,6 @@
 import nextstep.mvc.tobe.HandlerExecution;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import slipp.controller.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -20,13 +19,6 @@ public class ManualHandlerMapping implements HandlerMapping {
 
     @Override
     public void initialize() {
-        mappings.put("/", new HomeController());
-        mappings.put("/users", new ListUserController());
-        mappings.put("/users/profile", new ProfileController());
-        mappings.put("/users/create", new CreateUserController());
-        mappings.put("/users/updateForm", new UpdateFormUserController());
-        mappings.put("/users/update", new UpdateUserController());
-
         logger.info("Initialized Request Mapping!");
         mappings.keySet().forEach(path -> {
             logger.info("Path : {}, Controller : {}", path, mappings.get(path).getClass());

slipp/src/main/java/slipp/controller/CreateUserController.java

@@ -1,24 +1,38 @@
 package slipp.controller;
 
-import slipp.domain.User;
-import slipp.support.db.DataBase;
-import nextstep.mvc.asis.Controller;
+import nextstep.mvc.tobe.JspView;
+import nextstep.mvc.tobe.ModelAndView;
+import nextstep.mvc.tobe.RedirectView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.annotation.RequestMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import slipp.domain.User;
+import slipp.support.db.DataBase;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-public class CreateUserController implements Controller {
-    private static final Logger log = LoggerFactory.getLogger(CreateUserController.class);
+@Controller
+public class CreateUserController {
+    private static final Logger logger = LoggerFactory.getLogger(CreateUserController.class);
+
+    @RequestMapping(value = "/users/form", method = RequestMethod.GET)
+    public ModelAndView signUpPage(HttpServletRequest request, HttpServletResponse response) {
+        return new ModelAndView(new JspView("/user/form.jsp"));
+    }
+
+    @RequestMapping(value = "/users/create", method = RequestMethod.POST)
+    public ModelAndView signUp(HttpServletRequest request, HttpServletResponse response) {
+        User user = new User(request.getParameter("userId"),
+                request.getParameter("password"),
+                request.getParameter("name"),
+                request.getParameter("email"));
 
-    @Override
-    public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-        User user = new User(req.getParameter("userId"), req.getParameter("password"), req.getParameter("name"),
-                req.getParameter("email"));
-        log.debug("User : {}", user);
+        logger.debug("User : {}", user);
 
         DataBase.addUser(user);
-        return "redirect:/";
+        return new ModelAndView(new RedirectView("/"));
     }
 }

slipp/src/main/java/slipp/controller/HomeController.java

@@ -1,15 +1,24 @@
 package slipp.controller;
 
+import nextstep.mvc.tobe.JspView;
+import nextstep.mvc.tobe.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.annotation.RequestMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import slipp.support.db.DataBase;
-import nextstep.mvc.asis.Controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-public class HomeController implements Controller {
-    @Override
-    public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-        req.setAttribute("users", DataBase.findAll());
-        return "home.jsp";
+@Controller
+public class HomeController {
+    private static final Logger logger = LoggerFactory.getLogger(HomeController.class);
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public ModelAndView home(HttpServletRequest request, HttpServletResponse response) {
+        request.setAttribute("users", DataBase.findAll());
+        return new ModelAndView(new JspView("home.jsp"));
     }
 }

slipp/src/main/java/slipp/controller/LoginController.java

@@ -1,30 +1,50 @@
 package slipp.controller;
 
-import nextstep.mvc.asis.Controller;
+import nextstep.mvc.tobe.JspView;
+import nextstep.mvc.tobe.ModelAndView;
+import nextstep.mvc.tobe.RedirectView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.annotation.RequestMethod;
+import slipp.controller.UserSessionUtils;
 import slipp.domain.User;
 import slipp.support.db.DataBase;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-public class LoginController implements Controller {
-    @Override
-    public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-        String userId = req.getParameter("userId");
-        String password = req.getParameter("password");
+@Controller
+public class LoginController {
+    private static final String USER_ID = "userId";
+    private static final String PASSWORD = "password";
+    private static final String LOGIN_FAILED = "loginFailed";
+
+    @RequestMapping(value = "/users/loginForm", method = RequestMethod.GET)
+    public ModelAndView loginPage(HttpServletRequest request, HttpServletResponse response) {
+        return new ModelAndView(new JspView("/user/login.jsp"));
+    }
+
+    @RequestMapping(value = "/users/login", method = RequestMethod.POST)
+    public ModelAndView login(HttpServletRequest request, HttpServletResponse response) {
+        String userId = request.getParameter(USER_ID);
+        String password = request.getParameter(PASSWORD);
         User user = DataBase.findUserById(userId);
-        if (user == null) {
-            req.setAttribute("loginFailed", true);
-            return "/user/login.jsp";
-        }
-        if (user.matchPassword(password)) {
-            HttpSession session = req.getSession();
+
+        if (user != null && user.matchPassword(password)) {
+            HttpSession session = request.getSession();
             session.setAttribute(UserSessionUtils.USER_SESSION_KEY, user);
-            return "redirect:/";
-        } else {
-            req.setAttribute("loginFailed", true);
-            return "/user/login.jsp";
+            return new ModelAndView(new RedirectView("/"));
         }
+
+        request.setAttribute(LOGIN_FAILED, true);
+        return new ModelAndView(new JspView("/user/login.jsp"));
+    }
+
+    @RequestMapping(value = "/users/logout", method = RequestMethod.GET)
+    public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
+        HttpSession session = request.getSession();
+        session.removeAttribute(UserSessionUtils.USER_SESSION_KEY);
+        return new ModelAndView(new RedirectView("/"));
     }
 }