📚0단계, 1단계 완료

docs/Assignment1.md

@@ -0,0 +1,45 @@
+### 1단계
+
+``AnnotationHandlerMappingTest``
+
+#### 테스트 케이스설명
+
+```java
+final var request = mock(HttpServletRequest.class);
+final var response = mock(HttpServletResponse.class);
+```
+
+Servlet클래스를 가져옴
+
+```java
+when(request.getAttribute("id")).thenReturn("gugu");
+when(request.getRequestURI()).thenReturn("/get-test");
+when(request.getMethod()).thenReturn("GET");
+```
+
+`id`가 호출되면 `gugu`반환,  `URI`호출되면 `/get-test`반환, `Method`호출되면 `GET`반환 설정
+
+```java
+final var handlerExecution = (HandlerExecution) handlerMapping.getHandler(request);
+final var modelAndView = handlerExecution.handle(request, response);
+```
+
+(기존에 이미 설정된) 핸들러를 호출해서 request에 맞는 `handlerExecution` 호출, 이를 통해 `modelAndView` 반환
+
+```java
+assertThat(modelAndView.getObject("id")).isEqualTo("gugu");
+```
+
+테스트가 원활하게 동작하는지 확인
+
+1. request 를 Servlet이 받고, 이를 HandlerMapping을 통해 적합한 HandlerController를 찾아 적용시킴
+2. 여기서는 Key를 통해 찾고, 이를 Execution 을 통해 실행시키는 그림같음.
+   `HandlerExecution`클래스 또한 수정. `ModelAndView`타입 반환임. View필드는 null로 초기화.
+   id를 조회시 request에서 id에 해당하는 attribute를 찾아서, 이를 묶어 `ModelAndView`로 반환하도록수정.
+3. 따라서 키를 생성하고, HandlerExecution을 생성해 Map 자료형 `handlerExecutions`에
+   `handlerExecutions.put(new HandlerKey("/get-test", RequestMethod.GET), new HandlerExecution());`
+4. 이후 `getHandler`에, 입력된 파라메터 토대로 HandlerKey를 생성, `return handlerExecutions.get(handlerKey);`
+
+#### Post테스트도 비슷한 방법으로 해결
+
+---

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/DispatcherServlet.java

@@ -0,0 +1,41 @@
+package com.interface21.webmvc.servlet.mvc;
+
+import com.interface21.webmvc.servlet.ModelAndView;
+import com.interface21.webmvc.servlet.View;
+import com.interface21.webmvc.servlet.mvc.tobe.HandlerExecution;
+import com.interface21.webmvc.servlet.mvc.tobe.HandlerMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.util.List;
+import java.util.Map;
+
+public class DispatcherServlet implements HandlerMapping {
+    private final HandlerMapping AnnotationHandlerMapping;
+    private final HandlerMapping ManualHandlerMapping;
+
+    public DispatcherServlet(HandlerMapping handlerMapping1, HandlerMapping handlerMapping2) {
+        AnnotationHandlerMapping = handlerMapping1;
+        ManualHandlerMapping = handlerMapping2;
+    }
+
+    /**
+     * 원래 아래 두 메서드 중 하나만 있어야 하는데,
+     * Annotation 과 Manual 둘 다 사용 가능하게 하기 위해선 이 방법이..?
+     */
+    public Map<String, Object> doDispatchWithAnnotationHandlerMapping(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        var handlerExecution = (HandlerExecution) AnnotationHandlerMapping.getHandler(request);
+        var modelAndView=handlerExecution.handle(request,response);
+        return modelAndView.getModel();
+    }
+    public Map<String, Object> doDispatchWithManualHandlerMapping(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        var handlerExecution = (HandlerExecution) ManualHandlerMapping.getHandler(request);
+        var modelAndView=handlerExecution.handle(request,response);
+        return modelAndView.getModel();
+    }
+
+    @Override
+    public Object getHandler(HttpServletRequest request) {
+        return null;
+    }
+}

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/asis/ForwardController.java

