From 99de6762d9e4c8fe2d16a68910ab977de49f8ed3 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 19 Jul 2023 16:31:23 +0200 Subject: [PATCH] Update to executeBlocking API change --- .../test/java/io/vertx/grpc/client/ClientRequestTest.java | 4 ++-- .../src/main/java/examples/GrpcContextStorageExamples.java | 5 ++--- .../io/vertx/grpc/context/storage/ContextStorageTest.java | 4 +--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/vertx-grpc-client/src/test/java/io/vertx/grpc/client/ClientRequestTest.java b/vertx-grpc-client/src/test/java/io/vertx/grpc/client/ClientRequestTest.java index aa170afc..b20a16c2 100644 --- a/vertx-grpc-client/src/test/java/io/vertx/grpc/client/ClientRequestTest.java +++ b/vertx-grpc-client/src/test/java/io/vertx/grpc/client/ClientRequestTest.java @@ -174,14 +174,14 @@ public void testServerStreamingBackPressure(TestContext should) throws IOExcepti callResponse.pause(); AtomicInteger num = new AtomicInteger(); Runnable readBatch = () -> { - vertx.executeBlocking(p -> { + vertx.executeBlocking(() -> { while (batchQueue.size() == 0) { try { Thread.sleep(10); } catch (InterruptedException e) { } } - p.complete(batchQueue.poll());; + return batchQueue.poll(); }).onSuccess(toRead -> { num.set(toRead); callResponse.resume(); diff --git a/vertx-grpc-context-storage/src/main/java/examples/GrpcContextStorageExamples.java b/vertx-grpc-context-storage/src/main/java/examples/GrpcContextStorageExamples.java index 750c9e40..5bda8b99 100644 --- a/vertx-grpc-context-storage/src/main/java/examples/GrpcContextStorageExamples.java +++ b/vertx-grpc-context-storage/src/main/java/examples/GrpcContextStorageExamples.java @@ -11,13 +11,12 @@ public class GrpcContextStorageExamples { public void example(Vertx vertx) { Context grpcCtx1 = Context.current(); - vertx.executeBlocking(prom -> { + vertx.executeBlocking(() -> { // Same as grpcCtx1 Context grpcCtx2 = Context.current(); - String result = doSomething(); - prom.complete(result); + return doSomething(); }).onComplete(ar -> { diff --git a/vertx-grpc-context-storage/src/test/java/io/vertx/grpc/context/storage/ContextStorageTest.java b/vertx-grpc-context-storage/src/test/java/io/vertx/grpc/context/storage/ContextStorageTest.java index 4858cb80..af8d12dc 100644 --- a/vertx-grpc-context-storage/src/test/java/io/vertx/grpc/context/storage/ContextStorageTest.java +++ b/vertx-grpc-context-storage/src/test/java/io/vertx/grpc/context/storage/ContextStorageTest.java @@ -78,9 +78,7 @@ public void testGrpcContextPropagatedAcrossVertxAsyncCalls(TestContext should) { GreeterGrpc.GreeterImplBase impl = new GreeterGrpc.GreeterImplBase() { @Override public void sayHello(HelloRequest request, StreamObserver responseObserver) { - vertx.executeBlocking(prom -> { - prom.complete("Hello " + request.getName() + ", trace: " + traceContextKey.get()); - }).onSuccess(greeting -> { + vertx.executeBlocking(() -> "Hello " + request.getName() + ", trace: " + traceContextKey.get()).onSuccess(greeting -> { responseObserver.onNext(HelloReply.newBuilder().setMessage(greeting).build()); responseObserver.onCompleted(); }).onFailure(should::fail);