[MVC 구현 - 3단계] 베로(김은솔) 미션 제출합니다. (#553)

* refactor: 필드 타입을 배열로 변경

* feat: JsonView, JspView 구현

* refactor: 팩토리 클래스 삭제

* feat: ApplicationContext 로 의존관계 로드하도록 기능 추가

* refactor: 레거시 코드 리팩토링

* refactor: 레거시 코드 리팩토링

* refactor: ViewResolver 삭제 및 레거시 컨트롤러 리팩터링

* chore: 알맞는 패키지 이동

* test: ApplicationContext 에서 빈을 가져오도록 변경

* fix: 올바른 패키지로 이동

* refactor: 사용하지 않는 메서드 삭제

* refactor: ObjectMapper 와 JsonView 통합

* refactor: 생성자 파라미터 가변인자로 변경

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

@@ -1,28 +1,33 @@
 package com.techcourse;
 
+import context.org.springframework.context.ApplicationContext;
 import jakarta.servlet.ServletContext;
 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}
- * 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 {
 
  private static final Logger log = LoggerFactory.getLogger(DispatcherServletInitializer.class);
-
+ private static final String APPLICATION_BASE_PACKAGE = "com.techcourse";
+ private static final String INTERNAL_BASE_PACKAGE = "webmvc.org.springframework.web.servlet";
  private static final String DEFAULT_SERVLET_NAME = "dispatcher";
 
  @Override
  public void onStartup(final ServletContext servletContext) {
- final var dispatcherServlet = new DispatcherServlet();
+ final ApplicationContext applicationContext = new ApplicationContext(APPLICATION_BASE_PACKAGE,
+ INTERNAL_BASE_PACKAGE);
+ final var dispatcherServlet = new DispatcherServlet(applicationContext);
 
  final var registration = servletContext.addServlet(DEFAULT_SERVLET_NAME, dispatcherServlet);
  if (registration == null) {
  throw new IllegalStateException("Failed to register servlet with name '" + DEFAULT_SERVLET_NAME + "'. " +
- "Check if there is another servlet registered under the same name.");
+  "Check if there is another servlet registered under the same name.");
  }
 
  registration.setLoadOnStartup(1);

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;
+import webmvc.org.springframework.web.servlet.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
+
+@Controller
+public class ForwardController {
+
+ @RequestMapping(value = "/", method = RequestMethod.GET)
+ public ModelAndView showIndex(final HttpServletRequest request, final HttpServletResponse response) {
+ return new ModelAndView(new JspView("index.jsp"));
+ }
+}

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

@@ -2,36 +2,41 @@
 
 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.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.RedirectView;
 
-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 {
- if (UserSession.isLoggedIn(req.getSession())) {
- return "redirect:/index.jsp";
+ @RequestMapping(value = "/login", method = RequestMethod.POST)
+ public ModelAndView login(final HttpServletRequest request, final HttpServletResponse response) {
+ if (UserSession.isLoggedIn(request.getSession())) {
+ return new ModelAndView(new RedirectView("/index.jsp"));
  }
 
- return InMemoryUserRepository.findByAccount(req.getParameter("account"))
-  .map(user -> {
-  log.info("User : {}", user);
-  return login(req, user);
-  })
-  .orElse("redirect:/401.jsp");
+ return InMemoryUserRepository.findByAccount(request.getParameter("account"))
+ .map(user -> {
+ log.info("User : {}", user);
+ return checkPassword(request, user);
+ })
+ .orElse(new ModelAndView(new RedirectView("/401.jsp")));
  }
 
- private String login(final HttpServletRequest request, final User user) {
+ private ModelAndView checkPassword(final HttpServletRequest request, final User user) {
  if (user.checkPassword(request.getParameter("password"))) {
  final var session = request.getSession();
  session.setAttribute(UserSession.SESSION_KEY, user);
- return "redirect:/index.jsp";
+ return new ModelAndView(new RedirectView("/index.jsp"));
  }
- return "redirect:/401.jsp";
+ return new ModelAndView(new RedirectView("/401.jsp"));
  }
 }

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.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
+import webmvc.org.springframework.web.servlet.view.RedirectView;
 
-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 show(final HttpServletRequest request, final HttpServletResponse response) {
+ return UserSession.getUserFrom(request.getSession())
+ .map(user -> {
+ log.info("logged in {}", user.getAccount());
+ return new ModelAndView(new RedirectView("/index.jsp"));
+ })
+ .orElse(new ModelAndView(new JspView("/login.jsp")));
  }
 }

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.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.RedirectView;
 
-public class LogoutController implements Controller {
+@Controller
+public class LogoutController {
 
- @Override
- public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
- final var session = req.getSession();
+ @RequestMapping(value = "/logout", method = RequestMethod.GET)
+ public ModelAndView logout(final HttpServletRequest request, final HttpServletResponse response) {
+ final var session = request.getSession();
  session.removeAttribute(UserSession.SESSION_KEY);
- return "redirect:/";
+ return new ModelAndView(new RedirectView("/index.jsp"));
  }
 }

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

@@ -2,20 +2,25 @@
 
 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;
+import webmvc.org.springframework.web.servlet.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.RedirectView;
 
-public class RegisterController implements Controller {
+@Controller
+public class RegisterController {
 
- @Override
- public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
+ @RequestMapping(value = "/register", method = RequestMethod.POST)
+ public ModelAndView register(final HttpServletRequest request, final HttpServletResponse response) {
  final var user = new User(2,
-  req.getParameter("account"),
-  req.getParameter("password"),
-  req.getParameter("email"));
+ request.getParameter("account"),
+ request.getParameter("password"),
+ request.getParameter("email"));
  InMemoryUserRepository.save(user);
 
- return "redirect:/index.jsp";
+ return new ModelAndView(new RedirectView("/index.jsp"));
  }
 }

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

@@ -1,13 +1,18 @@
 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.view.ModelAndView;
+import webmvc.org.springframework.web.servlet.view.JspView;
 
-public class RegisterViewController implements Controller {
+@Controller
+public class RegisterViewController {
 
- @Override
- public String execute(final HttpServletRequest req, final HttpServletResponse res) throws Exception {
- return "/register.jsp";
+ @RequestMapping(value = "/register/view", method = RequestMethod.GET)
+ public ModelAndView show(final HttpServletRequest request, final HttpServletResponse response) {
+ return new ModelAndView(new JspView("/register.jsp"));
  }
 }