Merge pull request #13492 from quarkusio/resteasy-reactive-cleanup

Resteasy reactive cleanup
quarkusio · Nov 27, 2020 · dff9345 · dff9345
2 parents 7189191 + 4460767
commit dff9345
Show file tree

Hide file tree

Showing 541 changed files with 2,074 additions and 2,109 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -468,6 +468,7 @@ jobs:
         with:
           repository: quarkusio/quarkus-rest-testsuite
           path: quarkus-rest-testsuite
+          ref: resteasy-reactive
       - name: Reclaim Disk Space
         run: .github/ci-prerequisites.sh
         working-directory: ./tcks

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1707,44 +1707,44 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-common</artifactId>
+                <artifactId>quarkus-resteasy-reactive-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-common-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest</artifactId>
+                <artifactId>quarkus-resteasy-reactive</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-spi</artifactId>
+                <artifactId>quarkus-resteasy-reactive-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-servlet-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-servlet-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-servlet</artifactId>
+                <artifactId>quarkus-resteasy-reactive-servlet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -1759,32 +1759,32 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-qute</artifactId>
+                <artifactId>quarkus-resteasy-reactive-qute</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-qute-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-qute-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-jsonb</artifactId>
+                <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-jsonb-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-jsonb-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-jackson</artifactId>
+                <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-rest-jackson-deployment</artifactId>
+                <artifactId>quarkus-resteasy-reactive-jackson-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

diff --git a/extensions/hibernate-validator/deployment/pom.xml b/extensions/hibernate-validator/deployment/pom.xml
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-spi</artifactId>
+            <artifactId>quarkus-resteasy-reactive-spi</artifactId>
         </dependency>
 
         <dependency>

diff --git a/extensions/hibernate-validator/runtime/pom.xml b/extensions/hibernate-validator/runtime/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-spi</artifactId>
+            <artifactId>quarkus-resteasy-reactive-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>

diff --git a/extensions/micrometer/deployment/pom.xml b/extensions/micrometer/deployment/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-spi</artifactId>
+            <artifactId>quarkus-resteasy-reactive-spi</artifactId>
         </dependency>
 
         <!-- test -->

diff --git a/extensions/micrometer/runtime/pom.xml b/extensions/micrometer/runtime/pom.xml
@@ -89,7 +89,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
             <optional>true</optional>
         </dependency>
 

diff --git a/...o/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderQuarkusRestContainerFilter.java b/...o/quarkus/micrometer/runtime/binder/vertx/VertxMeterBinderQuarkusRestContainerFilter.java
@@ -2,13 +2,13 @@
 
 import javax.ws.rs.core.UriInfo;
 
-import org.jboss.resteasy.reactive.ContainerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
 
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxMeterBinderQuarkusRestContainerFilter {
 
-    @ContainerRequestFilter
+    @ServerRequestFilter
     public void filter(UriInfo uriInfo, RoutingContext routingContext) {
         VertxMeterBinderContainerFilterUtil.doFilter(routingContext, uriInfo);
     }

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -35,7 +35,7 @@
         <module>undertow</module>
         <module>undertow-websockets</module>
         <module>webjars-locator</module>
-        <module>quarkus-rest</module>
+        <module>resteasy-reactive</module>
 
         <!-- Monitoring -->
         <module>smallrye-health</module>

diff --git a/...axrs-client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder b/...axrs-client/runtime/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder
diff --git a/...ployment/src/test/java/io/quarkus/rest/server/servlet/test/ServletSimpleRestTestCase.java b/...ployment/src/test/java/io/quarkus/rest/server/servlet/test/ServletSimpleRestTestCase.java
diff --git a/...rc/main/java/io/quarkus/rest/server/servlet/runtime/QuarkusRestServletContextFactory.java b/...rc/main/java/io/quarkus/rest/server/servlet/runtime/QuarkusRestServletContextFactory.java
diff --git a/...time/src/main/java/io/quarkus/rest/server/servlet/runtime/QuarkusRestServletRecorder.java b/...time/src/main/java/io/quarkus/rest/server/servlet/runtime/QuarkusRestServletRecorder.java
diff --git a/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusRestServerDotNames.java b/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusRestServerDotNames.java
diff --git a/...ment/src/test/java/io/quarkus/rest/server/test/customproviders/AssertContainerFilter.java b/...ment/src/test/java/io/quarkus/rest/server/test/customproviders/AssertContainerFilter.java
diff --git a/...t/deployment/src/test/java/io/quarkus/rest/server/test/perclassexception/MyException.java b/...t/deployment/src/test/java/io/quarkus/rest/server/test/perclassexception/MyException.java
diff --git a/...t/quarkus-rest/deployment/src/test/java/io/quarkus/rest/server/test/simple/TestClass.java b/...t/quarkus-rest/deployment/src/test/java/io/quarkus/rest/server/test/simple/TestClass.java
diff --git a/...kus-rest/runtime/src/main/java/io/quarkus/rest/server/runtime/QuarkusRestInitialiser.java b/...kus-rest/runtime/src/main/java/io/quarkus/rest/server/runtime/QuarkusRestInitialiser.java
diff --git a/...time/src/main/java/io/quarkus/rest/server/runtime/ServerVertxBufferMessageBodyWriter.java b/...time/src/main/java/io/quarkus/rest/server/runtime/ServerVertxBufferMessageBodyWriter.java
diff --git a/...-rest/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup b/...-rest/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
diff --git a/...-rest/quarkus-rest/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/...-rest/quarkus-rest/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers
diff --git a/extensions/quarkus-rest/pom.xml → extensions/resteasy-reactive/pom.xml b/extensions/quarkus-rest/pom.xml → extensions/resteasy-reactive/pom.xml
@@ -10,17 +10,17 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>rest-parent-aggregator</artifactId>
-    <name>Quarkus - REST Parent</name>
+    <artifactId>resteasy-reactive-parent-aggregator</artifactId>
+    <name>Quarkus - RESTEasy Reactive - Parent - Aggregator</name>
     <packaging>pom</packaging>
     <modules>
-        <module>quarkus-rest-common</module>
-        <module>quarkus-rest</module>
+        <module>quarkus-resteasy-reactive-common</module>
+        <module>quarkus-resteasy-reactive</module>
         <module>quarkus-jaxrs-client</module>
-        <module>quarkus-rest-jackson</module>
-        <module>quarkus-rest-jsonb</module>
-        <module>quarkus-rest-qute</module>
-        <module>quarkus-rest-servlet</module>
+        <module>quarkus-resteasy-reactive-jackson</module>
+        <module>quarkus-resteasy-reactive-jsonb</module>
+        <module>quarkus-resteasy-reactive-qute</module>
+        <module>quarkus-resteasy-reactive-servlet</module>
     </modules>
 
 </project>
diff --git a/...t/quarkus-jaxrs-client/deployment/pom.xml → ...e/quarkus-jaxrs-client/deployment/pom.xml b/...t/quarkus-jaxrs-client/deployment/pom.xml → ...e/quarkus-jaxrs-client/deployment/pom.xml
@@ -27,11 +27,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-common-deployment</artifactId>
+            <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-spi</artifactId>
+            <artifactId>quarkus-resteasy-reactive-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>