refactor: 패키지 위치 변경

woowacourse · Sep 25, 2023 · e08fade · e08fade
1 parent 57d26be
commit e08fade
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 18 deletions.
diff --git a/app/src/main/java/com/techcourse/DispatcherServletInitializer.java b/app/src/main/java/com/techcourse/DispatcherServletInitializer.java
@@ -5,8 +5,8 @@
 import org.slf4j.LoggerFactory;
 import web.org.springframework.web.WebApplicationInitializer;
 import webmvc.org.springframework.web.servlet.mvc.DispatcherServlet;
-import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerAdapter;
-import webmvc.org.springframework.web.servlet.mvc.tobe.AnnotationHandlerMapping;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.AnnotationHandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.AnnotationHandlerMapping;
 
 /**
  * Base class for {@link WebApplicationInitializer} implementations that register a {@link DispatcherServlet} in the

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
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import webmvc.org.springframework.web.servlet.view.View;
 
 public class ModelAndView {
 

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
@@ -8,11 +8,11 @@
 import org.slf4j.Logger;
 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.tobe.HandlerAdapter;
-import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerAdapters;
-import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMapping;
-import webmvc.org.springframework.web.servlet.mvc.tobe.HandlerMappings;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerMapping;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerMappings;
+import webmvc.org.springframework.web.servlet.view.View;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.HandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.HandlerAdapters;
 
 public class DispatcherServlet extends HttpServlet {
 

diff --git a/...et/mvc/tobe/AnnotationHandlerAdapter.java → ...dlerAdapter/AnnotationHandlerAdapter.java b/...et/mvc/tobe/AnnotationHandlerAdapter.java → ...dlerAdapter/AnnotationHandlerAdapter.java
@@ -1,8 +1,9 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerAdapter;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerExecution;
 
 public class AnnotationHandlerAdapter implements HandlerAdapter {
 

diff --git a/.../web/servlet/mvc/tobe/HandlerAdapter.java → ...et/mvc/handlerAdapter/HandlerAdapter.java b/.../web/servlet/mvc/tobe/HandlerAdapter.java → ...et/mvc/handlerAdapter/HandlerAdapter.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerAdapter;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

diff --git a/...web/servlet/mvc/tobe/HandlerAdapters.java → ...t/mvc/handlerAdapter/HandlerAdapters.java b/...web/servlet/mvc/tobe/HandlerAdapters.java → ...t/mvc/handlerAdapter/HandlerAdapters.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerAdapter;
 
 import jakarta.servlet.ServletException;
 import java.util.ArrayList;

diff --git a/...et/mvc/tobe/AnnotationHandlerMapping.java → ...dlerMapping/AnnotationHandlerMapping.java b/...et/mvc/tobe/AnnotationHandlerMapping.java → ...dlerMapping/AnnotationHandlerMapping.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerMapping;
 
 import context.org.springframework.stereotype.Controller;
 import jakarta.servlet.http.HttpServletRequest;

diff --git a/...eb/servlet/mvc/tobe/HandlerExecution.java → .../mvc/handlerMapping/HandlerExecution.java b/...eb/servlet/mvc/tobe/HandlerExecution.java → .../mvc/handlerMapping/HandlerExecution.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerMapping;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

diff --git a/...work/web/servlet/mvc/tobe/HandlerKey.java → ...ervlet/mvc/handlerMapping/HandlerKey.java b/...work/web/servlet/mvc/tobe/HandlerKey.java → ...ervlet/mvc/handlerMapping/HandlerKey.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerMapping;
 
 import web.org.springframework.web.bind.annotation.RequestMethod;
 

diff --git a/.../web/servlet/mvc/tobe/HandlerMapping.java → ...et/mvc/handlerMapping/HandlerMapping.java b/.../web/servlet/mvc/tobe/HandlerMapping.java → ...et/mvc/handlerMapping/HandlerMapping.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerMapping;
 
 import jakarta.servlet.http.HttpServletRequest;
 

diff --git a/...web/servlet/mvc/tobe/HandlerMappings.java → ...t/mvc/handlerMapping/HandlerMappings.java b/...web/servlet/mvc/tobe/HandlerMappings.java → ...t/mvc/handlerMapping/HandlerMappings.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet.mvc.tobe;
+package webmvc.org.springframework.web.servlet.mvc.handlerMapping;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;

diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java
@@ -6,7 +6,6 @@
 import java.io.PrintWriter;
 import java.util.Map;
 import web.org.springframework.http.MediaType;
-import webmvc.org.springframework.web.servlet.View;
 
 public class JsonView implements View {
 

diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java
@@ -6,7 +6,6 @@
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import webmvc.org.springframework.web.servlet.View;
 
 public class JspView implements View {
 

diff --git a/...org/springframework/web/servlet/View.java → ...pringframework/web/servlet/view/View.java b/...org/springframework/web/servlet/View.java → ...pringframework/web/servlet/view/View.java
@@ -1,4 +1,4 @@
-package webmvc.org.springframework.web.servlet;
+package webmvc.org.springframework.web.servlet.view;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

diff --git a/...st/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerAdapterTest.java b/...st/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerAdapterTest.java
@@ -9,6 +9,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import webmvc.org.springframework.web.servlet.ModelAndView;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.AnnotationHandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.HandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerExecution;
 import webmvc.org.springframework.web.servlet.view.JsonView;
 
 class AnnotationHandlerAdapterTest {

diff --git a/...st/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMappingTest.java b/...st/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMappingTest.java
@@ -4,6 +4,8 @@
 import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.AnnotationHandlerMapping;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerExecution;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

diff --git a/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerAdaptersTest.java b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerAdaptersTest.java
@@ -8,6 +8,10 @@
 import jakarta.servlet.ServletException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.AnnotationHandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.HandlerAdapter;
+import webmvc.org.springframework.web.servlet.mvc.handlerAdapter.HandlerAdapters;
+import webmvc.org.springframework.web.servlet.mvc.handlerMapping.HandlerExecution;
 
 class HandlerAdaptersTest {
     private final HandlerAdapters handlerAdaptors = new HandlerAdapters();