[MVC 구현하기 - 3단계] 우르(김현우) 미션 제출합니다. (#535)

* feat : JSP View 구현

* feat : Json View 구현

* feat : LoginController를 Annotation으로 변경

* feat : LoginViewController를 Annotation으로 변경

* feat : LogoutController를 Annotation으로 변경

* feat : ForwardController를 Annotation 으로 수정

* feat : DispatcherServlet 위치를 app -> mvc 로 옮기기

- Controller, ManualHandlerXXX 삭제

* refactor : 렌더링 할 때, ModelAndView 로 변경

* refactor : 이전에 사용했던 getViewName 삭제

* refactor : 필터에서 UTF-8 설정하고 있으므로 JsonView에서는 삭제

* feat : UserController 추가 후 결과 확인

* refactor : 값이 한 개일 경우 text/plain 으로 반환

* refactor : I/O 작업 관련 Exception 추가

app/src/main/java/com/techcourse/DispatcherServletInitializer.java

@@ -4,6 +4,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import web.org.springframework.web.WebApplicationInitializer;
+import webmvc.org.springframework.web.servlet.mvc.DispatcherServlet;
 
 /**
  * Base class for {@link WebApplicationInitializer}

app/src/main/java/com/techcourse/controller/ForwardController.java

@@ -0,0 +1,20 @@
+package com.techcourse.controller;
+
+import context.org.springframework.stereotype.Controller;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.Objects;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
+
+@Controller
+public class ForwardController {
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public ModelAndView execute(final HttpServletRequest request, final HttpServletResponse response) {
+        return new ModelAndView(new JspView("/index.jsp"));
+    }
+}

app/src/main/java/com/techcourse/controller/LoginController.java

@@ -2,28 +2,33 @@
 
 import com.techcourse.domain.User;
 import com.techcourse.repository.InMemoryUserRepository;
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
 
-public class LoginController implements Controller {
+@Controller
+public class LoginController {
 
     private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public ModelAndView show(final HttpServletRequest req, final HttpServletResponse res) {
         if (UserSession.isLoggedIn(req.getSession())) {
-            return "redirect:/index.jsp";
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
         }
 
         return InMemoryUserRepository.findByAccount(req.getParameter("account"))
-                .map(user -> {
-                    log.info("User : {}", user);
-                    return login(req, user);
-                })
-                .orElse("redirect:/401.jsp");
+            .map(user -> {
+                log.info("User : {}", user);
+                return new ModelAndView(new JspView(login(req, user)));
+            })
+            .orElse(new ModelAndView(new JspView("redirect:/401.jsp")));
     }
 
     private String login(final HttpServletRequest request, final User user) {

app/src/main/java/com/techcourse/controller/LoginViewController.java

@@ -1,22 +1,28 @@
 package com.techcourse.controller;
 
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
 
-public class LoginViewController implements Controller {
+@Controller
+public class LoginViewController  {
 
     private static final Logger log = LoggerFactory.getLogger(LoginViewController.class);
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
-        return UserSession.getUserFrom(req.getSession())
-                .map(user -> {
-                    log.info("logged in {}", user.getAccount());
-                    return "redirect:/index.jsp";
-                })
-                .orElse("/login.jsp");
+    @RequestMapping(value = "/login/view", method = RequestMethod.GET)
+    public ModelAndView execute(final HttpServletRequest req, final HttpServletResponse res) {
+      return UserSession.getUserFrom(req.getSession())
+          .map(user -> {
+            log.info("logged in {}", user.getAccount());
+
+            return new ModelAndView(new JspView("redirect:/index.jsp"));
+          })
+          .orElse(new ModelAndView(new JspView("/login.jsp")));
     }
 }

app/src/main/java/com/techcourse/controller/LogoutController.java

@@ -1,15 +1,21 @@
 package com.techcourse.controller;
 
+import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
 
-public class LogoutController implements Controller {
+@Controller
+public class LogoutController {
 
-    @Override
-    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    public ModelAndView execute(final HttpServletRequest req, final HttpServletResponse res) {
         final var session = req.getSession();
         session.removeAttribute(UserSession.SESSION_KEY);
-        return "redirect:/";
+
+        return new ModelAndView(new JspView("redirect:/"));
     }
 }

app/src/main/java/com/techcourse/controller/UserController.java

@@ -0,0 +1,32 @@
+package com.techcourse.controller;
+
+import com.techcourse.domain.User;
+import com.techcourse.repository.InMemoryUserRepository;
+import context.org.springframework.stereotype.Controller;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JsonView;
+
+@Controller
+public class UserController {
+
+  private static final Logger log = LoggerFactory.getLogger(UserController.class);
+
+  @RequestMapping(value = "/api/user", method = RequestMethod.GET)
+  public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
+    final String account = request.getParameter("account");
+    log.debug("user id : {}", account);
+
+    final ModelAndView modelAndView = new ModelAndView(new JsonView());
+    final User user = InMemoryUserRepository.findByAccount(account)
+        .orElseThrow();
+
+    modelAndView.addObject("user", user);
+    return modelAndView;
+  }
+}

mvc/src/main/java/webmvc/org/springframework/web/servlet/View.java

@@ -7,6 +7,4 @@
 
 public interface View {
     void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception;
-
-    String getName();
 }

app/src/main/java/com/techcourse/DispatcherServlet.java → mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/DispatcherServlet.java

@@ -1,4 +1,4 @@
-package com.techcourse;
+package webmvc.org.springframework.web.servlet.mvc;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
@@ -8,14 +8,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.View;
 import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerAdapter;
 import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerAdapter;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerAdapters;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMappings;
-import webmvc.org.springframework.web.servlet.mvc.tobe.ManualHandlerAdapter;
-import webmvc.org.springframework.web.servlet.view.JspView;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -32,62 +31,37 @@ public DispatcherServlet() {
   public void init() {
     handlerMappingComposite = new HandlerMappings(
         List.of(
-            new ManualHandlerMapping(),
             new AnnotationHandlerMapping("com.techcourse")
         )
     );
 
     handlerAdapterComposite = new HandlerAdapters(
         List.of(
-            new ManualHandlerAdapter(),
             new AnnotationHandlerAdapter()
         )
     );
   }
 
   @Override
-  protected void service(final HttpServletRequest request, final HttpServletResponse response)
-      throws ServletException {
+  protected void service(
+      final HttpServletRequest request,
+      final HttpServletResponse response
+  ) throws ServletException {
     final String requestURI = request.getRequestURI();
     log.debug("Method : {}, Request URI : {}", request.getMethod(), requestURI);
 
     try {
       final Object handler = handlerMappingComposite.getHandler(request);
       final Object handleValue = handlerAdapterComposite.handle(request, response, handler);
 
-      // TODO : 3단계 리팩터링
-      renderByHandlerValueType(request, response, handleValue);
+      final ModelAndView modelAndView = (ModelAndView) handleValue;
+
+      final View view = modelAndView.getView();
+      view.render(modelAndView.getModel(), request, response);
 
     } catch (Throwable e) {
       log.error("Exception : {}", e.getMessage(), e);
       throw new ServletException(e.getMessage());
     }
   }
-
-  private void renderByHandlerValueType(
-      final HttpServletRequest request,
-      final HttpServletResponse response,
-      final Object handleValue
-  ) throws Exception {
-    if (handleValue instanceof ModelAndView) {
-      final ModelAndView modelAndView = (ModelAndView) handleValue;
-      move(modelAndView.getView().getName(), request, response);
-    }
-
-    if (handleValue instanceof String) {
-      final String viewName = (String) handleValue;
-      move(viewName, request, response);
-    }
-  }
-
-  private void move(final String viewName, final HttpServletRequest request,
-      final HttpServletResponse response) throws Exception {
-    if (viewName.startsWith(JspView.REDIRECT_PREFIX)) {
-      response.sendRedirect(viewName.substring(JspView.REDIRECT_PREFIX.length()));
-      return;
-    }
-
-    final var requestDispatcher = request.getRequestDispatcher(viewName);
-    requestDispatcher.forward(request, response);
-  }
 }