[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.asis.ControllerHandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.DispatcherServlet;
 import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
 import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerExecutionHandlerAdapter;
 
@@ -21,9 +21,7 @@ public class DispatcherServletInitializer implements WebApplicationInitializer {
  @Override
  public void onStartup(final ServletContext servletContext) {
  final DispatcherServlet dispatcherServlet = new DispatcherServlet();
- dispatcherServlet.addHandlerMapping(new ManualHandlerMapping());
  dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping("com"));
- dispatcherServlet.addHandlerAdapter(new ControllerHandlerAdapter());
  dispatcherServlet.addHandlerAdapter(new HandlerExecutionHandlerAdapter());
 
  final var registration = servletContext.addServlet(DEFAULT_SERVLET_NAME, dispatcherServlet);

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

@@ -0,0 +1,19 @@
+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,35 +2,45 @@
 
 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.mvc.asis.Controller;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 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) {
- if (UserSession.isLoggedIn(req.getSession())) {
+
+ @RequestMapping(value = "/login", method = RequestMethod.POST)
+ public ModelAndView login(final HttpServletRequest request,
+ final HttpServletResponse response) {
+ final String path = execute(request, response);
+ return new ModelAndView(new JspView(path));
+ }
+
+ private String execute(final HttpServletRequest request,
+ final HttpServletResponse response) {
+ if (UserSession.isLoggedIn(request.getSession())) {
  return "redirect:/index.jsp";
  }
 
- return InMemoryUserRepository.findByAccount(req.getParameter("account"))
+ return InMemoryUserRepository.findByAccount(request.getParameter("account"))
  .map(user -> {
  log.info("User : {}", user);
- return login(req, user);
+ return login(request, user);
  })
  .orElse("redirect:/401.jsp");
  }
 
- private String login(final HttpServletRequest request, final User user) {
+ private String login(final HttpServletRequest request,
+ final User user) {
  if (user.checkPassword(request.getParameter("password"))) {
  final var session = request.getSession();
  session.setAttribute(UserSession.SESSION_KEY, user);
@@ -39,8 +49,4 @@ private String login(final HttpServletRequest request, final User user) {
  return "redirect:/401.jsp";
  }
 
- @RequestMapping(value = "/login", method = RequestMethod.GET)
- public ModelAndView login(HttpServletRequest req, HttpServletResponse res) {
- return new ModelAndView(new JspView(execute(req, res)));
- }
 }

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

@@ -1,32 +1,34 @@
 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 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.mvc.asis.Controller;
 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) {
- return UserSession.getUserFrom(req.getSession())
+ @RequestMapping(value = "/login/view", method = RequestMethod.GET)
+ public ModelAndView loginView(final HttpServletRequest request,
+ final HttpServletResponse response) {
+ final String path = execute(request, response);
+ return new ModelAndView(new JspView(path));
+ }
+
+ private String execute(final HttpServletRequest request,
+ final HttpServletResponse response) {
+ return UserSession.getUserFrom(request.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 loginView(HttpServletRequest req, HttpServletResponse res) {
- String path = execute(req, res);
- return new ModelAndView(new JspView(path));
- }
 }

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

@@ -1,25 +1,20 @@
 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.mvc.asis.Controller;
 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) {
- final var session = req.getSession();
+ @RequestMapping(value = "/logout", method = RequestMethod.GET)
+ public ModelAndView logout(HttpServletRequest request, HttpServletResponse response) {
+ final var session = request.getSession();
  session.removeAttribute(UserSession.SESSION_KEY);
- return "redirect:/";
- }
-
- @RequestMapping(value = "/logout", method = RequestMethod.POST)
- public ModelAndView logout(HttpServletRequest req, HttpServletResponse res) {
- String path = execute(req, res);
- return new ModelAndView(new JspView(path));
+ return new ModelAndView(new JspView("redirect:/"));
  }
 }

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

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

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

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

app/src/main/java/com/techcourse/support/web/filter/ResourceFilter.java

@@ -39,8 +39,8 @@ public void init(final FilterConfig filterConfig) throws ServletException {
  @Override
  public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
  throws IOException, ServletException {
- final var req = (HttpServletRequest) request;
- final var path = req.getRequestURI().substring(req.getContextPath().length());
+ final var httpServletRequest = (HttpServletRequest) request;
+ final var path = httpServletRequest.getRequestURI().substring(httpServletRequest.getContextPath().length());
  if (isResourceUrl(path)) {
  log.debug("path : {}", path);
  requestDispatcher.forward(request, response);

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

@@ -14,7 +14,8 @@ public ModelAndView(final View view) {
  this.model = new HashMap<>();
  }
 
- public ModelAndView addObject(final String attributeName, final Object attributeValue) {
+ public ModelAndView addObject(final String attributeName,
+ final Object attributeValue) {
  model.put(attributeName, attributeValue);
  return this;
  }

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;
@@ -8,8 +8,6 @@
 import org.slf4j.LoggerFactory;
 import webmvc.org.springframework.web.servlet.ModelAndView;
 import webmvc.org.springframework.web.servlet.View;
-import webmvc.org.springframework.web.servlet.mvc.HandlerAdapter;
-import webmvc.org.springframework.web.servlet.mvc.HandlerMapping;
 
 public class DispatcherServlet extends HttpServlet {
 
@@ -41,9 +39,9 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
  }
  }
 
- private void render(ModelAndView modelAndView, HttpServletRequest req, HttpServletResponse res) throws Exception {
- View view = modelAndView.getView();
- view.render(modelAndView.getModel(), req, res);
+ private void render(ModelAndView modelAndView, HttpServletRequest request, HttpServletResponse response) throws Exception {
+ final View view = modelAndView.getView();
+ view.render(modelAndView.getModel(), request, response);
  }
 
  public void addHandlerMapping(HandlerMapping handlerMapping) {