Update vertx to 4.5.1

quarkusio · Dec 20, 2023 · 7e00564 · 7e00564
1 parent 4d07a91
commit 7e00564
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 23 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -121,7 +121,7 @@
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>2.2.2.Final</wildfly-elytron.version>
         <jboss-threads.version>3.5.1.Final</jboss-threads.version>
-        <vertx.version>4.4.6</vertx.version>
+        <vertx.version>4.5.1</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <httpasync.version>4.1.5</httpasync.version>

diff --git a/docs/src/main/asciidoc/resteasy-reactive.adoc b/docs/src/main/asciidoc/resteasy-reactive.adoc
@@ -16,7 +16,7 @@ include::_attributes.adoc[]
 :httpspec: https://tools.ietf.org/html/rfc7231
 :jsonpapi: https://javadoc.io/doc/jakarta.json/jakarta.json-api/2.1.2/jakarta.json
 :injectapi: https://javadoc.io/static/jakarta.inject/jakarta.inject-api/2.0.1/jakarta.inject
-:vertxapi: https://javadoc.io/static/io.vertx/vertx-core/4.4.6
+:vertxapi: https://javadoc.io/static/io.vertx/vertx-core/4.5.1
 :resteasy-reactive-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive/{quarkus-version}
 :resteasy-reactive-common-api: https://javadoc.io/doc/io.quarkus.resteasy.reactive/resteasy-reactive-common/{quarkus-version}
 

diff --git a/...sions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java b/...sions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyClientInjectionTest.java
@@ -22,8 +22,6 @@
 import io.smallrye.common.vertx.VertxContext;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.EventLoopContext;
-import io.vertx.core.impl.WorkerContext;
 import io.vertx.mutiny.core.Context;
 import io.vertx.mutiny.core.Vertx;
 
@@ -73,7 +71,7 @@ public String invokeFromIoThread(String s) {
                     service.sayHello(HelloRequest.newBuilder().setName(s).build())
                             .map(HelloReply::getMessage)
                             .invoke(() -> assertThat(Vertx.currentContext()).isNotNull().isEqualTo(context))
-                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate()).isInstanceOf(EventLoopContext.class))
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isEventLoopContext()).isTrue())
                             .subscribe().with(e::complete, e::fail);
                 });
             }).await().atMost(Duration.ofSeconds(5));
@@ -86,9 +84,9 @@ public String invokeFromDuplicatedContext(String s) {
                 duplicate.runOnContext(x -> {
                     service.sayHello(HelloRequest.newBuilder().setName(s).build())
                             .map(HelloReply::getMessage)
-                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate())
-                                    .isNotInstanceOf(EventLoopContext.class).isNotInstanceOf(WorkerContext.class)
-                                    .isEqualTo(duplicate))
+                            .invoke(() -> assertThat(Vertx.currentContext()).isNotNull().isEqualTo(duplicate))
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isEventLoopContext()).isFalse())
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isWorkerContext()).isFalse())
                             .subscribe().with(e::complete, e::fail);
                 });
             }).await().atMost(Duration.ofSeconds(5));

diff --git a/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java b/extensions/grpc/deployment/src/test/java/io/quarkus/grpc/client/MutinyStubInjectionTest.java
@@ -23,8 +23,6 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.smallrye.common.vertx.VertxContext;
 import io.smallrye.mutiny.Uni;
-import io.vertx.core.impl.EventLoopContext;
-import io.vertx.core.impl.WorkerContext;
 import io.vertx.mutiny.core.Context;
 import io.vertx.mutiny.core.Vertx;
 
@@ -79,7 +77,7 @@ public String invokeFromIoThread(String s) {
                     service.sayHello(HelloRequest.newBuilder().setName(s).build())
                             .map(HelloReply::getMessage)
                             .invoke(() -> assertThat(Vertx.currentContext()).isNotNull().isEqualTo(context))
-                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate()).isInstanceOf(EventLoopContext.class))
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isEventLoopContext()).isTrue())
                             .map(r -> r + " " + Thread.currentThread().getName())
                             .subscribe().with(e::complete, e::fail);
                 });
@@ -93,9 +91,9 @@ public String invokeFromDuplicatedContext(String s) {
                 duplicate.runOnContext(x -> {
                     service.sayHello(HelloRequest.newBuilder().setName(s).build())
                             .map(HelloReply::getMessage)
-                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate())
-                                    .isNotInstanceOf(EventLoopContext.class).isNotInstanceOf(WorkerContext.class)
-                                    .isEqualTo(duplicate))
+                            .invoke(() -> assertThat(Vertx.currentContext()).isNotNull().isEqualTo(duplicate))
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isEventLoopContext()).isFalse())
+                            .invoke(() -> assertThat(Vertx.currentContext().getDelegate().isWorkerContext()).isFalse())
                             .map(r -> r + " " + Thread.currentThread().getName())
                             .subscribe().with(e::complete, e::fail);
                 });

diff --git a/...inprocess/src/main/java/io/quarkus/grpc/inprocess/InProcessGrpcServerBuilderProvider.java b/...inprocess/src/main/java/io/quarkus/grpc/inprocess/InProcessGrpcServerBuilderProvider.java
@@ -19,7 +19,7 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.ShutdownContext;
 import io.vertx.core.Vertx;
