Update to executeBlocking API change

vert-x3 · Jul 19, 2023 · 487ff45 · 487ff45
1 parent 2fee1c0
commit 487ff45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/vertx-grpc/src/main/java/io/vertx/grpc/BlockingServerInterceptor.java b/vertx-grpc/src/main/java/io/vertx/grpc/BlockingServerInterceptor.java
@@ -47,8 +47,7 @@ private BlockingServerInterceptor(Vertx vertx, ServerInterceptor interceptor) {
   public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> serverCall, Metadata metadata,
                                                                ServerCallHandler<ReqT, RespT> serverCallHandler) {
     AsyncListener<ReqT> asyncListener = new AsyncListener<>();
-    vertx.<ServerCall.Listener<ReqT>>executeBlocking(blockingCode ->
-        blockingCode.complete(interceptor.interceptCall(serverCall, metadata, serverCallHandler)),
+    vertx.executeBlocking(() -> interceptor.interceptCall(serverCall, metadata, serverCallHandler),
       false).onComplete(
       ar -> {
         if (ar.succeeded()) {

diff --git a/vertx-grpc/src/main/java/io/vertx/grpc/VertxServer.java b/vertx-grpc/src/main/java/io/vertx/grpc/VertxServer.java
@@ -115,13 +115,9 @@ void start(ContextInternal context, Handler<AsyncResult<Void>> completionHandler
         group.addWorker(context.nettyEventLoop());
         contextLocal.get().add(context);
         if (start) {
-          context.<Void>executeBlocking(v2 -> {
-            try {
-              server.start();
-              v2.complete();
-            } catch (IOException e) {
-              v2.fail(e);
-            }
+          context.<Void>executeBlocking(() -> {
+            server.start();
+            return null;
           }).onComplete(completionHandler);
         } else {
           completionHandler.handle(Future.succeededFuture());
@@ -136,9 +132,9 @@ void stop(ContextInternal context, Promise<Void> promise) {
         contextLocal.get().remove(context);
         if (shutdown) {
           map.remove(id);
-          context.<Void>executeBlocking(p -> {
+          context.<Void>executeBlocking(() -> {
             server.shutdown();
-            p.complete();
+            return null;
           }).onComplete(promise);
         } else {
           promise.complete();