[MVC 구현 - 3단계] 홍실(홍혁준) 미션 제출합니다.

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

@@ -4,7 +4,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import web.org.springframework.web.WebApplicationInitializer;
-import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
+import webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping.AnnotationHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.DispatcherServlet;
 
 /**
@@ -20,7 +20,6 @@ public class DispatcherServletInitializer implements WebApplicationInitializer {
  @Override
  public void onStartup(final ServletContext servletContext) {
  final var dispatcherServlet = new DispatcherServlet(
- new ManualHandlerMapping(),
  new AnnotationHandlerMapping(getClass().getPackage().getName())
  );
 

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

@@ -2,28 +2,47 @@
 
 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(method = RequestMethod.GET, value = "/login/view")
+ public ModelAndView show(final HttpServletRequest req, final HttpServletResponse res) {
+ final String viewName = UserSession.getUserFrom(req.getSession())
+ .map(user -> {
+ log.info("logged in {}", user.getAccount());
+ return "redirect:/index.jsp";
+ })
+ .orElse("/login.jsp");
+ return new ModelAndView(new JspView(viewName));
+ }
+
+ @RequestMapping(method = RequestMethod.POST, value = "/login")
+ 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);
- })
- .orElse("redirect:/401.jsp");
+ final String viewName = InMemoryUserRepository.findByAccount(req.getParameter("account"))
+ .map(user -> {
+ log.info("User : {}", user);
+ return login(req, user);
+ })
+ .orElse("redirect:/401.jsp");
+
+ return new ModelAndView(new JspView(viewName));
  }
 
  private String login(final HttpServletRequest request, final User user) {

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(method = RequestMethod.POST, value = "/logout")
+ public ModelAndView show(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/RegisterController.java

@@ -24,7 +24,7 @@ public ModelAndView save(final HttpServletRequest req, final HttpServletResponse
  return new ModelAndView(new JspView("redirect:/index.jsp"));
  }
 
- @RequestMapping(value = "/register", method = RequestMethod.GET)
+ @RequestMapping(value = "/register/view", method = RequestMethod.GET)
  public ModelAndView show(HttpServletRequest req, HttpServletResponse res) {
  return new ModelAndView(new JspView("/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(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/domain/User.java

@@ -18,10 +18,22 @@ public boolean checkPassword(String password) {
  return this.password.equals(password);
  }
 
+ public long getId() {
+ return id;
+ }
+
  public String getAccount() {
  return account;
  }
 
+ public String getPassword() {
+ return password;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
  @Override
  public String toString() {
  return "User{" +

app/src/test/java/com/techcourse/DispatcherServletTest.java

@@ -20,8 +20,8 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.DispatcherServlet;
+import webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping.AnnotationHandlerMapping;
 
 class DispatcherServletTest {
 
@@ -30,7 +30,6 @@ class DispatcherServletTest {
  @BeforeEach
  void setUp() {
  dispatcherServlet = new DispatcherServlet(
- new ManualHandlerMapping(),
  new AnnotationHandlerMapping(getClass().getPackage().getName())
  );
  dispatcherServlet.init();
@@ -54,6 +53,7 @@ void show() throws ServletException, IOException {
  //given
  final ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
  final RequestDispatcher requestDispatcher = mock(RequestDispatcher.class);
+ when(request.getRequestURI()).thenReturn("/register/view");
  when(request.getMethod()).thenReturn("GET");
  when(request.getRequestDispatcher(argumentCaptor.capture()))
  .thenReturn(requestDispatcher);

app/src/test/java/com/techcourse/controller/RegisterControllerTest.java

@@ -56,10 +56,12 @@ void save() {
  final Optional<User> savedUser = InMemoryUserRepository.findByAccount(account);
  final Optional<User> expectedUser = Optional.of(
  new User(unvalidatedId, account, password, email));
+ final JspView expectedJspView = new JspView("redirect:/index.jsp");
 
  assertAll(
- () -> assertThat(actual.getView().getViewName())
- .isEqualTo("redirect:/index.jsp"),
+ () -> assertThat(actual.getView())
+ .usingRecursiveComparison()
+ .isEqualTo(expectedJspView),
  () -> assertThat(savedUser)
  .usingRecursiveComparison()
  .ignoringFields("value.id")

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

@@ -2,11 +2,10 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import java.util.Map;
 
 public interface View {
- void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception;
 
- String getViewName();
+ void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response)
+ throws Exception;
 }

mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/DispatcherServlet.java

@@ -4,10 +4,12 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import webmvc.org.springframework.web.servlet.ModelAndView;
-import webmvc.org.springframework.web.servlet.view.JspView;
+import webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping.HandlerMapping;
+import webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping.HandlerMappings;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -35,21 +37,15 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
  final var handler = handlerMappings.getHandler(request);
  final var modelAndView = handler.handle(request, response);
  move(modelAndView, request, response);
- } catch (final Throwable e) {
+ } catch (final Exception e) {
  log.error("Exception : {}", e.getMessage(), e);
  throw new ServletException(e.getMessage());
  }
  }
 
  private void move(final ModelAndView modelAndView, final HttpServletRequest request,
  final HttpServletResponse response) throws Exception {
- final String viewName = modelAndView.getView().getViewName();
- 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);
+ final Map<String, Object> model = modelAndView.getModel();
+ modelAndView.getView().render(model, request, response);
  }
 }