-import io.vertx.core.impl.EventLoopContext;
+import io.vertx.core.impl.ContextInternal;
 import io.vertx.core.impl.VertxInternal;
 
 public class InProcessGrpcServerBuilderProvider implements GrpcBuilderProvider<InProcessServerBuilder> {
@@ -35,7 +35,7 @@ public ServerBuilder<InProcessServerBuilder> createServerBuilder(Vertx vertx, Gr
         // wrap with Vert.x context, so that the context interceptors work
         VertxInternal vxi = (VertxInternal) vertx;
         Executor delegate = vertx.nettyEventLoopGroup();
-        EventLoopContext context = vxi.createEventLoopContext();
+        ContextInternal context = vxi.createEventLoopContext();
         Executor executor = command -> delegate.execute(() -> context.dispatch(command));
         builder.executor(executor);
         return builder;

diff --git a/extensions/grpc/xds/src/main/java/io/quarkus/grpc/xds/XdsGrpcServerBuilderProvider.java b/extensions/grpc/xds/src/main/java/io/quarkus/grpc/xds/XdsGrpcServerBuilderProvider.java
@@ -32,7 +32,7 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.ShutdownContext;
 import io.vertx.core.Vertx;
-import io.vertx.core.impl.EventLoopContext;
+import io.vertx.core.impl.ContextInternal;
 import io.vertx.core.impl.VertxInternal;
 
 public class XdsGrpcServerBuilderProvider implements GrpcBuilderProvider<XdsServerBuilder> {
@@ -54,7 +54,7 @@ public ServerBuilder<XdsServerBuilder> createServerBuilder(Vertx vertx, GrpcServ
         // wrap with Vert.x context, so that the context interceptors work
         VertxInternal vxi = (VertxInternal) vertx;
         Executor delegate = vertx.nettyEventLoopGroup();
-        EventLoopContext context = vxi.createEventLoopContext();
+        ContextInternal context = vxi.createEventLoopContext();
         Executor executor = command -> delegate.execute(() -> context.dispatch(command));
         builder.executor(executor);
         // custom XDS interceptors

diff --git a/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/...ons/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java
@@ -65,7 +65,6 @@
 import io.vertx.core.http.*;
 import io.vertx.core.http.impl.Http1xServerConnection;
 import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.EventLoopContext;
 import io.vertx.core.impl.Utils;
 import io.vertx.core.impl.VertxInternal;
 import io.vertx.core.net.SocketAddress;
@@ -1273,7 +1272,7 @@ public void initChannel(VirtualServerChannel ch) throws Exception {
                 .childHandler(new ChannelInitializer<VirtualChannel>() {
                     @Override
                     public void initChannel(VirtualChannel ch) throws Exception {
-                        EventLoopContext context = vertx.createEventLoopContext();
+                        ContextInternal context = vertx.createEventLoopContext();
                         VertxHandler<Http1xServerConnection> handler = VertxHandler.create(chctx -> {
 
                             Http1xServerConnection conn = new Http1xServerConnection(

diff --git a/...s/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/graal/VertxSubstitutions.java b/...s/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/graal/VertxSubstitutions.java
@@ -89,7 +89,8 @@ public void close(Promise<Void> promise) {
     }
 
     @Substitute
-    public MessageImpl createMessage(boolean send, String address, MultiMap headers, Object body, String codecName) {
+    public MessageImpl createMessage(boolean send, boolean isLocal, String address, MultiMap headers, Object body,
+            String codecName) {
         throw new RuntimeException("Not Implemented");
     }
 

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
@@ -49,6 +49,7 @@
 import io.vertx.core.MultiMap;
 import io.vertx.core.Promise;
 import io.vertx.core.TimeoutStream;
+import io.vertx.core.Timer;
 import io.vertx.core.Verticle;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
@@ -60,6 +61,7 @@
 import io.vertx.core.eventbus.EventBus;
 import io.vertx.core.file.FileSystem;
 import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientBuilder;
 import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.HttpClientRequest;
 import io.vertx.core.http.HttpClientResponse;
@@ -69,6 +71,8 @@
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.http.RequestOptions;
 import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.WebSocketClient;
+import io.vertx.core.http.WebSocketClientOptions;
 import io.vertx.core.http.WebSocketConnectOptions;
 import io.vertx.core.http.WebsocketVersion;
 import io.vertx.core.net.NetClient;
@@ -420,6 +424,16 @@ public HttpServer createHttpServer() {
             return getDelegate().createHttpServer();
         }
 
+        @Override
+        public WebSocketClient createWebSocketClient(WebSocketClientOptions webSocketClientOptions) {
+            return getDelegate().createWebSocketClient(webSocketClientOptions);
+        }
+
+        @Override
+        public HttpClientBuilder httpClientBuilder() {
+            return getDelegate().httpClientBuilder();
+        }
+
         @Override
         public HttpClient createHttpClient(HttpClientOptions httpClientOptions) {
             return new LazyHttpClient(new Supplier<HttpClient>() {
@@ -480,6 +494,11 @@ public SharedData sharedData() {
             return getDelegate().sharedData();
         }
 
+        @Override
+        public Timer timer(long l, TimeUnit timeUnit) {
+            return getDelegate().timer(l, timeUnit);
+        }
+
         @Override
         public long setTimer(long l, Handler<Long> handler) {
             return getDelegate().setTimer(l, handler);
@@ -850,10 +869,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 sslOptions, boolean b) {
+                return getDelegate().updateSSLOptions(sslOptions, b);
+            }
+
+            @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
@@ -60,7 +60,7 @@
         <version.surefire.plugin>3.2.3</version.surefire.plugin>
         <mutiny.version>2.5.1</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>