@@ -1,10 +1,12 @@
 package com.interface21.webmvc.servlet.mvc.asis;
 
+import com.interface21.web.bind.annotation.RequestMapping;
+import com.interface21.web.bind.annotation.RequestMethod;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.util.Objects;
-
+@com.interface21.context.stereotype.Controller
 public class ForwardController implements Controller {
 
     private final String path;
@@ -13,8 +15,19 @@ public ForwardController(final String path) {
         this.path = Objects.requireNonNull(path);
     }
 
+    @RequestMapping(value = "/get-test", method = RequestMethod.GET)
+    public void AnnotationGetMapping(){
+
+    }
+
+    @RequestMapping(value = "/post-test",method = RequestMethod.POST)
+    public void AnnotationPostMapping(){
+
+    }
+
     @Override
     public String execute(final HttpServletRequest request, final HttpServletResponse response) {
+
         return path;
     }
 }

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/tobe/AnnotationHandlerMapping.java

@@ -1,13 +1,19 @@
 package com.interface21.webmvc.servlet.mvc.tobe;
 
+import com.interface21.context.stereotype.Controller;
+import com.interface21.web.bind.annotation.RequestMapping;
+import com.interface21.web.bind.annotation.RequestMethod;
 import jakarta.servlet.http.HttpServletRequest;
+import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
-public class AnnotationHandlerMapping {
+public class AnnotationHandlerMapping implements HandlerMapping {
 
     private static final Logger log = LoggerFactory.getLogger(AnnotationHandlerMapping.class);
 
@@ -21,9 +27,44 @@ public AnnotationHandlerMapping(final Object... basePackage) {
 
     public void initialize() {
         log.info("Initialized AnnotationHandlerMapping!");
+        try {
+            // 패키지 스캔으로 Controller를 가진 클래스들 반환
+            for (Object packageName : basePackage) {
+                Reflections reflections = new Reflections(packageName);
+                Set<Class<?>> controllerClasses = reflections.getTypesAnnotatedWith(Controller.class);
+
+                // @Controller 클래스 처리
+                for (Class<?> controllerClass : controllerClasses) {
+                    Method[] methods = controllerClass.getDeclaredMethods();
+
+                    // @RequestMapping 메서드 처리
+                    for (Method method : methods) {
+                        if (method.isAnnotationPresent(RequestMapping.class)) {
+                            RequestMapping requestMapping = method.getAnnotation(RequestMapping.class);
+
+                            String url = requestMapping.value();
+                            RequestMethod[] httpMethod = requestMapping.method();
+                            // HTTP 메서드별로 모두 핸들러 등록
+                            for (RequestMethod requestMethod : httpMethod) {
+                                HandlerKey handlerKey = new HandlerKey(url, requestMethod);
+                                HandlerExecution handlerExecution = new HandlerExecution();
+                                handlerExecutions.put(handlerKey, handlerExecution);
+                            }
+                        }
+                    }
+//                    핸들러 정상 등록 확인 (HandlerKey에도 getter 주석 제거해줘야 함)
+//                     handlerExecutions.entrySet().stream().map(Map.Entry::getKey)
+//                             .map(HandlerKey::getRequestMethod).forEach(System.out::println);
+                }
+            }
+        } catch (Exception e) {
+            log.error("Failed to initialize AnnotationHandlerMapping", e);
+        }
+
     }
 
     public Object getHandler(final HttpServletRequest request) {
-        return null;
+        HandlerKey handlerKey = new HandlerKey(request.getRequestURI(), RequestMethod.valueOf(request.getMethod()));
+        return handlerExecutions.get(handlerKey);
     }
 }

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/tobe/HandlerExecution.java

@@ -7,6 +7,8 @@
 public class HandlerExecution {
 
     public ModelAndView handle(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-        return null;
+        ModelAndView mv=new ModelAndView(null);
+        mv.addObject("id", request.getAttribute("id"));
+        return mv;
     }
 }

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/tobe/HandlerKey.java

@@ -14,6 +14,14 @@ public HandlerKey(final String url, final RequestMethod requestMethod) {
         this.requestMethod = requestMethod;
     }
 
+    /**
+     * AnnotationHandlerMapping 클래스 내의
+     * 핸들러 정상 등록 확인을 위한 확인용 메서드
+     */
+//    public RequestMethod getRequestMethod() {
+//        return requestMethod;
+//    }
+
     @Override
     public String toString() {
         return "HandlerKey{" +
@@ -34,4 +42,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(url, requestMethod);
     }
-}
+}

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/tobe/HandlerMapping.java

