Register the mount point paths of the methods of a service

Motivation:

- `GrpcServer#addService` only registered the canonical `/package.Service/Method` path, so the HTTP rules of a transcoded service method were ignored and the transcoded routes returned a 500. `GrpcServer#callHandler` already mounts these paths.

Changes:

- Mount the `MountPoint` paths of a service method in `addService`, like `callHandler` does.
- Add integration tests binding a transcoded unary and server-streaming service with `addService`.

Signed-off-by: Daniel Fiala <danfiala23@gmail.com>

Author: zZHorizonZz

vertx-grpc-it/src/test/java/io/vertx/grpc/it/tests/TranscodingTest.java

@@ -6,14 +6,17 @@
 import io.grpc.examples.streamingtranscoding.StreamingTranscodingGreeterClient;
 import io.grpc.examples.streamingtranscoding.StreamingTranscodingGreeterGrpcClient;
 import io.grpc.examples.streamingtranscoding.StreamingTranscodingGreeterGrpcService;
+import io.grpc.examples.streamingtranscoding.StreamingTranscodingGreeterService;
 import io.grpc.stub.StreamObserver;
+import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.SocketAddress;
+import io.vertx.core.streams.WriteStream;
 import io.vertx.grpc.client.GrpcClient;
 import io.vertx.grpc.server.GrpcServer;
 import io.vertx.grpc.server.GrpcServerResponse;
@@ -357,6 +360,61 @@ public void testUnaryCollisionWithoutOption() throws TimeoutException {
     assertEquals("Hello Julien", reply.getMessage());
   }
 
+  @Test
+  public void testUnaryAddService() throws TimeoutException {
+    HttpClient client = vertx.createHttpClient();
+
+    vertx.createHttpServer()
+      .requestHandler(GrpcServer.server(vertx).addService(GreeterGrpcService.of(new GreeterService() {
+        @Override
+        public Future<HelloReply> sayHello(HelloRequest request) {
+          return Future.succeededFuture(HelloReply.newBuilder().setMessage("Hello " + request.getName()).build());
+        }
+      }))).listen(8080, "localhost").await(10, TimeUnit.SECONDS);
+
+    RequestOptions options = new RequestOptions().setHost("localhost").setPort(8080).setURI("/v1/hello/Julien").setMethod(HttpMethod.GET);
+
+    Buffer body = client.request(options).compose(req -> {
+        req.putHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+        req.putHeader(HttpHeaders.ACCEPT, "application/json");
+        return req.send();
+      }).expecting(HttpResponseExpectation.SC_OK)
+      .expecting(HttpResponseExpectation.JSON)
+      .compose(HttpClientResponse::body)
+      .await(10, TimeUnit.SECONDS);
+    assertEquals("Hello Julien", getMessage(body.toString()));
+  }
+
+  @Test
+  public void testServerStreamingAddService() throws TimeoutException {
+    HttpClient client = vertx.createHttpClient();
+
+    vertx.createHttpServer()
+      .requestHandler(GrpcServer.server(vertx).addService(StreamingTranscodingGreeterGrpcService.of(new StreamingTranscodingGreeterService() {
+        @Override
+        protected void sayHelloStreaming(StreamingHelloRequest request, WriteStream<StreamingHelloReply> response) {
+          response.write(StreamingHelloReply.newBuilder().setMessage("Hello " + request.getName() + " 1").build());
+          response.write(StreamingHelloReply.newBuilder().setMessage("Hello " + request.getName() + " 2").build());
+          response.end();
+        }
+      }))).listen(8080, "localhost").await(10, TimeUnit.SECONDS);
+
+    RequestOptions options = new RequestOptions().setHost("localhost").setPort(8080).setURI("/v1/hello/stream/Julien").setMethod(HttpMethod.GET);
+
+    Buffer body = client.request(options).compose(req -> {
+        req.putHeader(HttpHeaders.CONTENT_TYPE, "application/json");
+        req.putHeader(HttpHeaders.ACCEPT, "application/json");
+        return req.send();
+      }).expecting(HttpResponseExpectation.SC_OK)
+      .compose(HttpClientResponse::body)
+      .await(10, TimeUnit.SECONDS);
+
+    JsonArray array = new JsonArray(body);
+    assertEquals(2, array.size());
+    assertEquals("Hello Julien 1", array.getJsonObject(0).getString("message"));
+    assertEquals("Hello Julien 2", array.getJsonObject(1).getString("message"));
+  }
+
   @Test
   public void testServerStreaming() throws TimeoutException {
     HttpClient client = vertx.createHttpClient();

vertx-grpc-server/src/main/java/io/vertx/grpc/server/impl/GrpcServerImpl.java

@@ -299,7 +299,14 @@ public GrpcServer addService(Service service) {
       }
       for (ServiceMethod method : service.methods()) {
         ServiceMethodInvoker invoker = service.invoker(method);
-        registerMethodCallHandler(service.pathOfMethod(method.methodName()), new MethodCallHandler<Object, Object>(method, method.decoder(), method.encoder(), invoker));
+        MethodCallHandler<Object, Object> mch = new MethodCallHandler<>(method, method.decoder(), method.encoder(), invoker);
+        if (method instanceof MountPoint) {
+          MountPoint<Object, Object> mountPoint = (MountPoint<Object, Object>) method;
+          for (String path : mountPoint.paths()) {
+            registerMethodCallHandler(path, mch);
+          }
+        }
+        registerMethodCallHandler(service.pathOfMethod(method.methodName()), mch);
       }
 
       this.services.add(service);