Renaming packages to avoid split them accross multiple modules

Related to quarkusio#44742 and quarkusio#44741
aureamunoz · Nov 27, 2024 · 7eac578 · 7eac578
1 parent d99e142
commit 7eac578
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 25 deletions.
diff --git a/.../main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java b/.../main/java/io/quarkus/spring/web/deployment/ControllerAdviceExceptionMapperGenerator.java
@@ -197,8 +197,8 @@ private ResultHandle getResponseContentType(MethodCreator methodCreator, List<St
                 .toArray(ResultHandle[]::new);
 
         String responseContentTypeResolverClassName = isResteasyClassic
-                ? "io.quarkus.spring.web.runtime.ResteasyClassicResponseContentTypeResolver"
-                : "io.quarkus.spring.web.runtime.ResteasyReactiveResponseContentTypeResolver";
+                ? "io.quarkus.spring.web.resteasy.classic.runtime.ResteasyClassicResponseContentTypeResolver"
+                : "io.quarkus.spring.web.resteasy.reactive.runtime.ResteasyReactiveResponseContentTypeResolver";
         ResultHandle contentTypeResolver = methodCreator
                 .newInstance(MethodDescriptor.ofConstructor(responseContentTypeResolverClassName));
 

diff --git a/...nt/SpringWebResteasyClassicProcessor.java → ...nt/SpringWebResteasyClassicProcessor.java b/...nt/SpringWebResteasyClassicProcessor.java → ...nt/SpringWebResteasyClassicProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.deployment;
+package io.quarkus.spring.web.resteasy.classic.deployment;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...syClassicResponseContentTypeResolver.java → ...syClassicResponseContentTypeResolver.java b/...syClassicResponseContentTypeResolver.java → ...syClassicResponseContentTypeResolver.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.runtime;
+package io.quarkus.spring.web.resteasy.classic.runtime;
 
 import java.util.List;
 

diff --git a/...spring/web/test/ControllerReloadTest.java → ...sy/classic/test/ControllerReloadTest.java b/...spring/web/test/ControllerReloadTest.java → ...sy/classic/test/ControllerReloadTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.classic.test;
 
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.is;

diff --git a/...g/web/test/MissingRestControllerTest.java → ...assic/test/MissingRestControllerTest.java b/...g/web/test/MissingRestControllerTest.java → ...assic/test/MissingRestControllerTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.classic.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -24,7 +24,8 @@ public class MissingRestControllerTest {
             .setApplicationName("missing-rest-controller")
             .setApplicationVersion("0.1-SNAPSHOT")
             .setLogRecordPredicate(
-                    r -> "io.quarkus.spring.web.deployment.SpringWebResteasyClassicProcessor".equals(r.getLoggerName()));
+                    r -> "io.quarkus.spring.web.resteasy.classic.deployment.SpringWebResteasyClassicProcessor"
+                            .equals(r.getLoggerName()));
 
     @ProdBuildResults
     private ProdModeTestResults prodModeTestResults;

diff --git a/...esponseStatusAndExceptionHandlerTest.java → ...esponseStatusAndExceptionHandlerTest.java b/...esponseStatusAndExceptionHandlerTest.java → ...esponseStatusAndExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.classic.test;
 
 import static io.restassured.RestAssured.when;
 

diff --git a/...ring/web/test/SimpleSpringController.java → .../classic/test/SimpleSpringController.java b/...ring/web/test/SimpleSpringController.java → .../classic/test/SimpleSpringController.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.classic.test;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

diff --git a/.../web/test/SimpleSpringControllerTest.java → ...ssic/test/SimpleSpringControllerTest.java b/.../web/test/SimpleSpringControllerTest.java → ...ssic/test/SimpleSpringControllerTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.classic.test;
 
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.is;

diff --git a/...t/SpringWebResteasyReactiveProcessor.java → ...t/SpringWebResteasyReactiveProcessor.java b/...t/SpringWebResteasyReactiveProcessor.java → ...t/SpringWebResteasyReactiveProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.deployment;
+package io.quarkus.spring.web.resteasy.reactive.deployment;
 
 import static org.jboss.jandex.AnnotationInstance.create;
 import static org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames.DEFAULT_VALUE;
@@ -45,8 +45,8 @@
 import io.quarkus.resteasy.reactive.spi.AdditionalResourceClassBuildItem;
 import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodParamAnnotations;
-import io.quarkus.spring.web.runtime.ResponseEntityHandler;
-import io.quarkus.spring.web.runtime.ResponseStatusHandler;
+import io.quarkus.spring.web.resteasy.reactive.runtime.ResponseEntityHandler;
+import io.quarkus.spring.web.resteasy.reactive.runtime.ResponseStatusHandler;
 import io.quarkus.spring.web.runtime.common.ResponseStatusExceptionMapper;
 
 public class SpringWebResteasyReactiveProcessor {

diff --git a/...ng/web/runtime/ResponseEntityHandler.java → ...active/runtime/ResponseEntityHandler.java b/...ng/web/runtime/ResponseEntityHandler.java → ...active/runtime/ResponseEntityHandler.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.runtime;
+package io.quarkus.spring.web.resteasy.reactive.runtime;
 
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
 import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;

diff --git a/...ng/web/runtime/ResponseStatusHandler.java → ...active/runtime/ResponseStatusHandler.java b/...ng/web/runtime/ResponseStatusHandler.java → ...active/runtime/ResponseStatusHandler.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.runtime;
+package io.quarkus.spring.web.resteasy.reactive.runtime;
 
 import org.jboss.resteasy.reactive.common.jaxrs.ResponseImpl;
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;

diff --git a/...yReactiveResponseContentTypeResolver.java → ...yReactiveResponseContentTypeResolver.java b/...yReactiveResponseContentTypeResolver.java → ...yReactiveResponseContentTypeResolver.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.runtime;
+package io.quarkus.spring.web.resteasy.reactive.runtime;
 
 import java.util.List;
 

diff --git a/...kus/spring/web/test/BasicMappingTest.java → ...teasy/reactive/test/BasicMappingTest.java b/...kus/spring/web/test/BasicMappingTest.java → ...teasy/reactive/test/BasicMappingTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.RestAssured.when;

diff --git a/.../io/quarkus/spring/web/test/Greeting.java → .../web/resteasy/reactive/test/Greeting.java b/.../io/quarkus/spring/web/test/Greeting.java → .../web/resteasy/reactive/test/Greeting.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 public class Greeting {
 

diff --git a/...eetingControllerWithNoRequestMapping.java → ...eetingControllerWithNoRequestMapping.java b/...eetingControllerWithNoRequestMapping.java → ...eetingControllerWithNoRequestMapping.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/...us/spring/web/test/RequiredFalseTest.java → ...easy/reactive/test/RequiredFalseTest.java b/...us/spring/web/test/RequiredFalseTest.java → ...easy/reactive/test/RequiredFalseTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import static io.restassured.RestAssured.when;
 import static org.hamcrest.Matchers.is;

diff --git a/...ng/web/test/ResponseEntityController.java → ...active/test/ResponseEntityController.java b/...ng/web/test/ResponseEntityController.java → ...active/test/ResponseEntityController.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/...esponseStatusAndExceptionHandlerTest.java → ...esponseStatusAndExceptionHandlerTest.java b/...esponseStatusAndExceptionHandlerTest.java → ...esponseStatusAndExceptionHandlerTest.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import static io.restassured.RestAssured.when;
 

diff --git a/...ng/web/test/ResponseStatusController.java → ...active/test/ResponseStatusController.java b/...ng/web/test/ResponseStatusController.java → ...active/test/ResponseStatusController.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/...io/quarkus/spring/web/test/SomeClass.java → ...web/resteasy/reactive/test/SomeClass.java b/...io/quarkus/spring/web/test/SomeClass.java → ...web/resteasy/reactive/test/SomeClass.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 public class SomeClass {
 

diff --git a/...arkus/spring/web/test/TestController.java → ...esteasy/reactive/test/TestController.java b/...arkus/spring/web/test/TestController.java → ...esteasy/reactive/test/TestController.java
@@ -1,4 +1,4 @@
-package io.quarkus.spring.web.test;
+package io.quarkus.spring.web.resteasy.reactive.test;
 
 import jakarta.ws.rs.core.MediaType;