@@ -0,0 +1,7 @@
+package com.interface21.webmvc.servlet.mvc.tobe;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+public interface HandlerMapping {
+    Object getHandler(HttpServletRequest request);
+}

mvc/src/main/java/com/interface21/webmvc/servlet/mvc/tobe/ManualHandlerMapping.java

@@ -0,0 +1,33 @@
+package com.interface21.webmvc.servlet.mvc.tobe;
+
+import com.interface21.web.bind.annotation.RequestMethod;
+import jakarta.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ManualHandlerMapping implements HandlerMapping {
+
+    private static final Logger log = LoggerFactory.getLogger(AnnotationHandlerMapping.class);
+
+    private final Object[] basePackage;
+    private final Map<HandlerKey, HandlerExecution> handlerExecutions;
+
+    public ManualHandlerMapping(final Object... basePackage) {
+        this.basePackage = basePackage;
+        this.handlerExecutions = new HashMap<>();
+    }
+
+    public void initialize() {
+        log.info("Initialized AnnotationHandlerMapping!");
+        handlerExecutions.put(new HandlerKey("/get-test", RequestMethod.GET), new HandlerExecution());
+        handlerExecutions.put(new HandlerKey("/post-test", RequestMethod.POST), new HandlerExecution());
+    }
+
+    public Object getHandler(final HttpServletRequest request) {
+        HandlerKey handlerKey = new HandlerKey(request.getRequestURI(), RequestMethod.valueOf(request.getMethod()));
+        return handlerExecutions.get(handlerKey);
+    }
+}

mvc/src/test/java/com/interface21/webmvc/servlet/mvc/DispatcherServletTest.java

