[MVC 구현하기 - 3단계] 여우(조승현) 미션 제출합니다

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.DispatcherServlet;
 
 /**
  * Base class for {@link WebApplicationInitializer}

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

@@ -0,0 +1,16 @@
+package com.techcourse.controller;
+
+import context.org.springframework.stereotype.Controller;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
+
+@Controller
+public class IndexViewController {
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
+        return "/index.jsp";
+    }
+}

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

@@ -2,28 +2,34 @@
 
 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 execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         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);
+                    return new ModelAndView(new JspView(login(req, user)));
                 })
-                .orElse("redirect:/401.jsp");
+                .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,16 +1,19 @@
 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;
 
-public class LoginViewController implements Controller {
+@Controller
+public class LoginViewController {
 
     private static final Logger log = LoggerFactory.getLogger(LoginViewController.class);
 
-    @Override
+    @RequestMapping(value = "/login/view", method = RequestMethod.GET)
     public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         return UserSession.getUserFrom(req.getSession())
                 .map(user -> {

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

@@ -1,12 +1,15 @@
 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;
 
-public class LogoutController implements Controller {
+@Controller
+public class LogoutController {
 
-    @Override
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
     public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         final var session = req.getSession();
         session.removeAttribute(UserSession.SESSION_KEY);

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

@@ -2,13 +2,16 @@
 
 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 web.org.springframework.web.bind.annotation.RequestMapping;
+import web.org.springframework.web.bind.annotation.RequestMethod;
 
-public class RegisterController implements Controller {
+@Controller
+public class RegisterController {
 
-    @Override
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
     public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         final var user = new User(2,
                 req.getParameter("account"),

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

@@ -1,12 +1,15 @@
 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;
 
-public class RegisterViewController implements Controller {
+@Controller
+public class RegisterViewController {
 
-    @Override
+    @RequestMapping(value = "/register/view", method = RequestMethod.GET)
     public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         return "/register.jsp";
     }

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

@@ -0,0 +1,33 @@
+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;
+    }
+}
+

app/src/main/java/com/techcourse/controlleradvisor/DispatcherServletAdvisor.java

@@ -1,7 +1,7 @@
 package com.techcourse.controlleradvisor;
 
-import com.techcourse.exception.HandlerAdapterNotFoundException;
-import com.techcourse.exception.HandlerNotFoundException;
+import webmvc.org.springframework.web.servlet.exception.HandlerAdapterNotFoundException;
+import webmvc.org.springframework.web.servlet.exception.HandlerNotFoundException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;

mvc/src/main/java/web/org/springframework/http/MediaType.java

@@ -1,5 +1,6 @@
 package web.org.springframework.http;
 
 public class MediaType {
+    public static final String TEXT_PLAIN_UTF8_VALUE = "text/plain;charset=UTF-8";
     public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8";
 }

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

@@ -1,8 +1,7 @@
-package com.techcourse;
+package webmvc.org.springframework.web.servlet;
 
-import com.techcourse.controlleradapter.ControllerHandlerAdapter;
-import com.techcourse.exception.HandlerAdapterNotFoundException;
-import com.techcourse.exception.HandlerNotFoundException;
+import webmvc.org.springframework.web.servlet.exception.HandlerAdapterNotFoundException;
+import webmvc.org.springframework.web.servlet.exception.HandlerNotFoundException;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
@@ -11,13 +10,10 @@
 import java.util.Objects;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import webmvc.org.springframework.web.servlet.ExceptionHandlerMapping;
-import webmvc.org.springframework.web.servlet.HandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.HandlerAdapter;
 import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationExceptionHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerExecutionHandlerAdapter;
-import webmvc.org.springframework.web.servlet.view.JspView;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -29,13 +25,11 @@ public class DispatcherServlet extends HttpServlet {
     );
 
     private List<HandlerMapping> handlerMappings = List.of(
-            new ManualHandlerMapping(),
             new AnnotationHandlerMapping("com/techcourse")
     );
 
     private List<HandlerAdapter> handlerAdapters = List.of(
-            new HandlerExecutionHandlerAdapter(),
-            new ControllerHandlerAdapter()
+            new HandlerExecutionHandlerAdapter()
     );
 
     public DispatcherServlet() {
@@ -60,8 +54,8 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
             final Object handler = findHandler(request);
 
             final HandlerAdapter handlerAdapter = findHandlerAdaptor(handler);
-            final String viewPath = handlerAdapter.invoke(handler, request, response);
-            move(viewPath, request, response);
+            final ModelAndView modelAndView = handlerAdapter.invoke(handler, request, response);
+            modelAndView.getView().render(modelAndView.getModel(), request, response);
         } catch (Throwable e) {
             handleException(request, response, e);
         }
@@ -86,19 +80,8 @@ private HandlerAdapter findHandlerAdaptor(final Object handler) {
         throw new HandlerAdapterNotFoundException("Handler Adaptor Not found");
     }
 
-    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);
-    }
-
     private void handleException(final HttpServletRequest request, final HttpServletResponse response, final Throwable e) {
-        try {
-            Object handler = null;
+        try {Object handler = null;
             for (ExceptionHandlerMapping exceptionHandlerMapping : exceptionHandlerMappings) {
                 final Object foundHandler = findExceptionHandler(e, exceptionHandlerMapping);
                 if (Objects.nonNull(foundHandler)) {
@@ -111,8 +94,8 @@ private void handleException(final HttpServletRequest request, final HttpServlet
                 throw new ServletException("ExceptionHandler Not Found.");
             }
             final HandlerAdapter handlerAdapter = findHandlerAdaptor(handler);
-            final String viewPath = handlerAdapter.invoke(handler, request, response);
-            move(viewPath, request, response);
+            final ModelAndView modelAndView = handlerAdapter.invoke(handler, request, response);
+            modelAndView.getView().render(modelAndView.getModel(), request, response);
         } catch (Exception exception) {
             log.error("Exception caused in ExceptionHandler");
             throw new RuntimeException(e);

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

@@ -1,4 +1,4 @@
-package com.techcourse.exception;
+package webmvc.org.springframework.web.servlet.exception;
 
 public class DispatcherServletException extends RuntimeException {
     public DispatcherServletException(final String message) {

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

@@ -1,4 +1,4 @@
-package com.techcourse.exception;
+package webmvc.org.springframework.web.servlet.exception;
 
 public class HandlerAdapterNotFoundException extends DispatcherServletException {
     public HandlerAdapterNotFoundException(final String message) {

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

@@ -1,4 +1,4 @@
-package com.techcourse.exception;
+package webmvc.org.springframework.web.servlet.exception;
 
 public class HandlerNotFoundException extends DispatcherServletException {
     public HandlerNotFoundException(final String message) {

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

@@ -2,10 +2,11 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import webmvc.org.springframework.web.servlet.ModelAndView;
 
 public interface HandlerAdapter {
 
     boolean support(Object handler);
 
-    String invoke(Object handler, HttpServletRequest request, HttpServletResponse response) throws Exception;
+    ModelAndView invoke(Object handler, HttpServletRequest request, HttpServletResponse response) throws Exception;
 }