refactor: modelAndView 직접 render하도록 변경, 일부 메서드명 수정

woowacourse · Sep 25, 2023 · cc81b8d · cc81b8d
1 parent 04c763e
commit cc81b8d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/ModelAndView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/ModelAndView.java
@@ -1,5 +1,8 @@
 package webmvc.org.springframework.web.servlet;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,6 +17,10 @@ public ModelAndView(final View view) {
         this.model = new HashMap<>();
     }
 
+    public void render(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
+        view.render(model, request, response);
+    }
+
     public ModelAndView addObject(final String attributeName, final Object attributeValue) {
         model.put(attributeName, attributeValue);
         return this;

diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/DispatcherServlet.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/DispatcherServlet.java
@@ -61,11 +61,11 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
                 throw new NoSuchElementException("Cannot find handler for request");
             }
 
-            handlerExecutor.render(request, response, handler.get());
+            handlerExecutor.execute(request, response, handler.get());
         } catch (Exception exception) {
             log.error("Exception : {} {}", exception.getMessage(), exception.getStackTrace());
 
-            handlerExecutor.render(request, response, exception);
+            handlerExecutor.execute(request, response, exception);
         }
     }
 

diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/HandlerExecutor.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/HandlerExecutor.java
@@ -17,16 +17,14 @@ public HandlerExecutor(final HandlerAdapterRegistry handlerAdapterRegistry) {
         this.handlerAdapterRegistry = handlerAdapterRegistry;
     }
 
-    public void render(final HttpServletRequest request, HttpServletResponse response, Object handler) {
+    public void execute(final HttpServletRequest request, HttpServletResponse response, Object handler) {
         try {
             final var handlerAdapter = handlerAdapterRegistry.getHandlerAdapter(handler);
             if (handlerAdapter.isPresent()) {
                 final var adapter = handlerAdapter.get();
                 final var modelAndView = adapter.handle(request, response, handler);
-                final var model = modelAndView.getModel();
-                final var view = modelAndView.getView();
 
-                view.render(model, request, response);
+                modelAndView.render(request, response);
                 return;
             }
 
@@ -43,7 +41,7 @@ public void render(final HttpServletRequest request, HttpServletResponse respons
 
     private void executeExceptionHandler(HttpServletRequest request, HttpServletResponse response, Throwable cause) {
         handlerAdapterRegistry.getHandlerAdapter(cause)
-                .ifPresent(exceptionHandlerAdapter -> render(request, response, cause));
+                .ifPresent(exceptionHandlerAdapter -> execute(request, response, cause));
     }
 
 }
diff --git a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/HandlerExecutorTest.java b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/HandlerExecutorTest.java
@@ -44,7 +44,7 @@ void execute_handlerExecution_JspView() throws Exception {
         final var view = new JspView("redirect:/test.jsp");
         when(handler.handle(request, response)).thenReturn(new ModelAndView(view));
 
-        handlerExecutor.render(request, response, handler);
+        handlerExecutor.execute(request, response, handler);
 
         verify(handler).handle(request, response);
     }
@@ -54,7 +54,7 @@ void execute_handlerExecution_JspView() throws Exception {
     void execute_controller() throws Exception {
         final var handler = new ForwardController("redirect:/test.jsp");
 
-        handlerExecutor.render(request, response, handler);
+        handlerExecutor.execute(request, response, handler);
 
         verify(response).sendRedirect("/test.jsp");
     }