@@ -0,0 +1,70 @@
+package com.interface21.webmvc.servlet.mvc;
+
+import com.interface21.webmvc.servlet.mvc.tobe.AnnotationHandlerMapping;
+import com.interface21.webmvc.servlet.mvc.tobe.ManualHandlerMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DispatcherServletTest {
+    private DispatcherServlet dispatcherServlet;
+
+    @BeforeEach
+    void setUp() {
+        AnnotationHandlerMapping annotationHandlerMapping = new AnnotationHandlerMapping("com.interface21.webmvc.servlet");
+        ManualHandlerMapping manualHandlerMapping = new ManualHandlerMapping();
+        annotationHandlerMapping.initialize();
+        manualHandlerMapping.initialize();
+        dispatcherServlet=new DispatcherServlet(annotationHandlerMapping, manualHandlerMapping);
+    }
+
+    @Test
+    void AnnotationHandlerMapping() throws Exception {
+        final var requestGet = mock(HttpServletRequest.class);
+        final var responseGet = mock(HttpServletResponse.class);
+
+        final var requestPost = mock(HttpServletRequest.class);
+        final var responsePOST = mock(HttpServletResponse.class);
+
+        when(requestGet.getAttribute("id")).thenReturn("gugu");
+        when(requestGet.getRequestURI()).thenReturn("/get-test");
+        when(requestGet.getMethod()).thenReturn("GET");
+
+        when(requestPost.getAttribute("id")).thenReturn("gugu");
+        when(requestPost.getRequestURI()).thenReturn("/post-test");
+        when(requestPost.getMethod()).thenReturn("POST");
+
+        final var modelGet = dispatcherServlet.doDispatchWithAnnotationHandlerMapping(requestGet, responseGet);
+        final var modelPost = dispatcherServlet.doDispatchWithAnnotationHandlerMapping(requestPost, responsePOST);
+        assertThat(modelGet.get("id")).isEqualTo("gugu");
+        assertThat(modelPost.get("id")).isEqualTo("gugu");
+    }
+
+    @Test
+    void ManualHandlerMapping() throws Exception {
+        final var requestGet = mock(HttpServletRequest.class);
+        final var responseGet = mock(HttpServletResponse.class);
+
+        final var requestPost = mock(HttpServletRequest.class);
+        final var responsePOST = mock(HttpServletResponse.class);
+
+        when(requestGet.getAttribute("id")).thenReturn("gugu");
+        when(requestGet.getRequestURI()).thenReturn("/get-test");
+        when(requestGet.getMethod()).thenReturn("GET");
+
+        when(requestPost.getAttribute("id")).thenReturn("gugu");
+        when(requestPost.getRequestURI()).thenReturn("/post-test");
+        when(requestPost.getMethod()).thenReturn("POST");
+
+        final var modelGet = dispatcherServlet.doDispatchWithManualHandlerMapping(requestGet, responseGet);
+        final var modelPost = dispatcherServlet.doDispatchWithManualHandlerMapping(requestPost, responsePOST);
+        assertThat(modelGet.get("id")).isEqualTo("gugu");
+        assertThat(modelPost.get("id")).isEqualTo("gugu");
+    }
+
+}

mvc/src/test/java/com/interface21/webmvc/servlet/mvc/tobe/AnnotationHandlerMappingTest.java

@@ -15,7 +15,7 @@ class AnnotationHandlerMappingTest {
 
     @BeforeEach
     void setUp() {
-        handlerMapping = new AnnotationHandlerMapping("samples");
+        handlerMapping = new AnnotationHandlerMapping("com.interface21.webmvc.servlet");
         handlerMapping.initialize();
     }
 

mvc/src/test/java/com/interface21/webmvc/servlet/mvc/tobe/ManaualHandlerMappingTest.java

@@ -0,0 +1,51 @@
+package com.interface21.webmvc.servlet.mvc.tobe;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class ManaualHandlerMappingTest {
+
+    private ManualHandlerMapping handlerMapping;
+
+    @BeforeEach
+    void setUp() {
+        handlerMapping = new ManualHandlerMapping("samples");
+        handlerMapping.initialize();
+    }
+
+    @Test
+    void get() throws Exception {
+        final var request = mock(HttpServletRequest.class);
+        final var response = mock(HttpServletResponse.class);
+
+        when(request.getAttribute("id")).thenReturn("gugu");
+        when(request.getRequestURI()).thenReturn("/get-test");
+        when(request.getMethod()).thenReturn("GET");
+
+        final var handlerExecution = (HandlerExecution) handlerMapping.getHandler(request);
+        final var modelAndView = handlerExecution.handle(request, response);
+
+        assertThat(modelAndView.getObject("id")).isEqualTo("gugu");
+    }
+
+    @Test
+    void post() throws Exception {
+        final var request = mock(HttpServletRequest.class);
+        final var response = mock(HttpServletResponse.class);
+
+        when(request.getAttribute("id")).thenReturn("gugu");
+        when(request.getRequestURI()).thenReturn("/post-test");
+        when(request.getMethod()).thenReturn("POST");
+
+        final var handlerExecution = (HandlerExecution) handlerMapping.getHandler(request);
+        final var modelAndView = handlerExecution.handle(request, response);
+
+        assertThat(modelAndView.getObject("id")).isEqualTo("gugu");
+    }
+}