[MVC 구현하기 - 2, 3단계] 포츈(정윤성) 미션 제출합니다.

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

@@ -3,6 +3,9 @@
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletRegistration;
 import nextstep.mvc.DispatcherServlet;
+import nextstep.mvc.HandlerMapping;
+import nextstep.mvc.controller.adapter.HandlerAdapter;
+import nextstep.mvc.controller.adapter.HandlerExecutionHandlerAdapter;
 import nextstep.mvc.controller.tobe.AnnotationHandlerMapping;
 import nextstep.web.WebApplicationInitializer;
 import org.slf4j.Logger;
@@ -16,13 +19,18 @@ public class AppWebApplicationInitializer implements WebApplicationInitializer {
     @Override
     public void onStartup(ServletContext servletContext) {
         final DispatcherServlet dispatcherServlet = new DispatcherServlet();
-        dispatcherServlet.addHandlerMapping(new ManualHandlerMapping());
-        dispatcherServlet.addHandlerMapping(new AnnotationHandlerMapping(BASE_PACKAGE));
+
+        addFrameWork(dispatcherServlet, new AnnotationHandlerMapping(BASE_PACKAGE), new HandlerExecutionHandlerAdapter());
 
         final ServletRegistration.Dynamic dispatcher = servletContext.addServlet("dispatcher", dispatcherServlet);
         dispatcher.setLoadOnStartup(1);
         dispatcher.addMapping("/");
 
         LOGGER.info("Start AppWebApplication Initializer");
     }
+
+    private void addFrameWork(final DispatcherServlet dispatcherServlet, final HandlerMapping handlerMapping, final HandlerAdapter handlerAdapter) {
+        dispatcherServlet.addHandlerMapping(handlerMapping);
+        dispatcherServlet.addHandlerAdapter(handlerAdapter);
+    }
 }

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

@@ -1,14 +1,13 @@
 package com.techcourse;
 
