RESTEasy Reactive - Migrate to Vert.x 4.5.1

cescoffier · Jan 4, 2024 · d551c08 · d551c08
1 parent 180f0d8
commit d551c08
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 26 deletions.
diff --git a/...tive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java b/...tive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientImpl.java
@@ -41,36 +41,14 @@
 import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl;
 
 import io.netty.channel.EventLoopGroup;
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Context;
-import io.vertx.core.DeploymentOptions;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.MultiMap;
-import io.vertx.core.Promise;
-import io.vertx.core.TimeoutStream;
-import io.vertx.core.Verticle;
-import io.vertx.core.Vertx;
-import io.vertx.core.VertxOptions;
-import io.vertx.core.WorkerExecutor;
+import io.vertx.core.*;
 import io.vertx.core.datagram.DatagramSocket;
 import io.vertx.core.datagram.DatagramSocketOptions;
 import io.vertx.core.dns.DnsClient;
 import io.vertx.core.dns.DnsClientOptions;
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.file.FileSystem;
-import io.vertx.core.http.HttpClient;
-import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.HttpClientRequest;
-import io.vertx.core.http.HttpClientResponse;
-import io.vertx.core.http.HttpConnection;
-import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.HttpServer;
-import io.vertx.core.http.HttpServerOptions;
-import io.vertx.core.http.RequestOptions;
-import io.vertx.core.http.WebSocket;
-import io.vertx.core.http.WebSocketConnectOptions;
-import io.vertx.core.http.WebsocketVersion;
+import io.vertx.core.http.*;
 import io.vertx.core.net.NetClient;
 import io.vertx.core.net.NetClientOptions;
 import io.vertx.core.net.NetServer;
@@ -420,6 +398,16 @@ public HttpServer createHttpServer() {
             return getDelegate().createHttpServer();
         }
 
+        @Override
+        public WebSocketClient createWebSocketClient(WebSocketClientOptions options) {
+            return getDelegate().createWebSocketClient(options);
+        }
+
+        @Override
+        public HttpClientBuilder httpClientBuilder() {
+            return getDelegate().httpClientBuilder();
+        }
+
         @Override
         public HttpClient createHttpClient(HttpClientOptions httpClientOptions) {
             return new LazyHttpClient(new Supplier<HttpClient>() {
@@ -480,6 +468,11 @@ public SharedData sharedData() {
             return getDelegate().sharedData();
         }
 
+        @Override
+        public Timer timer(long delay, TimeUnit unit) {
+            return getDelegate().timer(delay, unit);
+        }
+
         @Override
         public long setTimer(long l, Handler<Long> handler) {
             return getDelegate().setTimer(l, handler);
@@ -850,10 +843,25 @@ public Future<WebSocket> webSocketAbs(String url, MultiMap headers, WebsocketVer
             }
 
             @Override
-            public Future<Void> updateSSLOptions(SSLOptions options) {
+            public Future<Boolean> updateSSLOptions(SSLOptions options) {
                 return getDelegate().updateSSLOptions(options);
             }
 
+            @Override
+            public void updateSSLOptions(SSLOptions options, Handler<AsyncResult<Boolean>> handler) {
+                getDelegate().updateSSLOptions(options, handler);
+            }
+
+            @Override
+            public Future<Boolean> updateSSLOptions(SSLOptions options, boolean force) {
+                return getDelegate().updateSSLOptions(options, force);
+            }
+
+            @Override
+            public void updateSSLOptions(SSLOptions options, boolean force, Handler<AsyncResult<Boolean>> handler) {
+                getDelegate().updateSSLOptions(options, force, handler);
+            }
+
             @Override
             public HttpClient connectionHandler(Handler<HttpConnection> handler) {
                 return getDelegate().connectionHandler(handler);

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -61,7 +61,7 @@
         <version.surefire.plugin>3.2.3</version.surefire.plugin>
         <mutiny.version>2.5.3</mutiny.version>
         <smallrye-common.version>2.1.2</smallrye-common.version>
-        <vertx.version>4.4.6</vertx.version>
+        <vertx.version>4.5.1</vertx.version>
         <rest-assured.version>5.4.0</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <jackson-bom.version>2.16.0</jackson-bom.version>