Refactor ResteasyReactiveOutputStream so that it can be used by Quark…

…us CXF fix quarkusio#40994
ppalaga · Jun 10, 2024 · 1a6ba5d · 1a6ba5d
1 parent 250eb95
commit 1a6ba5d
Show file tree

Hide file tree

Showing 15 changed files with 209 additions and 555 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -4898,6 +4898,11 @@
                 <artifactId>resteasy-reactive-client-processor</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus.vertx-java-io</groupId>
+                <artifactId>quarkus-vertx-java-io</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.common</groupId>
                 <artifactId>wildfly-common</artifactId>

diff --git a/extensions/resteasy-classic/resteasy/runtime/pom.xml b/extensions/resteasy-classic/resteasy/runtime/pom.xml
@@ -23,6 +23,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus.vertx-java-io</groupId>
+            <artifactId>quarkus-vertx-java-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-server-common</artifactId>

diff --git a/...asy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java b/...asy/runtime/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxBlockingOutput.java
@@ -9,7 +9,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.quarkus.runtime.BlockingOperationNotAllowedException;
-import io.quarkus.vertx.core.runtime.VertxBufferImpl;
+import io.quarkus.vertx.java.io.VertxBufferImpl;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;

diff --git a/extensions/websockets-next/runtime/pom.xml b/extensions/websockets-next/runtime/pom.xml
@@ -22,6 +22,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus.vertx-java-io</groupId>
+            <artifactId>quarkus-vertx-java-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson</artifactId>

diff --git a/...ext/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java b/...ext/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java
@@ -6,7 +6,7 @@
 
 import org.jboss.logging.Logger;
 
-import io.quarkus.vertx.core.runtime.VertxBufferImpl;
+import io.quarkus.vertx.java.io.VertxBufferImpl;
 import io.quarkus.websockets.next.CloseReason;
 import io.quarkus.websockets.next.HandshakeRequest;
 import io.quarkus.websockets.next.WebSocketConnection.BroadcastSender;

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -132,6 +132,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.quarkus.vertx-java-io</groupId>
+                <artifactId>quarkus-vertx-java-io</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.quarkus.resteasy.reactive</groupId>
                 <artifactId>resteasy-reactive-client-processor</artifactId>

diff --git a/independent-projects/resteasy-reactive/server/vertx/pom.xml b/independent-projects/resteasy-reactive/server/vertx/pom.xml
@@ -27,6 +27,10 @@
             <groupId>io.quarkus.resteasy.reactive</groupId>
             <artifactId>resteasy-reactive</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus.vertx-java-io</groupId>
+            <artifactId>quarkus-vertx-java-io</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>