+import java.io.File;
+import java.util.stream.Stream;
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.util.stream.Stream;
-
 public class JwpApplication {
 
     private static final Logger log = LoggerFactory.getLogger(JwpApplication.class);
@@ -31,9 +30,9 @@ public static void main(String[] args) throws Exception {
 
     private static int defaultPortIfNull(String[] args) {
         return Stream.of(args)
-                .findFirst()
-                .map(Integer::parseInt)
-                .orElse(DEFAULT_PORT);
+            .findFirst()
+            .map(Integer::parseInt)
+            .orElse(DEFAULT_PORT);
     }
 
     private static Context addWebapp(Tomcat tomcat) {

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

@@ -0,0 +1,18 @@
+package com.techcourse.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.JspView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+
+@Controller
+public class ForwardController {
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public ModelAndView execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
+        return new ModelAndView(new JspView("/index.jsp"));
+    }
+}

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

@@ -1,39 +1,60 @@
 package com.techcourse.controller;
 
 import com.techcourse.domain.User;
+import com.techcourse.domain.UserSession;
 import com.techcourse.repository.InMemoryUserRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-import nextstep.mvc.controller.asis.Controller;
+import nextstep.mvc.view.JspView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.mvc.view.View;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LoginController implements Controller {
+@Controller
+public class LoginController {
 
-    private static final Logger log = LoggerFactory.getLogger(LoginController.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoginController.class);
 
-    @Override
-    public String execute(HttpServletRequest req, HttpServletResponse res) {
+    @RequestMapping(value = "/login/view", method = RequestMethod.GET)
+    public ModelAndView view(HttpServletRequest req, HttpServletResponse res) {
+        return UserSession.getUserFrom(req.getSession())
+            .map(user -> {
+                LOGGER.info("logged in {}", user.getAccount());
+                View view = new JspView("redirect:/index.jsp");
+                return new ModelAndView(view);
+            })
+            .orElse(new ModelAndView(new JspView("/login.jsp")));
+    }
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public ModelAndView login(HttpServletRequest req, HttpServletResponse res) {
         if (UserSession.isLoggedIn(req.getSession())) {
-            return "redirect:/index.jsp";
+            View view = new JspView("redirect:/index.jsp");
+            return new ModelAndView(view);
         }
 
         return InMemoryUserRepository.findByAccount(req.getParameter("account"))
-                .map(user -> {
-                    log.info("User : {}", user);
-                    return login(req, user);
-                })
-                .orElse("redirect:/401.jsp");
+            .map(user -> {
+                LOGGER.info("User : {}", user);
+                return new ModelAndView(loginCheck(req, user));
+            })
+            .orElse(new ModelAndView(
+                new JspView("redirect:/401.jsp")
+            ));
     }
 
-    private String login(HttpServletRequest request, User user) {
+    private View loginCheck(HttpServletRequest request, User user) {
         if (user.checkPassword(request.getParameter("password"))) {
             final HttpSession session = request.getSession();
             session.setAttribute(UserSession.SESSION_KEY, user);
-            return "redirect:/index.jsp";
+            return new JspView("redirect:/index.jsp");
         } else {
-            return "redirect:/401.jsp";
+            return new JspView("redirect:/401.jsp");
         }
     }
 }

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

@@ -1,16 +1,24 @@
 package com.techcourse.controller;
 
+import com.techcourse.domain.UserSession;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-import nextstep.mvc.controller.asis.Controller;
+import nextstep.mvc.view.JspView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.mvc.view.View;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
 
-public class LogoutController implements Controller {
+@Controller
+public class LogoutController {
 
-    @Override
-    public String execute(HttpServletRequest req, HttpServletResponse res) throws Exception {
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    public ModelAndView logout(HttpServletRequest req, HttpServletResponse res) throws Exception {
         final HttpSession session = req.getSession();
         session.removeAttribute(UserSession.SESSION_KEY);
-        return "redirect:/";
+        View view = new JspView("redirect:/");
+        return new ModelAndView(view);
     }
 }

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

@@ -0,0 +1,32 @@
+package com.techcourse.controller;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.JsonView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Controller
+public class MultiInputController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MultiInputController.class);
+
+    @RequestMapping(value = "/api/multi", method = RequestMethod.GET)
+    public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
+        String input1 = request.getParameter("input1");
+        String input2 = request.getParameter("input2");
+
+        LOGGER.debug("input1 : {}", input1);
+        LOGGER.debug("input2 : {}", input2);
+
+        ModelAndView modelAndView = new ModelAndView(new JsonView());
+
+        modelAndView.addObject("input1", input1);
+        modelAndView.addObject("input2", input2);
+        return modelAndView;
+    }
+}

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

@@ -13,13 +13,14 @@
 
 @Controller
 public class RegisterController {
-    
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public ModelAndView save(final HttpServletRequest req, final HttpServletResponse res) {
         User user = new User(2,
             req.getParameter("account"),
             req.getParameter("password"),
-            req.getParameter("email"));
+            req.getParameter("email")
+        );
         InMemoryUserRepository.save(user);
 
         return new ModelAndView(new JspView("redirect:/index.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 jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import nextstep.mvc.view.JsonView;
+import nextstep.mvc.view.ModelAndView;
+import nextstep.web.annotation.Controller;
+import nextstep.web.annotation.RequestMapping;
+import nextstep.web.support.RequestMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Controller
+public class UserController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
+
+    @RequestMapping(value = "/api/user", method = RequestMethod.GET)
+    public ModelAndView show(HttpServletRequest request, HttpServletResponse response) {
+        final String account = request.getParameter("account");
+        LOGGER.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

@@ -25,10 +25,17 @@ public String getAccount() {
     @Override
     public String toString() {
         return "User{" +
-                "id=" + id +
-                ", account='" + account + '\'' +
-                ", email='" + email + '\'' +
-                ", password='" + password + '\'' +
-                '}';
+            "id=" + id +
+            ", account='" + account + '\'' +
+            ", email='" + email + '\'' +
+            '}';
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getEmail() {
+        return email;
     }
 }

app/src/main/java/com/techcourse/controller/UserSession.java → app/src/main/java/com/techcourse/domain/UserSession.java

@@ -1,8 +1,6 @@
-package com.techcourse.controller;
+package com.techcourse.domain;
 
-import com.techcourse.domain.User;
 import jakarta.servlet.http.HttpSession;
-
 import java.util.Optional;
 
 public class UserSession {
@@ -18,5 +16,6 @@ public static boolean isLoggedIn(HttpSession session) {
         return getUserFrom(session).isPresent();
     }
 
-    private UserSession() {}
+    private UserSession() {
+    }
 }

app/src/main/java/com/techcourse/repository/InMemoryUserRepository.java

@@ -1,7 +1,6 @@
 package com.techcourse.repository;
 
 import com.techcourse.domain.User;
-
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -23,5 +22,6 @@ public static Optional<User> findByAccount(String account) {
         return Optional.ofNullable(database.get(account));
     }
 
-    private InMemoryUserRepository() {}
+    private InMemoryUserRepository() {
+    }
 }