Update gRPC examples to use VerticleBase instead of AbstractVerticle

vert-x3 · Oct 19, 2024 · dff767b · dff767b
1 parent 04cdb7e
commit dff767b
Show file tree

Hide file tree

Showing 28 changed files with 244 additions and 217 deletions.
diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Client.java b/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Client.java
@@ -1,6 +1,7 @@
 package io.vertx.example.grpc.consumer;
 
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcClient;
@@ -12,20 +13,22 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class Client extends AbstractVerticle {
+public class Client extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{Client.class.getName()});
  }
 
+ private GrpcClient client;
+
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the client
- GrpcClient client = GrpcClient.client(vertx);
+ client = GrpcClient.client(vertx);
 
  // Call the remote service
- client.request(SocketAddress.inetSocketAddress(8080, "localhost"), VertxConsumerServiceGrpcClient.StreamingOutputCall)
+ return client.request(SocketAddress.inetSocketAddress(8080, "localhost"), VertxConsumerServiceGrpcClient.StreamingOutputCall)
  .compose(request -> {
  request
  .end(Messages

diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/ClientWithStub.java b/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/ClientWithStub.java
@@ -1,28 +1,33 @@
 package io.vertx.example.grpc.consumer;
 
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcClient;
 import io.vertx.grpc.client.GrpcClient;
 
 import io.vertx.launcher.application.VertxApplication;
 import java.nio.charset.StandardCharsets;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class ClientWithStub extends AbstractVerticle {
+public class ClientWithStub extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{ClientWithStub.class.getName()});
  }
 
+ private GrpcClient client;
+
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the channel
- GrpcClient client = GrpcClient.client(vertx);
+ client = GrpcClient.client(vertx);
 
  // Get a stub to use for interacting with the remote service
  VertxConsumerServiceGrpcClient stub = new VertxConsumerServiceGrpcClient(client, SocketAddress.inetSocketAddress(8080, "localhost"));
@@ -34,13 +39,13 @@ public void start() {
  .build();
 
  // Call the remote service
- stub.streamingOutputCall(request)
- .onSuccess(response -> {
+ return stub
+ .streamingOutputCall(request)
+ .compose(response -> {
  response.handler(msg -> {
  System.out.println(new String(msg.getPayload().toByteArray(), StandardCharsets.UTF_8));
- }).endHandler(v -> {
- System.out.println("Response has ended.");
  });
+ return response.last().map("Response has ended.");
  });
  }
 }
diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Server.java b/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Server.java
@@ -1,7 +1,8 @@
 package io.vertx.example.grpc.consumer;
 
 import com.google.protobuf.ByteString;
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.Messages.PayloadType;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcServer;
@@ -14,14 +15,14 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class Server extends AbstractVerticle {
+public class Server extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{Server.class.getName()});
  }
 
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the server
  GrpcServer rpcServer = GrpcServer.server(vertx);
@@ -40,9 +41,9 @@ public void start() {
  });
 
  // start the server
- vertx.createHttpServer().requestHandler(rpcServer).listen(8080)
- .onFailure(cause -> {
-  cause.printStackTrace();
- });
+ return vertx
+ .createHttpServer()
+ .requestHandler(rpcServer)
+ .listen(8080);
  }
 }
diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/ServerWithStub.java b/grpc-examples/src/main/java/io/vertx/example/grpc/consumer/ServerWithStub.java
@@ -1,11 +1,12 @@
 package io.vertx.example.grpc.consumer;
 
 import com.google.protobuf.ByteString;
-import io.vertx.core.AbstractVerticle;
-import io.vertx.core.streams.WriteStream;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.Messages.PayloadType;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcServer;
+import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.launcher.application.VertxApplication;
 
@@ -15,19 +16,19 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class ServerWithStub extends AbstractVerticle {
+public class ServerWithStub extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{ServerWithStub.class.getName()});
  }
 
  @Override
