From 52ee7781beea99fa939f155e3948ebd2531730fd Mon Sep 17 00:00:00 2001 From: kang-hyungu Date: Mon, 11 Sep 2023 15:29:28 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- .../AppWebApplicationInitializer.java | 24 ------ .../main/java/com/techcourse/Application.java | 33 ++++---- .../com/techcourse}/DispatcherServlet.java | 18 ++-- .../DispatcherServletInitializer.java | 33 ++++++++ .../com/techcourse/ManualHandlerMapping.java | 13 +-- .../java/com/techcourse/TomcatStarter.java | 83 +++++++++++++++++++ .../techcourse/UncheckedServletException.java | 8 ++ .../controller/LoginController.java | 5 +- .../controller/LoginViewController.java | 2 +- .../controller/LogoutController.java | 2 +- .../controller/RegisterController.java | 2 +- .../controller/RegisterViewController.java | 2 +- build.gradle | 6 ++ .../stereotype}/Controller.java | 2 +- .../springframework/util/ReflectionUtils.java | 38 +++++++++ .../java/nextstep/mvc/HandlerAdapter.java | 12 --- .../java/nextstep/mvc/HandlerMapping.java | 10 --- .../org/springframework/http}/MediaType.java | 2 +- .../SpringServletContainerInitializer.java} | 16 ++-- .../web/WebApplicationInitializer.java | 2 +- .../web/bind}/annotation/PathVariable.java | 2 +- .../web/bind}/annotation/RequestMapping.java | 4 +- .../web/bind/annotation}/RequestMethod.java | 2 +- .../web/bind}/annotation/RequestParam.java | 2 +- .../web/servlet}/ModelAndView.java | 2 +- .../springframework/web/servlet}/View.java | 2 +- .../web/servlet/mvc}/asis/Controller.java | 2 +- .../servlet/mvc}/asis/ForwardController.java | 2 +- .../mvc}/tobe/AnnotationHandlerMapping.java | 5 +- .../servlet/mvc}/tobe/HandlerExecution.java | 4 +- .../web/servlet/mvc}/tobe/HandlerKey.java | 4 +- .../web/servlet}/view/JsonView.java | 3 +- .../web/servlet}/view/JspView.java | 3 +- ...akarta.servlet.ServletContainerInitializer | 2 +- mvc/src/test/java/samples/TestController.java | 10 +-- .../tobe/AnnotationHandlerMappingTest.java | 2 +- 37 files changed, 241 insertions(+), 125 deletions(-) delete mode 100644 app/src/main/java/com/techcourse/AppWebApplicationInitializer.java rename {mvc/src/main/java/nextstep/mvc => app/src/main/java/com/techcourse}/DispatcherServlet.java (76%) create mode 100644 app/src/main/java/com/techcourse/DispatcherServletInitializer.java create mode 100644 app/src/main/java/com/techcourse/TomcatStarter.java create mode 100644 app/src/main/java/com/techcourse/UncheckedServletException.java rename mvc/src/main/java/{nextstep/web/annotation => context/org/springframework/stereotype}/Controller.java (87%) create mode 100644 mvc/src/main/java/core/org/springframework/util/ReflectionUtils.java delete mode 100644 mvc/src/main/java/nextstep/mvc/HandlerAdapter.java delete mode 100644 mvc/src/main/java/nextstep/mvc/HandlerMapping.java rename mvc/src/main/java/{nextstep/web/support => web/org/springframework/http}/MediaType.java (76%) rename mvc/src/main/java/{nextstep/web/NextstepServletContainerInitializer.java => web/org/springframework/web/SpringServletContainerInitializer.java} (73%) rename mvc/src/main/java/{nextstep => web/org/springframework}/web/WebApplicationInitializer.java (84%) rename mvc/src/main/java/{nextstep/web => web/org/springframework/web/bind}/annotation/PathVariable.java (82%) rename mvc/src/main/java/{nextstep/web => web/org/springframework/web/bind}/annotation/RequestMapping.java (82%) rename mvc/src/main/java/{nextstep/web/support => web/org/springframework/web/bind/annotation}/RequestMethod.java (62%) rename mvc/src/main/java/{nextstep/web => web/org/springframework/web/bind}/annotation/RequestParam.java (82%) rename mvc/src/main/java/{nextstep/mvc/view => webmvc/org/springframework/web/servlet}/ModelAndView.java (93%) rename mvc/src/main/java/{nextstep/mvc/view => webmvc/org/springframework/web/servlet}/View.java (84%) rename mvc/src/main/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/asis/Controller.java (80%) rename mvc/src/main/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/asis/ForwardController.java (89%) rename mvc/src/main/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/tobe/AnnotationHandlerMapping.java (83%) rename mvc/src/main/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/tobe/HandlerExecution.java (70%) rename mvc/src/main/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/tobe/HandlerKey.java (87%) rename mvc/src/main/java/{nextstep/mvc => webmvc/org/springframework/web/servlet}/view/JsonView.java (75%) rename mvc/src/main/java/{nextstep/mvc => webmvc/org/springframework/web/servlet}/view/JspView.java (88%) rename mvc/src/test/java/{nextstep/mvc/controller => webmvc/org/springframework/web/servlet/mvc}/tobe/AnnotationHandlerMappingTest.java (96%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d672c0be0a..6f63e4a797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew build sonar --info -x :study:build + run: ./gradlew clean build codeCoverageReport --info -x :study:build diff --git a/app/src/main/java/com/techcourse/AppWebApplicationInitializer.java b/app/src/main/java/com/techcourse/AppWebApplicationInitializer.java deleted file mode 100644 index 53e45857fd..0000000000 --- a/app/src/main/java/com/techcourse/AppWebApplicationInitializer.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.techcourse; - -import jakarta.servlet.ServletContext; -import nextstep.mvc.DispatcherServlet; -import nextstep.web.WebApplicationInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AppWebApplicationInitializer implements WebApplicationInitializer { - - private static final Logger log = LoggerFactory.getLogger(AppWebApplicationInitializer.class); - - @Override - public void onStartup(final ServletContext servletContext) { - final var dispatcherServlet = new DispatcherServlet(); - dispatcherServlet.addHandlerMapping(new ManualHandlerMapping()); - - final var dispatcher = servletContext.addServlet("dispatcher", dispatcherServlet); - dispatcher.setLoadOnStartup(1); - dispatcher.addMapping("/"); - - log.info("Start AppWebApplication Initializer"); - } -} diff --git a/app/src/main/java/com/techcourse/Application.java b/app/src/main/java/com/techcourse/Application.java index f5c8248a3e..500d3f2d8b 100644 --- a/app/src/main/java/com/techcourse/Application.java +++ b/app/src/main/java/com/techcourse/Application.java @@ -1,11 +1,9 @@ package com.techcourse; -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.io.IOException; import java.util.stream.Stream; public class Application { @@ -16,22 +14,11 @@ public class Application { public static void main(final String[] args) throws Exception { final int port = defaultPortIfNull(args); - - final var tomcat = new Tomcat(); - tomcat.setConnector(createConnector(port)); - final var docBase = new File("app/src/main/webapp/").getAbsolutePath(); - tomcat.addWebapp("", docBase); - log.info("configuring app with basedir: {}", docBase); + final var tomcat = new TomcatStarter(port); + log.info("configuring app with basedir: {}", TomcatStarter.WEBAPP_DIR_LOCATION); tomcat.start(); - tomcat.getServer().await(); - } - - private static Connector createConnector(final int port) { - final var connector = new Connector(); - connector.setPort(port); - connector.setProperty("bindOnInit", "false"); - return connector; + stop(tomcat); } private static int defaultPortIfNull(final String[] args) { @@ -40,4 +27,16 @@ private static int defaultPortIfNull(final String[] args) { .map(Integer::parseInt) .orElse(DEFAULT_PORT); } + + private static void stop(final TomcatStarter tomcat) { + try { + // make the application wait until we press any key. + System.in.read(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } finally { + log.info("web server stop."); + tomcat.stop(); + } + } } diff --git a/mvc/src/main/java/nextstep/mvc/DispatcherServlet.java b/app/src/main/java/com/techcourse/DispatcherServlet.java similarity index 76% rename from mvc/src/main/java/nextstep/mvc/DispatcherServlet.java rename to app/src/main/java/com/techcourse/DispatcherServlet.java index 9e6951a259..277d8eed9a 100644 --- a/mvc/src/main/java/nextstep/mvc/DispatcherServlet.java +++ b/app/src/main/java/com/techcourse/DispatcherServlet.java @@ -1,36 +1,36 @@ -package nextstep.mvc; +package com.techcourse; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; -import nextstep.mvc.view.JspView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import webmvc.org.springframework.web.servlet.view.JspView; public class DispatcherServlet extends HttpServlet { private static final long serialVersionUID = 1L; private static final Logger log = LoggerFactory.getLogger(DispatcherServlet.class); - private HandlerMapping handlerMappings; + private ManualHandlerMapping manualHandlerMapping; - public void addHandlerMapping(final HandlerMapping handlerMapping) { - this.handlerMappings = handlerMapping; + public DispatcherServlet() { } @Override public void init() { - this.handlerMappings.initialize(); + manualHandlerMapping = new ManualHandlerMapping(); + manualHandlerMapping.initialize(); } @Override protected void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException { - log.debug("Method : {}, Request URI : {}", request.getMethod(), request.getRequestURI()); + final String requestURI = request.getRequestURI(); + log.debug("Method : {}, Request URI : {}", request.getMethod(), requestURI); try { - final var controller = (Controller) handlerMappings.getHandler(request); + final var controller = manualHandlerMapping.getHandler(requestURI); final var viewName = controller.execute(request, response); move(viewName, request, response); } catch (Throwable e) { diff --git a/app/src/main/java/com/techcourse/DispatcherServletInitializer.java b/app/src/main/java/com/techcourse/DispatcherServletInitializer.java new file mode 100644 index 0000000000..6e814cdd25 --- /dev/null +++ b/app/src/main/java/com/techcourse/DispatcherServletInitializer.java @@ -0,0 +1,33 @@ +package com.techcourse; + +import jakarta.servlet.ServletContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import web.org.springframework.web.WebApplicationInitializer; + +/** + * Base class for {@link WebApplicationInitializer} + * implementations that register a {@link DispatcherServlet} in the servlet context. + */ +public class DispatcherServletInitializer implements WebApplicationInitializer { + + private static final Logger log = LoggerFactory.getLogger(DispatcherServletInitializer.class); + + private static final String DEFAULT_SERVLET_NAME = "dispatcher"; + + @Override + public void onStartup(final ServletContext servletContext) { + final var dispatcherServlet = new DispatcherServlet(); + + final var registration = servletContext.addServlet(DEFAULT_SERVLET_NAME, dispatcherServlet); + if (registration == null) { + throw new IllegalStateException("Failed to register servlet with name '" + DEFAULT_SERVLET_NAME + "'. " + + "Check if there is another servlet registered under the same name."); + } + + registration.setLoadOnStartup(1); + registration.addMapping("/"); + + log.info("Start AppWebApplication Initializer"); + } +} diff --git a/app/src/main/java/com/techcourse/ManualHandlerMapping.java b/app/src/main/java/com/techcourse/ManualHandlerMapping.java index 8a6fa9080f..a54863caf8 100644 --- a/app/src/main/java/com/techcourse/ManualHandlerMapping.java +++ b/app/src/main/java/com/techcourse/ManualHandlerMapping.java @@ -1,23 +1,20 @@ package com.techcourse; import com.techcourse.controller.*; -import jakarta.servlet.http.HttpServletRequest; -import nextstep.mvc.HandlerMapping; -import nextstep.mvc.controller.asis.Controller; -import nextstep.mvc.controller.asis.ForwardController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; +import webmvc.org.springframework.web.servlet.mvc.asis.ForwardController; import java.util.HashMap; import java.util.Map; -public class ManualHandlerMapping implements HandlerMapping { +public class ManualHandlerMapping { private static final Logger log = LoggerFactory.getLogger(ManualHandlerMapping.class); private static final Map controllers = new HashMap<>(); - @Override public void initialize() { controllers.put("/", new ForwardController("/index.jsp")); controllers.put("/login", new LoginController()); @@ -31,9 +28,7 @@ public void initialize() { .forEach(path -> log.info("Path : {}, Controller : {}", path, controllers.get(path).getClass())); } - @Override - public Controller getHandler(HttpServletRequest request) { - final String requestURI = request.getRequestURI(); + public Controller getHandler(final String requestURI) { log.debug("Request Mapping Uri : {}", requestURI); return controllers.get(requestURI); } diff --git a/app/src/main/java/com/techcourse/TomcatStarter.java b/app/src/main/java/com/techcourse/TomcatStarter.java new file mode 100644 index 0000000000..4f26f228e3 --- /dev/null +++ b/app/src/main/java/com/techcourse/TomcatStarter.java @@ -0,0 +1,83 @@ +package com.techcourse; + +import org.apache.catalina.Context; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.connector.Connector; +import org.apache.catalina.core.StandardContext; +import org.apache.catalina.startup.Tomcat; +import org.apache.tomcat.util.scan.StandardJarScanner; + +import java.io.File; + +public class TomcatStarter { + + public static final String WEBAPP_DIR_LOCATION = "app/src/main/webapp/"; + + private final Tomcat tomcat; + + public TomcatStarter(final int port) { + this(WEBAPP_DIR_LOCATION, port); + } + + public TomcatStarter(final String webappDirLocation, final int port) { + this.tomcat = new Tomcat(); + tomcat.setConnector(createConnector(port)); + + final var docBase = new File(webappDirLocation).getAbsolutePath(); + final var context = (StandardContext) tomcat.addWebapp("", docBase); + skipJarScan(context); + skipClearReferences(context); + } + + public void start() { + try { + tomcat.start(); + } catch (LifecycleException e) { + throw new UncheckedServletException(e); + } + } + + public void stop() { + try { + tomcat.stop(); + tomcat.destroy(); + } catch (LifecycleException e) { + throw new UncheckedServletException(e); + } + } + + private Connector createConnector(final int port) { + final var connector = new Connector(); + connector.setPort(port); + return connector; + } + + private void skipJarScan(final Context context) { + final var jarScanner = (StandardJarScanner) context.getJarScanner(); + jarScanner.setScanClassPath(false); + } + + private void skipClearReferences(final StandardContext context) { + /** + * https://tomcat.apache.org/tomcat-10.1-doc/config/context.html + * + * setClearReferencesObjectStreamClassCaches 번역 + * true인 경우 웹 응용 프로그램이 중지되면 Tomcat은 직렬화에 사용되는 + * ObjectStreamClass 클래스에서 웹 응용 프로그램에 의해 로드된 + * 클래스에 대한 SoftReference를 찾고 찾은 모든 SoftReference를 지웁니다. + * 이 기능은 리플렉션을 사용하여 SoftReference를 식별하므로 Java 9 이상에서 + * 실행할 때 명령줄 옵션 -XaddExports:java.base/java.io=ALL-UNNAMED를 설정해야 합니다. + * 지정하지 않으면 기본값인 true가 사용됩니다. + * + * ObjectStreamClass와 관련된 메모리 누수는 Java 19 이상, Java 17.0.4 이상 및 + * Java 11.0.16 이상에서 수정되었습니다. + * 수정 사항이 포함된 Java 버전에서 실행할 때 확인이 비활성화됩니다. + * + * Amazon Corretto-17.0.6은 경고 메시지가 나옴. + * 학습과 관련 없는 메시지가 나오지 않도록 관련 설정을 끈다. + */ + context.setClearReferencesObjectStreamClassCaches(false); + context.setClearReferencesRmiTargets(false); + context.setClearReferencesThreadLocals(false); + } +} diff --git a/app/src/main/java/com/techcourse/UncheckedServletException.java b/app/src/main/java/com/techcourse/UncheckedServletException.java new file mode 100644 index 0000000000..26acea7605 --- /dev/null +++ b/app/src/main/java/com/techcourse/UncheckedServletException.java @@ -0,0 +1,8 @@ +package com.techcourse; + +public class UncheckedServletException extends RuntimeException { + + public UncheckedServletException(Exception e) { + super(e); + } +} diff --git a/app/src/main/java/com/techcourse/controller/LoginController.java b/app/src/main/java/com/techcourse/controller/LoginController.java index a07292e25b..0428fe109e 100644 --- a/app/src/main/java/com/techcourse/controller/LoginController.java +++ b/app/src/main/java/com/techcourse/controller/LoginController.java @@ -4,7 +4,7 @@ import com.techcourse.repository.InMemoryUserRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,8 +31,7 @@ private String login(final HttpServletRequest request, final User user) { final var session = request.getSession(); session.setAttribute(UserSession.SESSION_KEY, user); return "redirect:/index.jsp"; - } else { - return "redirect:/401.jsp"; } + return "redirect:/401.jsp"; } } diff --git a/app/src/main/java/com/techcourse/controller/LoginViewController.java b/app/src/main/java/com/techcourse/controller/LoginViewController.java index 85d64a73f8..86ec26cdce 100644 --- a/app/src/main/java/com/techcourse/controller/LoginViewController.java +++ b/app/src/main/java/com/techcourse/controller/LoginViewController.java @@ -2,9 +2,9 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; public class LoginViewController implements Controller { diff --git a/app/src/main/java/com/techcourse/controller/LogoutController.java b/app/src/main/java/com/techcourse/controller/LogoutController.java index 9d1f099a98..4642fd9450 100644 --- a/app/src/main/java/com/techcourse/controller/LogoutController.java +++ b/app/src/main/java/com/techcourse/controller/LogoutController.java @@ -2,7 +2,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; public class LogoutController implements Controller { diff --git a/app/src/main/java/com/techcourse/controller/RegisterController.java b/app/src/main/java/com/techcourse/controller/RegisterController.java index 56bb436f6e..da62e5e8e9 100644 --- a/app/src/main/java/com/techcourse/controller/RegisterController.java +++ b/app/src/main/java/com/techcourse/controller/RegisterController.java @@ -4,7 +4,7 @@ import com.techcourse.repository.InMemoryUserRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; public class RegisterController implements Controller { diff --git a/app/src/main/java/com/techcourse/controller/RegisterViewController.java b/app/src/main/java/com/techcourse/controller/RegisterViewController.java index 052639134b..136962136d 100644 --- a/app/src/main/java/com/techcourse/controller/RegisterViewController.java +++ b/app/src/main/java/com/techcourse/controller/RegisterViewController.java @@ -2,7 +2,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.controller.asis.Controller; +import webmvc.org.springframework.web.servlet.mvc.asis.Controller; public class RegisterViewController implements Controller { diff --git a/build.gradle b/build.gradle index fd90bc151f..79cba97a1b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,12 @@ plugins { id "org.sonarqube" version "4.2.1.3168" } +allprojects { + repositories { + mavenCentral() + } +} + subprojects { apply plugin: 'org.sonarqube' sonar { diff --git a/mvc/src/main/java/nextstep/web/annotation/Controller.java b/mvc/src/main/java/context/org/springframework/stereotype/Controller.java similarity index 87% rename from mvc/src/main/java/nextstep/web/annotation/Controller.java rename to mvc/src/main/java/context/org/springframework/stereotype/Controller.java index cb264235b4..ef7379b54a 100644 --- a/mvc/src/main/java/nextstep/web/annotation/Controller.java +++ b/mvc/src/main/java/context/org/springframework/stereotype/Controller.java @@ -1,4 +1,4 @@ -package nextstep.web.annotation; +package context.org.springframework.stereotype; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mvc/src/main/java/core/org/springframework/util/ReflectionUtils.java b/mvc/src/main/java/core/org/springframework/util/ReflectionUtils.java new file mode 100644 index 0000000000..e89c1743f3 --- /dev/null +++ b/mvc/src/main/java/core/org/springframework/util/ReflectionUtils.java @@ -0,0 +1,38 @@ +package core.org.springframework.util; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; + +public abstract class ReflectionUtils { + + /** + * Obtain an accessible constructor for the given class and parameters. + * @param clazz the clazz to check + * @param parameterTypes the parameter types of the desired constructor + * @return the constructor reference + * @throws NoSuchMethodException if no such constructor exists + * @since 5.0 + */ + public static Constructor accessibleConstructor(Class clazz, Class... parameterTypes) + throws NoSuchMethodException { + + Constructor ctor = clazz.getDeclaredConstructor(parameterTypes); + makeAccessible(ctor); + return ctor; + } + + /** + * Make the given constructor accessible, explicitly setting it accessible + * if necessary. The {@code setAccessible(true)} method is only called + * when actually necessary, to avoid unnecessary conflicts. + * @param ctor the constructor to make accessible + * @see Constructor#setAccessible + */ + @SuppressWarnings("deprecation") + public static void makeAccessible(Constructor ctor) { + if ((!Modifier.isPublic(ctor.getModifiers()) || + !Modifier.isPublic(ctor.getDeclaringClass().getModifiers())) && !ctor.isAccessible()) { + ctor.setAccessible(true); + } + } +} diff --git a/mvc/src/main/java/nextstep/mvc/HandlerAdapter.java b/mvc/src/main/java/nextstep/mvc/HandlerAdapter.java deleted file mode 100644 index b1666cb54e..0000000000 --- a/mvc/src/main/java/nextstep/mvc/HandlerAdapter.java +++ /dev/null @@ -1,12 +0,0 @@ -package nextstep.mvc; - -import nextstep.mvc.view.ModelAndView; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -public interface HandlerAdapter { - boolean supports(Object handler); - - ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception; -} diff --git a/mvc/src/main/java/nextstep/mvc/HandlerMapping.java b/mvc/src/main/java/nextstep/mvc/HandlerMapping.java deleted file mode 100644 index 7da7184209..0000000000 --- a/mvc/src/main/java/nextstep/mvc/HandlerMapping.java +++ /dev/null @@ -1,10 +0,0 @@ -package nextstep.mvc; - -import jakarta.servlet.http.HttpServletRequest; - -public interface HandlerMapping { - - void initialize(); - - Object getHandler(HttpServletRequest request); -} diff --git a/mvc/src/main/java/nextstep/web/support/MediaType.java b/mvc/src/main/java/web/org/springframework/http/MediaType.java similarity index 76% rename from mvc/src/main/java/nextstep/web/support/MediaType.java rename to mvc/src/main/java/web/org/springframework/http/MediaType.java index f881e02174..3a31f51d33 100644 --- a/mvc/src/main/java/nextstep/web/support/MediaType.java +++ b/mvc/src/main/java/web/org/springframework/http/MediaType.java @@ -1,4 +1,4 @@ -package nextstep.web.support; +package web.org.springframework.http; public class MediaType { public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8"; diff --git a/mvc/src/main/java/nextstep/web/NextstepServletContainerInitializer.java b/mvc/src/main/java/web/org/springframework/web/SpringServletContainerInitializer.java similarity index 73% rename from mvc/src/main/java/nextstep/web/NextstepServletContainerInitializer.java rename to mvc/src/main/java/web/org/springframework/web/SpringServletContainerInitializer.java index 3e79b34b6a..f1c13fcd53 100644 --- a/mvc/src/main/java/nextstep/web/NextstepServletContainerInitializer.java +++ b/mvc/src/main/java/web/org/springframework/web/SpringServletContainerInitializer.java @@ -1,28 +1,30 @@ -package nextstep.web; +package web.org.springframework.web; +import core.org.springframework.util.ReflectionUtils; import jakarta.servlet.ServletContainerInitializer; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.HandlesTypes; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import java.util.Set; @HandlesTypes(WebApplicationInitializer.class) -public class NextstepServletContainerInitializer implements ServletContainerInitializer { +public class SpringServletContainerInitializer implements ServletContainerInitializer { @Override public void onStartup(Set> webAppInitializerClasses, ServletContext servletContext) throws ServletException { - final List initializers = new LinkedList<>(); + final List initializers = new ArrayList<>(); if (webAppInitializerClasses != null) { for (Class waiClass : webAppInitializerClasses) { try { - initializers.add((WebApplicationInitializer) waiClass.getDeclaredConstructor().newInstance()); - } catch (Throwable e) { - throw new ServletException("Failed to instantiate WebApplicationInitializer class", e); + initializers.add((WebApplicationInitializer) + ReflectionUtils.accessibleConstructor(waiClass).newInstance()); + } catch (Throwable ex) { + throw new ServletException("Failed to instantiate WebApplicationInitializer class", ex); } } } diff --git a/mvc/src/main/java/nextstep/web/WebApplicationInitializer.java b/mvc/src/main/java/web/org/springframework/web/WebApplicationInitializer.java similarity index 84% rename from mvc/src/main/java/nextstep/web/WebApplicationInitializer.java rename to mvc/src/main/java/web/org/springframework/web/WebApplicationInitializer.java index 60e6a89543..4b9b7d893d 100644 --- a/mvc/src/main/java/nextstep/web/WebApplicationInitializer.java +++ b/mvc/src/main/java/web/org/springframework/web/WebApplicationInitializer.java @@ -1,4 +1,4 @@ -package nextstep.web; +package web.org.springframework.web; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; diff --git a/mvc/src/main/java/nextstep/web/annotation/PathVariable.java b/mvc/src/main/java/web/org/springframework/web/bind/annotation/PathVariable.java similarity index 82% rename from mvc/src/main/java/nextstep/web/annotation/PathVariable.java rename to mvc/src/main/java/web/org/springframework/web/bind/annotation/PathVariable.java index 4f2a9b50a5..ceefd548e1 100644 --- a/mvc/src/main/java/nextstep/web/annotation/PathVariable.java +++ b/mvc/src/main/java/web/org/springframework/web/bind/annotation/PathVariable.java @@ -1,4 +1,4 @@ -package nextstep.web.annotation; +package web.org.springframework.web.bind.annotation; import java.lang.annotation.*; diff --git a/mvc/src/main/java/nextstep/web/annotation/RequestMapping.java b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMapping.java similarity index 82% rename from mvc/src/main/java/nextstep/web/annotation/RequestMapping.java rename to mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMapping.java index bb8c9e6e7b..6a09dfa0c4 100644 --- a/mvc/src/main/java/nextstep/web/annotation/RequestMapping.java +++ b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMapping.java @@ -1,6 +1,4 @@ -package nextstep.web.annotation; - -import nextstep.web.support.RequestMethod; +package web.org.springframework.web.bind.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mvc/src/main/java/nextstep/web/support/RequestMethod.java b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMethod.java similarity index 62% rename from mvc/src/main/java/nextstep/web/support/RequestMethod.java rename to mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMethod.java index 1f37f21d5a..1dd958bd23 100644 --- a/mvc/src/main/java/nextstep/web/support/RequestMethod.java +++ b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestMethod.java @@ -1,4 +1,4 @@ -package nextstep.web.support; +package web.org.springframework.web.bind.annotation; public enum RequestMethod { GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE diff --git a/mvc/src/main/java/nextstep/web/annotation/RequestParam.java b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestParam.java similarity index 82% rename from mvc/src/main/java/nextstep/web/annotation/RequestParam.java rename to mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestParam.java index 2813247c4a..5b3be4cedc 100644 --- a/mvc/src/main/java/nextstep/web/annotation/RequestParam.java +++ b/mvc/src/main/java/web/org/springframework/web/bind/annotation/RequestParam.java @@ -1,4 +1,4 @@ -package nextstep.web.annotation; +package web.org.springframework.web.bind.annotation; import java.lang.annotation.*; diff --git a/mvc/src/main/java/nextstep/mvc/view/ModelAndView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/ModelAndView.java similarity index 93% rename from mvc/src/main/java/nextstep/mvc/view/ModelAndView.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/ModelAndView.java index cb172084b3..ff8e24553f 100644 --- a/mvc/src/main/java/nextstep/mvc/view/ModelAndView.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/ModelAndView.java @@ -1,4 +1,4 @@ -package nextstep.mvc.view; +package webmvc.org.springframework.web.servlet; import java.util.Collections; import java.util.HashMap; diff --git a/mvc/src/main/java/nextstep/mvc/view/View.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/View.java similarity index 84% rename from mvc/src/main/java/nextstep/mvc/view/View.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/View.java index 493ed75c64..4499f36866 100644 --- a/mvc/src/main/java/nextstep/mvc/view/View.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/View.java @@ -1,4 +1,4 @@ -package nextstep.mvc.view; +package webmvc.org.springframework.web.servlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/mvc/src/main/java/nextstep/mvc/controller/asis/Controller.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/Controller.java similarity index 80% rename from mvc/src/main/java/nextstep/mvc/controller/asis/Controller.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/Controller.java index b0edabf3fb..bdd1fde780 100644 --- a/mvc/src/main/java/nextstep/mvc/controller/asis/Controller.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/Controller.java @@ -1,4 +1,4 @@ -package nextstep.mvc.controller.asis; +package webmvc.org.springframework.web.servlet.mvc.asis; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/mvc/src/main/java/nextstep/mvc/controller/asis/ForwardController.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/ForwardController.java similarity index 89% rename from mvc/src/main/java/nextstep/mvc/controller/asis/ForwardController.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/ForwardController.java index ed0f08d940..cd8f1ef371 100644 --- a/mvc/src/main/java/nextstep/mvc/controller/asis/ForwardController.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/asis/ForwardController.java @@ -1,4 +1,4 @@ -package nextstep.mvc.controller.asis; +package webmvc.org.springframework.web.servlet.mvc.asis; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/mvc/src/main/java/nextstep/mvc/controller/tobe/AnnotationHandlerMapping.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java similarity index 83% rename from mvc/src/main/java/nextstep/mvc/controller/tobe/AnnotationHandlerMapping.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java index cc1331de49..a355218efa 100644 --- a/mvc/src/main/java/nextstep/mvc/controller/tobe/AnnotationHandlerMapping.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java @@ -1,14 +1,13 @@ -package nextstep.mvc.controller.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe; import jakarta.servlet.http.HttpServletRequest; -import nextstep.mvc.HandlerMapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; -public class AnnotationHandlerMapping implements HandlerMapping { +public class AnnotationHandlerMapping { private static final Logger log = LoggerFactory.getLogger(AnnotationHandlerMapping.class); diff --git a/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerExecution.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java similarity index 70% rename from mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerExecution.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java index ebdc3d9b10..37c583fbdf 100644 --- a/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerExecution.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerExecution.java @@ -1,8 +1,8 @@ -package nextstep.mvc.controller.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import nextstep.mvc.view.ModelAndView; +import webmvc.org.springframework.web.servlet.ModelAndView; public class HandlerExecution { diff --git a/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerKey.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java similarity index 87% rename from mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerKey.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java index b6934407a1..30d3c780ff 100644 --- a/mvc/src/main/java/nextstep/mvc/controller/tobe/HandlerKey.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/HandlerKey.java @@ -1,6 +1,6 @@ -package nextstep.mvc.controller.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe; -import nextstep.web.support.RequestMethod; +import web.org.springframework.web.bind.annotation.RequestMethod; import java.util.Objects; diff --git a/mvc/src/main/java/nextstep/mvc/view/JsonView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java similarity index 75% rename from mvc/src/main/java/nextstep/mvc/view/JsonView.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java index b7c4c06a71..b42c3466f0 100644 --- a/mvc/src/main/java/nextstep/mvc/view/JsonView.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JsonView.java @@ -1,7 +1,8 @@ -package nextstep.mvc.view; +package webmvc.org.springframework.web.servlet.view; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import webmvc.org.springframework.web.servlet.View; import java.util.Map; diff --git a/mvc/src/main/java/nextstep/mvc/view/JspView.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java similarity index 88% rename from mvc/src/main/java/nextstep/mvc/view/JspView.java rename to mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java index 858c3ccece..3f4cc906ff 100644 --- a/mvc/src/main/java/nextstep/mvc/view/JspView.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/view/JspView.java @@ -1,9 +1,10 @@ -package nextstep.mvc.view; +package webmvc.org.springframework.web.servlet.view; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import webmvc.org.springframework.web.servlet.View; import java.util.Map; diff --git a/mvc/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/mvc/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer index b9002355ee..d98fc63525 100644 --- a/mvc/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer +++ b/mvc/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer @@ -1 +1 @@ -nextstep.web.NextstepServletContainerInitializer \ No newline at end of file +web.org.springframework.web.SpringServletContainerInitializer diff --git a/mvc/src/test/java/samples/TestController.java b/mvc/src/test/java/samples/TestController.java index 49d81be351..1f0e4acfb3 100644 --- a/mvc/src/test/java/samples/TestController.java +++ b/mvc/src/test/java/samples/TestController.java @@ -1,14 +1,14 @@ package samples; +import context.org.springframework.stereotype.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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import web.org.springframework.web.bind.annotation.RequestMapping; +import web.org.springframework.web.bind.annotation.RequestMethod; +import webmvc.org.springframework.web.servlet.ModelAndView; +import webmvc.org.springframework.web.servlet.view.JspView; @Controller public class TestController { diff --git a/mvc/src/test/java/nextstep/mvc/controller/tobe/AnnotationHandlerMappingTest.java b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMappingTest.java similarity index 96% rename from mvc/src/test/java/nextstep/mvc/controller/tobe/AnnotationHandlerMappingTest.java rename to mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMappingTest.java index 3236c5c433..dcec215a3f 100644 --- a/mvc/src/test/java/nextstep/mvc/controller/tobe/AnnotationHandlerMappingTest.java +++ b/mvc/src/test/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMappingTest.java @@ -1,4 +1,4 @@ -package nextstep.mvc.controller.tobe; +package webmvc.org.springframework.web.servlet.mvc.tobe; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; From e7c21ab067b56fde67900cb4088c2a8ca3bf4016 Mon Sep 17 00:00:00 2001 From: kang-hyungu Date: Mon, 11 Sep 2023 17:09:04 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=84=9C=EB=B8=94=EB=A6=BF=20=ED=95=99?= =?UTF-8?q?=EC=8A=B5=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../servlet/com/example/TomcatStarter.java | 1 + .../java/servlet/com/example/FilterTest.java | 7 +++-- .../java/servlet/com/example/ServletTest.java | 23 ++++++++------- .../servlet/com/example/TestHttpUtils.java | 28 ------------------- 5 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 study/src/test/java/servlet/com/example/TestHttpUtils.java diff --git a/.gitignore b/.gitignore index 672d1adecf..1bcba66f9d 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,5 @@ Temporary Items tomcat.* tomcat.*/** + +**/WEB-INF/classes/** diff --git a/study/src/main/java/servlet/com/example/TomcatStarter.java b/study/src/main/java/servlet/com/example/TomcatStarter.java index 109b9d5297..b91214e9c3 100644 --- a/study/src/main/java/servlet/com/example/TomcatStarter.java +++ b/study/src/main/java/servlet/com/example/TomcatStarter.java @@ -44,6 +44,7 @@ public void await() { public void stop() { try { tomcat.stop(); + tomcat.destroy(); } catch (LifecycleException e) { throw new RuntimeException(e); } diff --git a/study/src/test/java/servlet/com/example/FilterTest.java b/study/src/test/java/servlet/com/example/FilterTest.java index 7c958af764..53d6236dff 100644 --- a/study/src/test/java/servlet/com/example/FilterTest.java +++ b/study/src/test/java/servlet/com/example/FilterTest.java @@ -1,6 +1,7 @@ package servlet.com.example; import org.junit.jupiter.api.Test; +import support.HttpUtils; import static org.assertj.core.api.Assertions.assertThat; import static servlet.com.example.KoreanServlet.인코딩; @@ -8,12 +9,12 @@ class FilterTest { @Test - void testFilter() throws Exception { + void testFilter() { // 톰캣 서버 시작 - final var tomcatStarter = TestHttpUtils.createTomcatStarter(); + final var tomcatStarter = new TomcatStarter("src/main/webapp/"); tomcatStarter.start(); - final var response = TestHttpUtils.send("/korean"); + final var response = HttpUtils.send("/korean"); // 톰캣 서버 종료 tomcatStarter.stop(); diff --git a/study/src/test/java/servlet/com/example/ServletTest.java b/study/src/test/java/servlet/com/example/ServletTest.java index 0cb371f4d0..75fbb10dd5 100644 --- a/study/src/test/java/servlet/com/example/ServletTest.java +++ b/study/src/test/java/servlet/com/example/ServletTest.java @@ -1,22 +1,25 @@ package servlet.com.example; import org.junit.jupiter.api.Test; +import support.HttpUtils; import static org.assertj.core.api.Assertions.assertThat; class ServletTest { + private final String WEBAPP_DIR_LOCATION = "src/main/webapp/"; + @Test - void testSharedCounter() throws Exception { + void testSharedCounter() { // 톰캣 서버 시작 - final var tomcatStarter = TestHttpUtils.createTomcatStarter(); + final var tomcatStarter = new TomcatStarter(WEBAPP_DIR_LOCATION); tomcatStarter.start(); // shared-counter 페이지를 3번 호출한다. final var PATH = "/shared-counter"; - TestHttpUtils.send(PATH); - TestHttpUtils.send(PATH); - final var response = TestHttpUtils.send(PATH); + HttpUtils.send(PATH); + HttpUtils.send(PATH); + final var response = HttpUtils.send(PATH); // 톰캣 서버 종료 tomcatStarter.stop(); @@ -29,16 +32,16 @@ void testSharedCounter() throws Exception { } @Test - void testLocalCounter() throws Exception { + void testLocalCounter() { // 톰캣 서버 시작 - final var tomcatStarter = TestHttpUtils.createTomcatStarter(); + final var tomcatStarter = new TomcatStarter(WEBAPP_DIR_LOCATION); tomcatStarter.start(); // local-counter 페이지를 3번 호출한다. final var PATH = "/local-counter"; - TestHttpUtils.send(PATH); - TestHttpUtils.send(PATH); - final var response = TestHttpUtils.send(PATH); + HttpUtils.send(PATH); + HttpUtils.send(PATH); + final var response = HttpUtils.send(PATH); // 톰캣 서버 종료 tomcatStarter.stop(); diff --git a/study/src/test/java/servlet/com/example/TestHttpUtils.java b/study/src/test/java/servlet/com/example/TestHttpUtils.java deleted file mode 100644 index dde039228f..0000000000 --- a/study/src/test/java/servlet/com/example/TestHttpUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -package servlet.com.example; - -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.time.Duration; - -public class TestHttpUtils { - - private static final HttpClient httpClient = HttpClient.newBuilder() - .version(HttpClient.Version.HTTP_1_1) - .connectTimeout(Duration.ofSeconds(3)) - .build(); - - public static TomcatStarter createTomcatStarter() { - return new TomcatStarter("../servlet/src/main/webapp/"); - } - - public static HttpResponse send(final String path) throws Exception { - final var request = HttpRequest.newBuilder() - .uri(URI.create("http://localhost:8080" + path)) - .timeout(Duration.ofSeconds(3)) - .build(); - - return httpClient.send(request, HttpResponse.BodyHandlers.ofString()); - } -} From 3a3ddb1d9ca6e64ee8eadf2a07d50f52f3e56dd8 Mon Sep 17 00:00:00 2001 From: DongUk <68818952+Kim0914@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:45:07 +0900 Subject: [PATCH 3/7] =?UTF-8?q?test:=20=EB=A6=AC=ED=94=8C=EB=A0=89?= =?UTF-8?q?=EC=85=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/reflection/Junit3TestRunner.java | 7 ++- .../java/reflection/Junit4TestRunner.java | 7 +++ .../test/java/reflection/ReflectionTest.java | 53 +++++++++++-------- .../test/java/reflection/ReflectionsTest.java | 18 +++++++ 4 files changed, 61 insertions(+), 24 deletions(-) diff --git a/study/src/test/java/reflection/Junit3TestRunner.java b/study/src/test/java/reflection/Junit3TestRunner.java index b4e465240c..3ba1bbdce3 100644 --- a/study/src/test/java/reflection/Junit3TestRunner.java +++ b/study/src/test/java/reflection/Junit3TestRunner.java @@ -1,5 +1,6 @@ package reflection; +import java.lang.reflect.Method; import org.junit.jupiter.api.Test; class Junit3TestRunner { @@ -8,6 +9,10 @@ class Junit3TestRunner { void run() throws Exception { Class clazz = Junit3Test.class; - // TODO Junit3Test에서 test로 시작하는 메소드 실행 + Method[] methods = clazz.getDeclaredMethods(); + for (Method method : methods) { + if (method.getName().startsWith("test")) + method.invoke(new Junit3Test()); + } } } diff --git a/study/src/test/java/reflection/Junit4TestRunner.java b/study/src/test/java/reflection/Junit4TestRunner.java index 8a6916bc24..052e3f0ead 100644 --- a/study/src/test/java/reflection/Junit4TestRunner.java +++ b/study/src/test/java/reflection/Junit4TestRunner.java @@ -1,5 +1,6 @@ package reflection; +import java.lang.reflect.Method; import org.junit.jupiter.api.Test; class Junit4TestRunner { @@ -9,5 +10,11 @@ void run() throws Exception { Class clazz = Junit4Test.class; // TODO Junit4Test에서 @MyTest 애노테이션이 있는 메소드 실행 + Method[] methods = clazz.getDeclaredMethods(); + for (Method method : methods) { + if (method.isAnnotationPresent(MyTest.class)) { + method.invoke(new Junit4Test()); + } + } } } diff --git a/study/src/test/java/reflection/ReflectionTest.java b/study/src/test/java/reflection/ReflectionTest.java index 370f0932b9..7adfb631eb 100644 --- a/study/src/test/java/reflection/ReflectionTest.java +++ b/study/src/test/java/reflection/ReflectionTest.java @@ -1,5 +1,8 @@ package reflection; +import java.util.Arrays; +import java.util.Date; +import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,25 +22,27 @@ class ReflectionTest { void givenObject_whenGetsClassName_thenCorrect() { final Class clazz = Question.class; - assertThat(clazz.getSimpleName()).isEqualTo(""); - assertThat(clazz.getName()).isEqualTo(""); - assertThat(clazz.getCanonicalName()).isEqualTo(""); + assertThat(clazz.getSimpleName()).isEqualTo("Question"); + assertThat(clazz.getName()).isEqualTo("reflection.Question"); + assertThat(clazz.getCanonicalName()).isEqualTo("reflection.Question"); } @Test void givenClassName_whenCreatesObject_thenCorrect() throws ClassNotFoundException { final Class clazz = Class.forName("reflection.Question"); - assertThat(clazz.getSimpleName()).isEqualTo(""); - assertThat(clazz.getName()).isEqualTo(""); - assertThat(clazz.getCanonicalName()).isEqualTo(""); + assertThat(clazz.getSimpleName()).isEqualTo("Question"); + assertThat(clazz.getName()).isEqualTo("reflection.Question"); + assertThat(clazz.getCanonicalName()).isEqualTo("reflection.Question"); } @Test void givenObject_whenGetsFieldNamesAtRuntime_thenCorrect() { final Object student = new Student(); - final Field[] fields = null; - final List actualFieldNames = null; + final Field[] fields = student.getClass().getDeclaredFields(); + final List actualFieldNames = Arrays.stream(fields) + .map(Field::getName) + .collect(Collectors.toList()); assertThat(actualFieldNames).contains("name", "age"); } @@ -45,8 +50,10 @@ void givenObject_whenGetsFieldNamesAtRuntime_thenCorrect() { @Test void givenClass_whenGetsMethods_thenCorrect() { final Class animalClass = Student.class; - final Method[] methods = null; - final List actualMethods = null; + final Method[] methods = animalClass.getDeclaredMethods(); + final List actualMethods = Arrays.stream(methods) + .map(Method::getName) + .collect(Collectors.toList()); assertThat(actualMethods) .hasSize(3) @@ -56,7 +63,7 @@ void givenClass_whenGetsMethods_thenCorrect() { @Test void givenClass_whenGetsAllConstructors_thenCorrect() { final Class questionClass = Question.class; - final Constructor[] constructors = null; + final Constructor[] constructors = questionClass.getDeclaredConstructors(); assertThat(constructors).hasSize(2); } @@ -65,11 +72,11 @@ void givenClass_whenGetsAllConstructors_thenCorrect() { void givenClass_whenInstantiatesObjectsAtRuntime_thenCorrect() throws Exception { final Class questionClass = Question.class; - final Constructor firstConstructor = null; - final Constructor secondConstructor = null; + final Constructor firstConstructor = questionClass.getConstructor(String.class, String.class, String.class); + final Constructor secondConstructor = questionClass.getConstructor(long.class, String.class, String.class, String.class, Date.class, int.class); - final Question firstQuestion = null; - final Question secondQuestion = null; + final Question firstQuestion = (Question) firstConstructor.newInstance("gugu", "제목1", "내용1"); + final Question secondQuestion = (Question) secondConstructor.newInstance(1L, "gugu", "제목2", "내용2", new Date(5), 10); assertThat(firstQuestion.getWriter()).isEqualTo("gugu"); assertThat(firstQuestion.getTitle()).isEqualTo("제목1"); @@ -82,7 +89,7 @@ void givenClass_whenInstantiatesObjectsAtRuntime_thenCorrect() throws Exception @Test void givenClass_whenGetsPublicFields_thenCorrect() { final Class questionClass = Question.class; - final Field[] fields = null; + final Field[] fields = questionClass.getFields(); assertThat(fields).hasSize(0); } @@ -90,7 +97,7 @@ void givenClass_whenGetsPublicFields_thenCorrect() { @Test void givenClass_whenGetsDeclaredFields_thenCorrect() { final Class questionClass = Question.class; - final Field[] fields = null; + final Field[] fields = questionClass.getDeclaredFields(); assertThat(fields).hasSize(6); assertThat(fields[0].getName()).isEqualTo("questionId"); @@ -99,7 +106,7 @@ void givenClass_whenGetsDeclaredFields_thenCorrect() { @Test void givenClass_whenGetsFieldsByName_thenCorrect() throws Exception { final Class questionClass = Question.class; - final Field field = null; + final Field field = questionClass.getDeclaredField("questionId"); assertThat(field.getName()).isEqualTo("questionId"); } @@ -107,7 +114,7 @@ void givenClass_whenGetsFieldsByName_thenCorrect() throws Exception { @Test void givenClassField_whenGetsType_thenCorrect() throws Exception { final Field field = Question.class.getDeclaredField("questionId"); - final Class fieldClass = null; + final Class fieldClass = field.getType(); assertThat(fieldClass.getSimpleName()).isEqualTo("long"); } @@ -115,15 +122,15 @@ void givenClassField_whenGetsType_thenCorrect() throws Exception { @Test void givenClassField_whenSetsAndGetsValue_thenCorrect() throws Exception { final Class studentClass = Student.class; - final Student student = null; - final Field field = null; + final Student student = new Student(); + final Field field = studentClass.getDeclaredField("age"); - // todo field에 접근 할 수 있도록 만든다. + field.setAccessible(true); assertThat(field.getInt(student)).isZero(); assertThat(student.getAge()).isZero(); - field.set(null, null); + field.set(student, 99); assertThat(field.getInt(student)).isEqualTo(99); assertThat(student.getAge()).isEqualTo(99); diff --git a/study/src/test/java/reflection/ReflectionsTest.java b/study/src/test/java/reflection/ReflectionsTest.java index 5040c2ffa2..06c0173dc4 100644 --- a/study/src/test/java/reflection/ReflectionsTest.java +++ b/study/src/test/java/reflection/ReflectionsTest.java @@ -1,9 +1,13 @@ package reflection; +import java.util.Set; import org.junit.jupiter.api.Test; import org.reflections.Reflections; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import reflection.annotation.Controller; +import reflection.annotation.Repository; +import reflection.annotation.Service; class ReflectionsTest { @@ -14,5 +18,19 @@ void showAnnotationClass() throws Exception { Reflections reflections = new Reflections("reflection.examples"); // TODO 클래스 레벨에 @Controller, @Service, @Repository 애노테이션이 설정되어 모든 클래스 찾아 로그로 출력한다. + Set> typesAnnotatedWithController = reflections.getTypesAnnotatedWith(Controller.class); + for (Class aClass : typesAnnotatedWithController) { + log.info("@Controller: " + aClass.getSimpleName()); + } + + Set> typesAnnotatedWithService = reflections.getTypesAnnotatedWith(Service.class); + for (Class aClass : typesAnnotatedWithService) { + log.info("@Service: " + aClass.getSimpleName()); + } + + Set> typesAnnotatedWithRepository = reflections.getTypesAnnotatedWith(Repository.class); + for (Class aClass : typesAnnotatedWithRepository) { + log.info("@Repository: " + aClass.getSimpleName()); + } } } From a57f99c20579755c99751b13a6f651352898355d Mon Sep 17 00:00:00 2001 From: DongUk <68818952+Kim0914@users.noreply.github.com> Date: Tue, 12 Sep 2023 22:27:13 +0900 Subject: [PATCH 4/7] =?UTF-8?q?test:=20=EC=84=9C=EB=B8=94=EB=A6=BF,=20?= =?UTF-8?q?=ED=95=84=ED=84=B0=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/servlet/com/example/CharacterEncodingFilter.java | 2 ++ study/src/test/java/servlet/com/example/ServletTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/study/src/main/java/servlet/com/example/CharacterEncodingFilter.java b/study/src/main/java/servlet/com/example/CharacterEncodingFilter.java index cf4d886974..11d0b7fa90 100644 --- a/study/src/main/java/servlet/com/example/CharacterEncodingFilter.java +++ b/study/src/main/java/servlet/com/example/CharacterEncodingFilter.java @@ -11,6 +11,8 @@ public class CharacterEncodingFilter implements Filter { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { request.getServletContext().log("doFilter() 호출"); + request.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); chain.doFilter(request, response); } } diff --git a/study/src/test/java/servlet/com/example/ServletTest.java b/study/src/test/java/servlet/com/example/ServletTest.java index 75fbb10dd5..c5453f6949 100644 --- a/study/src/test/java/servlet/com/example/ServletTest.java +++ b/study/src/test/java/servlet/com/example/ServletTest.java @@ -1,10 +1,10 @@ package servlet.com.example; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; import support.HttpUtils; -import static org.assertj.core.api.Assertions.assertThat; - class ServletTest { private final String WEBAPP_DIR_LOCATION = "src/main/webapp/"; @@ -28,7 +28,7 @@ void testSharedCounter() { // expected를 0이 아닌 올바른 값으로 바꿔보자. // 예상한 결과가 나왔는가? 왜 이런 결과가 나왔을까? - assertThat(Integer.parseInt(response.body())).isEqualTo(0); + assertThat(Integer.parseInt(response.body())).isEqualTo(3); } @Test @@ -50,6 +50,6 @@ void testLocalCounter() { // expected를 0이 아닌 올바른 값으로 바꿔보자. // 예상한 결과가 나왔는가? 왜 이런 결과가 나왔을까? - assertThat(Integer.parseInt(response.body())).isEqualTo(0); + assertThat(Integer.parseInt(response.body())).isEqualTo(1); } } From 619c2b91e160eb55bd94097236ef44fcecc21756 Mon Sep 17 00:00:00 2001 From: DongUk <68818952+Kim0914@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:23:04 +0900 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20HandlerExecution=20object,=20method?= =?UTF-8?q?=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/servlet/mvc/tobe/HandlerExecution.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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/HandlerExecution.java index 37c583fbdf..a8dd7abd0c 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/HandlerExecution.java @@ -2,11 +2,20 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.lang.reflect.Method; import webmvc.org.springframework.web.servlet.ModelAndView; public class HandlerExecution { + private final Object object; + private final Method method; + + public HandlerExecution(Object object, Method method) { + this.object = object; + this.method = method; + } + public ModelAndView handle(final HttpServletRequest request, final HttpServletResponse response) throws Exception { - return null; + return (ModelAndView) method.invoke(object, request, response); } } From b139de69bc103e97bb13f9a98739f2295c497ed8 Mon Sep 17 00:00:00 2001 From: DongUk <68818952+Kim0914@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:23:45 +0900 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=EC=96=B4=EB=85=B8=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=ED=95=B8=EB=93=A4=EB=9F=AC=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mvc/tobe/AnnotationHandlerMapping.java | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java index a355218efa..d2ae30eb6e 100644 --- a/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java +++ b/mvc/src/main/java/webmvc/org/springframework/web/servlet/mvc/tobe/AnnotationHandlerMapping.java @@ -1,11 +1,17 @@ package webmvc.org.springframework.web.servlet.mvc.tobe; +import context.org.springframework.stereotype.Controller; import jakarta.servlet.http.HttpServletRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import java.util.Set; +import org.reflections.Reflections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import web.org.springframework.web.bind.annotation.RequestMapping; +import web.org.springframework.web.bind.annotation.RequestMethod; public class AnnotationHandlerMapping { @@ -21,9 +27,44 @@ public AnnotationHandlerMapping(final Object... basePackage) { public void initialize() { log.info("Initialized AnnotationHandlerMapping!"); + Reflections reflections = new Reflections(basePackage); + Set> classes = reflections.getTypesAnnotatedWith(Controller.class); + for (Class aClass : classes) { + findAnnotatedMethod(aClass); + } + } + + private void findAnnotatedMethod(Class aClass) { + for (Method method : aClass.getDeclaredMethods()) { + addHandler(aClass, method); + } + } + + private void addHandler(Class aClass, Method method) { + RequestMapping requestMapping = method.getAnnotation(RequestMapping.class); + if (requestMapping == null) { + return; + } + + String url = requestMapping.value(); + RequestMethod[] methods = requestMapping.method(); + for (RequestMethod requestMethod : methods) { + HandlerKey handlerKey = new HandlerKey(url, requestMethod); + handlerExecutions.put(handlerKey, new HandlerExecution(getObject(aClass), method)); + } + } + + private Object getObject(Class aClass) { + try { + return aClass.getDeclaredConstructor().newInstance(); + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | + NoSuchMethodException e) { + throw new IllegalStateException(e); + } } public Object getHandler(final HttpServletRequest request) { - return null; + HandlerKey handlerKey = new HandlerKey(request.getRequestURI(), RequestMethod.valueOf(request.getMethod())); + return handlerExecutions.get(handlerKey); } } From 57c3131d10813bb70d45cc7a864700af6ec5e932 Mon Sep 17 00:00:00 2001 From: DongUk <68818952+Kim0914@users.noreply.github.com> Date: Wed, 13 Sep 2023 14:25:03 +0900 Subject: [PATCH 7/7] =?UTF-8?q?build:=20=EC=86=8C=EB=82=98=20=ED=81=B4?= =?UTF-8?q?=EB=9D=BC=EC=9A=B0=EB=93=9C=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f63e4a797..179fbb276b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew clean build codeCoverageReport --info -x :study:build + run: ./gradlew clean build codeCoverageReport sonar --info -x :study:build