[MVC 구현하기 - 3단계] 말랑(신동훈) 미션 제출합니다. (#573)

* JspView 구현

* JsonView 구현

* 레거시 Controller 제거

* stage 3

(cherry picked from commit b23158a)

* stage 4

(cherry picked from commit 90270df)

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

@@ -7,10 +7,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import webmvc.org.springframework.web.servlet.ModelAndView;
-import webmvc.org.springframework.web.servlet.mvc.asis.Controller;
+import webmvc.org.springframework.web.servlet.View;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerExecutorComposite;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMappingComposite;
-import webmvc.org.springframework.web.servlet.view.JspView;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -21,8 +20,8 @@ public class DispatcherServlet extends HttpServlet {
  private final HandlerExecutorComposite handlerExecutorComposite;
 
  public DispatcherServlet() {
- this.handlerMappingComposite = new HandlerMappingComposite(new ManualHandlerMapping());
- this.handlerExecutorComposite = new HandlerExecutorComposite(new ControllerInterfaceHandlerExecutor());
+ this.handlerMappingComposite = new HandlerMappingComposite();
+ this.handlerExecutorComposite = new HandlerExecutorComposite();
  }
 
  @Override
@@ -39,22 +38,11 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
  try {
  final var handler = handlerMappingComposite.getHandler(request);
  ModelAndView modelAndView = handlerExecutorComposite.handle(request, response, handler);
- final var viewName = modelAndView.getView().viewName();
- move(viewName, request, response);
+ 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 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);
- }
 }

app/src/main/java/com/techcourse/controller/IndexController.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;
+import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
+
+@Controller
+public class IndexController {
+
+ @RequestMapping(value = "/", method = RequestMethod.GET)
+ public ModelAndView index(final HttpServletRequest req, final HttpServletResponse res) {
+ return new ModelAndView(new JspView("/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) {
  if (UserSession.isLoggedIn(req.getSession())) {
- return "redirect:/index.jsp";
+ return new ModelAndView(new JspView("redirect:/index.jsp"));
  }
 
- return InMemoryUserRepository.findByAccount(req.getParameter("account"))
+ String view = InMemoryUserRepository.findByAccount(req.getParameter("account"))
  .map(user -> {
  log.info("User : {}", user);
  return login(req, user);
  })
  .orElse("redirect:/401.jsp");
+ return new ModelAndView(new JspView(view));
  }
 
  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())
+ @RequestMapping(value = "/login/view", method = RequestMethod.GET)
+ public ModelAndView execute(final HttpServletRequest req, final HttpServletResponse res) {
+ String view = UserSession.getUserFrom(req.getSession())
  .map(user -> {
  log.info("logged in {}", user.getAccount());
  return "redirect:/index.jsp";
  })
  .orElse("/login.jsp");
+ return new ModelAndView(new JspView(view));
  }
 }

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

@@ -1,15 +1,20 @@
 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.POST)
+ 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(LoginViewController.class);
+
+ @RequestMapping(value = "/api/user", method = RequestMethod.GET)
+ public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
+ String account = request.getParameter("account");
+ log.debug("user id : {}", account);
+
+ ModelAndView modelAndView = new ModelAndView(new JsonView());
+ User user = InMemoryUserRepository.findByAccount(account)
+ .orElseThrow();
+
+ modelAndView.addObject("user", user);
+ return modelAndView;
+ }
+}

mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java

@@ -1,15 +1,29 @@
 package webmvc.org.springframework.web.servlet.view;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import webmvc.org.springframework.web.servlet.View;
-
+import java.io.PrintWriter;
 import java.util.Map;
+import web.org.springframework.http.MediaType;
+import webmvc.org.springframework.web.servlet.View;
 
 public class JsonView implements View {
 
+ private static final ObjectMapper objectMapper = new ObjectMapper();
+
  @Override
- public void render(final Map<String, ?> model, final HttpServletRequest request, HttpServletResponse response) throws Exception {
+ public void render(final Map<String, ?> model, final HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+ String value;
+ if (model.size() == 1) {
+ value = String.valueOf(model.values().toArray()[0]);
+ } else {
+ value = objectMapper.writeValueAsString(model);
+ }
+ PrintWriter writer = response.getWriter();
+ writer.write(value);
  }
 
  @Override

mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java

@@ -22,14 +22,16 @@ public JspView(final String viewName) {
 
  @Override
  public void render(final Map<String, ?> model, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
- // todo
-
  model.keySet().forEach(key -> {
  log.debug("attribute name : {}, value : {}", key, model.get(key));
  request.setAttribute(key, model.get(key));
  });
-
- // todo
+ 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);
  }
 
  @Override