From dbd8cfa64e5deb7917a48fc7340a5eb8c08c43a8 Mon Sep 17 00:00:00 2001 From: hong-sile Date: Mon, 25 Sep 2023 16:34:51 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20tobe=EC=97=90=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=93=A4=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/servlet/mvc/tobe/{ => handler}/Handler.java | 2 +- .../web/servlet/mvc/tobe/{ => handler}/NotFoundHandler.java | 2 +- .../mvc/tobe/handler_mapping/AnnotationHandlerMapping.java | 4 +--- .../mvc/tobe/{ => handler_mapping}/HandlerExecution.java | 3 ++- .../servlet/mvc/tobe/{ => handler_mapping}/HandlerKey.java | 2 +- .../web/servlet/mvc/tobe/handler_mapping/HandlerMapping.java | 2 +- .../web/servlet/mvc/tobe/handler_mapping/HandlerMappings.java | 4 ++-- .../servlet/mvc/tobe/{ => handler}/NotFoundHandlerTest.java | 2 +- .../tobe/handler_mapping/AnnotationHandlerMappingTest.java | 2 -- 9 files changed, 10 insertions(+), 13 deletions(-) rename mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/{ => handler}/Handler.java (82%) rename mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/{ => handler}/NotFoundHandler.java (89%) rename mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/{ => handler_mapping}/HandlerExecution.java (86%) rename mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/{ => handler_mapping}/HandlerKey.java (92%) rename mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/{ => handler}/NotFoundHandlerTest.java (94%) diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/Handler.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/Handler.java similarity index 82% rename from mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/Handler.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/Handler.java index cb238929f0..564954219f 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/Handler.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/Handler.java @@ -1,4 +1,4 @@ -package webmvc.org.springframework.web.servlet.mvc.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe.handler; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandler.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandler.java similarity index 89% rename from mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandler.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandler.java index 902a8f6a5e..2f68519111 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandler.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandler.java @@ -1,4 +1,4 @@ -package webmvc.org.springframework.web.servlet.mvc.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe.handler; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMapping.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMapping.java index fb7a6c198d..9c19ef1fe2 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMapping.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMapping.java @@ -18,9 +18,7 @@ import web.org.springframework.web.bind.annotation.RequestMapping; import web.org.springframework.web.bind.annotation.RequestMethod; import webmvc.org.springframework.web.servlet.exception.RequestMethodNotValidException; -import webmvc.org.springframework.web.servlet.mvc.tobe.Handler; -import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerExecution; -import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerKey; +import webmvc.org.springframework.web.servlet.mvc.tobe.handler.Handler; import webmvc.org.springframework.web.servlet.mvc.tobe.default_controller.ForwardController; public class AnnotationHandlerMapping implements HandlerMapping { diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerExecution.java similarity index 86% rename from mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerExecution.java index f56da6da8f..ea75102ab2 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerExecution.java @@ -1,10 +1,11 @@ -package webmvc.org.springframework.web.servlet.mvc.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import webmvc.org.springframework.web.servlet.ModelAndView; import webmvc.org.springframework.web.servlet.exception.HandlerExecutionNotInitializeException; +import webmvc.org.springframework.web.servlet.mvc.tobe.handler.Handler; public class HandlerExecution implements Handler { diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerKey.java similarity index 92% rename from mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerKey.java index 1de908117c..1e41dac9c6 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerKey.java @@ -1,4 +1,4 @@ -package webmvc.org.springframework.web.servlet.mvc.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping; import java.util.Objects; import web.org.springframework.web.bind.annotation.RequestMethod; diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMapping.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMapping.java index f620b77268..577f4ed18f 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMapping.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMapping.java @@ -1,7 +1,7 @@ package webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping; import jakarta.servlet.http.HttpServletRequest; -import webmvc.org.springframework.web.servlet.mvc.tobe.Handler; +import webmvc.org.springframework.web.servlet.mvc.tobe.handler.Handler; public interface HandlerMapping { diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMappings.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMappings.java index d4b2469e62..2d0b9391b6 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMappings.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/HandlerMappings.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import webmvc.org.springframework.web.servlet.mvc.tobe.Handler; -import webmvc.org.springframework.web.servlet.mvc.tobe.NotFoundHandler; +import webmvc.org.springframework.web.servlet.mvc.tobe.handler.Handler; +import webmvc.org.springframework.web.servlet.mvc.tobe.handler.NotFoundHandler; public class HandlerMappings { diff --git a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandlerTest.java b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandlerTest.java similarity index 94% rename from mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandlerTest.java rename to mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandlerTest.java index 6f8b01ebee..5fd59ba63e 100644 --- a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/NotFoundHandlerTest.java +++ b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler/NotFoundHandlerTest.java @@ -1,4 +1,4 @@ -package webmvc.org.springframework.web.servlet.mvc.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe.handler; import static org.assertj.core.api.Assertions.assertThat; diff --git a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMappingTest.java b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMappingTest.java index b252727c8c..83d42e4a46 100644 --- a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMappingTest.java +++ b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/handler_mapping/AnnotationHandlerMappingTest.java @@ -9,8 +9,6 @@ import java.lang.reflect.InvocationTargetException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerExecution; -import webmvc.org.springframework.web.servlet.mvc.tobe.handler_mapping.AnnotationHandlerMapping; class AnnotationHandlerMappingTest {