[MVC 구현하기 - 3단계] 밀리(김미성) 미션 제출합니다.

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

@@ -4,10 +4,11 @@
 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}
- * implementations that register a {@link DispatcherServlet} in the servlet context.
+ * Base class for {@link WebApplicationInitializer} implementations that register a {@link DispatcherServlet} in the
+ * servlet context.
  */
 public class DispatcherServletInitializer implements WebApplicationInitializer {
 

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

@@ -0,0 +1,18 @@
+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 ForwardController {
+
+    private static final String PATH = "/index.jsp";
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public String execute(final HttpServletRequest request, final HttpServletResponse response) {
+        return PATH;
+    }
+}

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

@@ -2,17 +2,20 @@
 
 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;
 
-public class LoginController implements Controller {
+@Controller
+public class LoginController {
 
     private static final Logger log = LoggerFactory.getLogger(LoginController.class);
 
-    @Override
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
     public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
         if (UserSession.isLoggedIn(req.getSession())) {
             return "redirect:/index.jsp";

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.GET)
     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,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(final HttpServletRequest request, final 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/ModelAndView.java

@@ -6,10 +6,10 @@
 
 public class ModelAndView {
 
-    private final View view;
+    private final Object view;
     private final Map<String, Object> model;
 
-    public ModelAndView(final View view) {
+    public ModelAndView(final Object view) {
         this.view = view;
         this.model = new HashMap<>();
     }
@@ -27,7 +27,7 @@ public Map<String, Object> getModel() {
         return Collections.unmodifiableMap(model);
     }
 
-    public View getView() {
+    public Object getView() {
         return view;
     }
 }

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;
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import webmvc.org.springframework.web.servlet.ModelAndView;
@@ -17,7 +18,10 @@
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerAdapterException;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMappingException;
-import webmvc.org.springframework.web.servlet.mvc.tobe.ManualHandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.tobe.JsonViewResolver;
+import webmvc.org.springframework.web.servlet.mvc.tobe.JspViewResolver;
+import webmvc.org.springframework.web.servlet.mvc.tobe.ViewResolver;
+import webmvc.org.springframework.web.servlet.mvc.tobe.ViewResolverException;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -26,29 +30,31 @@ public class DispatcherServlet extends HttpServlet {
 
     private final List<HandlerMapping> handlerMappings = new ArrayList<>();
     private final List<HandlerAdapter> handlerAdapters = new ArrayList<>();
-
-    public DispatcherServlet() {
-    }
+    private final List<ViewResolver> viewResolvers = new ArrayList<>();
 
     @Override
     public void init() {
         initHandlerMappings();
         initHandlerAdapters();
+        initViewResolvers();
     }
 
     private void initHandlerMappings() {
-        handlerMappings.add(new WrappedManualHandlerMapping());
-        handlerMappings.add(new AnnotationHandlerMapping(getClass().getPackageName()));
+        handlerMappings.add(new AnnotationHandlerMapping());
         for (final HandlerMapping handlerMapping : handlerMappings) {
             handlerMapping.initialize();
         }
     }
 
     private void initHandlerAdapters() {
-        handlerAdapters.add(new ManualHandlerAdapter());
         handlerAdapters.add(new AnnotationHandlerAdapter());
     }
 
+    private void initViewResolvers() {
+        viewResolvers.add(new JspViewResolver());
+        viewResolvers.add(new JsonViewResolver());
+    }
+
     @Override
     protected void service(final HttpServletRequest request, final HttpServletResponse response)
             throws ServletException {
@@ -59,9 +65,11 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
             final Object handler = getHandler(request);
             final HandlerAdapter handlerAdapter = getHandlerAdapter(handler);
             final ModelAndView modelAndView = handlerAdapter.handle(handler, request, response);
-            final View view = modelAndView.getView();
+            final View view = getView(modelAndView);
             final Map<String, Object> model = modelAndView.getModel();
             view.render(model, request, response);
+        } catch (final HandlerMappingException | ViewResolverException e) {
+            throw e;
         } catch (final Throwable e) {
             log.error("Exception : {}", e.getMessage(), e);
             throw new ServletException(e.getMessage());
@@ -70,9 +78,9 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
 
     private Object getHandler(final HttpServletRequest request) {
         for (final HandlerMapping handlerMapping : handlerMappings) {
-            final Object handler = handlerMapping.getHandler(request);
-            if (handler != null) {
-                return handler;
+            final Optional<Object> handler = handlerMapping.getHandler(request);
+            if (handler.isPresent()) {
+                return handler.get();
             }
         }
         throw new HandlerMappingException("해당 요청에 대한 핸들러가 없습니다.");
@@ -86,4 +94,13 @@ private HandlerAdapter getHandlerAdapter(final Object handler) {
         }
         throw new HandlerAdapterException("해당 요청에 대한 핸들러 어댑터가 없습니다.");
     }
+
+    private View getView(final ModelAndView modelAndView) {
+        final Object view = modelAndView.getView();
+        return viewResolvers.stream()
+                .filter(viewResolver -> viewResolver.supports(view))
+                .findFirst()
+                .map(viewResolver -> viewResolver.resolve(view))
+                .orElseThrow(() -> new ViewResolverException("해당 요청에 대한 view를 처리할 수 없습니다."));
+    }
 }