- public void start() {
+ public Future<?> start() {
 
  // The rpc service
  VertxConsumerServiceGrpcServer.ConsumerServiceApi service = new VertxConsumerServiceGrpcServer.ConsumerServiceApi() {
  @Override
- public void streamingOutputCall(Messages.StreamingOutputCallRequest request, WriteStream<Messages.StreamingOutputCallResponse> response) {
+ public void streamingOutputCall(Messages.StreamingOutputCallRequest request, GrpcWriteStream<Messages.StreamingOutputCallResponse> response) {
  final AtomicInteger counter = new AtomicInteger();
  vertx.setPeriodic(1000L, t -> {
  response.write(Messages.StreamingOutputCallResponse.newBuilder().setPayload(
@@ -44,12 +45,12 @@ public void streamingOutputCall(Messages.StreamingOutputCallRequest request, Wri
  GrpcServer rpcServer = GrpcServer.server(vertx);
 
  // Bind the service
- service.bind_streamingOutputCall(rpcServer);
+ service.bindAll(rpcServer);
 
  // start the server
- vertx.createHttpServer().requestHandler(rpcServer).listen(8080)
- .onFailure(cause -> {
-  cause.printStackTrace();
- });
+ return vertx
+ .createHttpServer()
+ .requestHandler(rpcServer)
+ .listen(8080);
  }
 }
diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/Client.java b/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/Client.java
@@ -1,6 +1,7 @@
 package io.vertx.example.grpc.conversation;
 
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcClient;
@@ -10,20 +11,22 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class Client extends AbstractVerticle {
+public class Client extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{Client.class.getName()});
  }
 
+ private GrpcClient client;
+
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the client
- GrpcClient client = GrpcClient.client(vertx);
+ client = GrpcClient.client(vertx);
 
  // Call the remote service
- client.request(SocketAddress.inetSocketAddress(8080, "localhost"), VertxConsumerServiceGrpcClient.StreamingOutputCall)
+ return client.request(SocketAddress.inetSocketAddress(8080, "localhost"), VertxConsumerServiceGrpcClient.StreamingOutputCall)
  .compose(
  request -> {
  // start the conversation

diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/ClientWithStub.java b/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/ClientWithStub.java
@@ -1,6 +1,7 @@
 package io.vertx.example.grpc.conversation;
 
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConversationalServiceGrpcClient;
@@ -10,23 +11,25 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class ClientWithStub extends AbstractVerticle {
+public class ClientWithStub extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{ClientWithStub.class.getName()});
  }
 
+ private GrpcClient client;
+
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the channel
- GrpcClient client = GrpcClient.client(vertx);
+ client = GrpcClient.client(vertx);
 
  // Get a stub to use for interacting with the remote service
  VertxConversationalServiceGrpcClient stub = new VertxConversationalServiceGrpcClient(client, SocketAddress.inetSocketAddress(8080, "localhost"));
 
  // Call the remote service
- stub.fullDuplexCall(writeStream -> {
+ return stub.fullDuplexCall(writeStream -> {
  // start the conversation
  writeStream.write(Messages.StreamingOutputCallRequest.newBuilder().build());
  vertx.setTimer(500L, t -> {

diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/Server.java b/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/Server.java
@@ -1,6 +1,7 @@
 package io.vertx.example.grpc.conversation;
 
-import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConsumerServiceGrpcServer;
 import io.vertx.grpc.server.GrpcServer;
@@ -9,14 +10,14 @@
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class Server extends AbstractVerticle {
+public class Server extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{Server.class.getName()});
  }
 
  @Override
- public void start() {
+ public Future<?> start() {
 
  // Create the server
  GrpcServer rpcServer = GrpcServer.server(vertx);
@@ -30,9 +31,9 @@ public void start() {
  });
 
  // start the server
- vertx.createHttpServer().requestHandler(rpcServer).listen(8080)
- .onFailure(cause -> {
-  cause.printStackTrace();
- });
+ return vertx
+ .createHttpServer()
+ .requestHandler(rpcServer)
+ .listen(8080);
  }
 }
diff --git a/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/ServerWithStub.java b/grpc-examples/src/main/java/io/vertx/example/grpc/conversation/ServerWithStub.java
@@ -1,30 +1,30 @@
 package io.vertx.example.grpc.conversation;
 
-
-import io.vertx.core.AbstractVerticle;
-import io.vertx.core.streams.ReadStream;
-import io.vertx.core.streams.WriteStream;
+import io.vertx.core.Future;
+import io.vertx.core.VerticleBase;
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.grpc.VertxConversationalServiceGrpcServer;
+import io.vertx.grpc.common.GrpcReadStream;
+import io.vertx.grpc.common.GrpcWriteStream;
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.launcher.application.VertxApplication;
 
 /*
  * @author <a href="mailto:plopes@redhat.com">Paulo Lopes</a>
  */
-public class ServerWithStub extends AbstractVerticle {
+public class ServerWithStub extends VerticleBase {
 
  public static void main(String[] args) {
  VertxApplication.main(new String[]{ServerWithStub.class.getName()});
  }
 
  @Override
- public void start() {
+ public Future<?> start() {
 
  // The rpc service
  VertxConversationalServiceGrpcServer.ConversationalServiceApi service = new VertxConversationalServiceGrpcServer.ConversationalServiceApi() {
  @Override
- public void fullDuplexCall(ReadStream<Messages.StreamingOutputCallRequest> request, WriteStream<Messages.StreamingOutputCallResponse> response) {
+ public void fullDuplexCall(GrpcReadStream<Messages.StreamingOutputCallRequest> request, GrpcWriteStream<Messages.StreamingOutputCallResponse> response) {
  request
  .handler(req -> {
  System.out.println("Server: received request");
@@ -39,12 +39,12 @@ public void fullDuplexCall(ReadStream<Messages.StreamingOutputCallRequest> reque
  GrpcServer rpcServer = GrpcServer.server(vertx);
 
  // Bind the service
- service.bind_fullDuplexCall(rpcServer);
+ service.bindAll(rpcServer);
 
  // start the server
- vertx.createHttpServer().requestHandler(rpcServer).listen(8080)
- .onFailure(cause -> {
-  cause.printStackTrace();
- });
+ return vertx
+ .createHttpServer()
+ .requestHandler(rpcServer)
+ .listen(8080);
  }
 }