Merge remote-tracking branch 'vertx/master' into 3.5.0-SNAPSHOT

Author: vietj

grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Client.java

@@ -6,6 +6,7 @@
 import io.vertx.example.grpc.Messages;
 import io.vertx.example.util.Runner;
 import io.vertx.grpc.VertxChannelBuilder;
+import java.nio.charset.Charset;
 
 /*
  * @author <a href="mailto:[email protected]">Paulo Lopes</a>
@@ -30,12 +31,16 @@ public void start() throws Exception {
     ConsumerServiceGrpc.ConsumerServiceVertxStub stub = ConsumerServiceGrpc.newVertxStub(channel);
 
     // Make a request
-    Messages.StreamingOutputCallRequest request = Messages.StreamingOutputCallRequest.newBuilder().build();
+    Messages.StreamingOutputCallRequest request = Messages
+      .StreamingOutputCallRequest
+      .newBuilder()
+      .build();
 
     // Call the remote service
     stub.streamingOutputCall(request, stream -> {
       stream.handler(response -> {
-        System.out.println(response.getPayload().getType().getNumber());
+        System.out
+          .println(new String(response.getPayload().toByteArray(), Charset.forName("UTF-8")));
       }).endHandler(v -> {
         System.out.println("Response has ended.");
       });

grpc-examples/src/main/java/io/vertx/example/grpc/consumer/Server.java

@@ -1,12 +1,15 @@
 package io.vertx.example.grpc.consumer;
 
+import com.google.protobuf.ByteString;
 import io.vertx.core.AbstractVerticle;
-import io.vertx.example.grpc.*;
+import io.vertx.example.grpc.ConsumerServiceGrpc;
+import io.vertx.example.grpc.Messages;
+import io.vertx.example.grpc.Messages.PayloadType;
 import io.vertx.example.util.Runner;
 import io.vertx.grpc.GrpcWriteStream;
 import io.vertx.grpc.VertxServer;
 import io.vertx.grpc.VertxServerBuilder;
-
+import java.nio.charset.Charset;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /*
@@ -23,15 +26,24 @@ public static void main(String[] args) {
   public void start() throws Exception {
 
     // The rcp service
-    ConsumerServiceGrpc.ConsumerServiceVertxImplBase service = new ConsumerServiceGrpc.ConsumerServiceVertxImplBase() {
-      @Override
-      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(Messages.Payload.newBuilder().setTypeValue(counter.incrementAndGet())).build());
-        });
-      }
-    };
+    ConsumerServiceGrpc.ConsumerServiceVertxImplBase service =
+      new ConsumerServiceGrpc.ConsumerServiceVertxImplBase() {
+        @Override
+        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(
+              Messages.Payload.newBuilder()
+                .setTypeValue(PayloadType.COMPRESSABLE.getNumber())
+                .setBody(ByteString.copyFrom(
+                  String.valueOf(counter.incrementAndGet()), Charset.forName("UTF-8")))
+            ).build());
+          });
+        }
+      };
 
     // Create the server
     VertxServer rpcServer = VertxServerBuilder

unit-examples/src/main/java/io/vertx/example/unit/HelloVerticle.java

@@ -0,0 +1,16 @@
+package io.vertx.example.unit;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+
+public class HelloVerticle extends AbstractVerticle {
+
+  @Override
+  public void start(Future<Void> startFuture) throws Exception {
+    int port = config().getInteger("http.port", 8080);
+    vertx
+      .createHttpServer()
+      .requestHandler(request -> request.response().end("Hello!"))
+      .listen(port, result -> startFuture.complete());
+  }
+}

unit-examples/src/test/java/io/vertx/example/unit/test/JUnitVerticleTest.java

@@ -0,0 +1,59 @@
+package io.vertx.example.unit.test;
+
+import io.vertx.core.DeploymentOptions;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.json.JsonObject;
+import io.vertx.example.unit.HelloVerticle;
+import io.vertx.ext.unit.Async;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/*
+ * Example of an asynchronous JUnit test for a Verticle.
+ */
+@RunWith(VertxUnitRunner.class)
+public class JUnitVerticleTest {
+
+  Vertx vertx;
+  int port;
+
+  @Before
+  public void before(TestContext context) throws IOException {
+    ServerSocket socket = new ServerSocket(0);
+    port = socket.getLocalPort();
+    socket.close();
+
+    DeploymentOptions options = new DeploymentOptions()
+        .setConfig(new JsonObject().put("http.port", port));
+
+    vertx = Vertx.vertx();
+    vertx.deployVerticle(HelloVerticle.class.getName(), options, context.asyncAssertSuccess());
+  }
+
+  @After
+  public void after(TestContext context) {
+    vertx.close(context.asyncAssertSuccess());
+  }
+
+  @Test
+  public void canGetHello(TestContext context) {
+    Async async = context.async();
+    HttpClient client = vertx.createHttpClient();
+    client.getNow(port, "localhost", "/", response -> {
+      response.bodyHandler(body -> {
+        context.assertEquals("Hello!", body.toString());
+        client.close();
+        async.complete();
+      });
+    });
+  }
+}