Upgrade to 1.6.1

pom.xml

@@ -30,10 +30,7 @@
 
   <properties>
     <stack.version>3.5.0-SNAPSHOT</stack.version>
-    <grpc.version>1.3.0</grpc.version>
-<!-- CURRENT_GRPC_VERSION -->
-    <vertx.grpc.version>1.3.0</vertx.grpc.version>
-<!-- CURRENT_GRPC_VERSION -->
+    <vertx.grpc.version>1.6.1</vertx.grpc.version>
     <jetty.alpnAgent.version>2.0.6</jetty.alpnAgent.version>
     <jetty.alpnAgent.path>${settings.localRepository}/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar</jetty.alpnAgent.path>
   </properties>
@@ -70,17 +67,17 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty</artifactId>
-      <version>${grpc.version}</version>
+      <version>${vertx.grpc.version}</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
-      <version>${grpc.version}</version>
+      <version>${vertx.grpc.version}</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-stub</artifactId>
-      <version>${grpc.version}</version>
+      <version>${vertx.grpc.version}</version>
     </dependency>
 
     <dependency>
@@ -166,7 +163,7 @@
             protobuf-java directly, you will be transitively depending on the
             protobuf-java version that grpc depends on.
           -->
-          <protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.vertx:protoc-gen-grpc-java:${vertx.grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>

src/main/asciidoc/java/index.adoc

@@ -82,7 +82,7 @@ If you're using Apache Maven you need to add the plugin:
   <configuration>
     <protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}</protocArtifact>
     <pluginId>grpc-java</pluginId>
-    <pluginArtifact>io.vertx:protoc-gen-grpc-java:1.3.0:${os.detected.classifier}</pluginArtifact>
+    <pluginArtifact>io.vertx:protoc-gen-grpc-java:1.6.1:${os.detected.classifier}</pluginArtifact>
   </configuration>
   <executions>
     <execution>
@@ -149,7 +149,7 @@ protobuf {
   }
   plugins {
   grpc {
-    artifact = "io.vertx:protoc-gen-grpc-java:1.3.0"
+    artifact = "io.vertx:protoc-gen-grpc-java:1.6.1"
   }
 }
   generateProtoTasks {

src/main/java/examples/GreeterGrpc.java

@@ -21,7 +21,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.3.0)",
+    value = "by gRPC proto compiler (version 1.6.1)",
     comments = "Source: helloworld.proto")
 public final class GreeterGrpc {
 
@@ -62,12 +62,15 @@ public void onCompleted() {
   @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
   public static final io.grpc.MethodDescriptor<examples.HelloRequest,
       examples.HelloReply> METHOD_SAY_HELLO =
-      io.grpc.MethodDescriptor.create(
-          io.grpc.MethodDescriptor.MethodType.UNARY,
-          generateFullMethodName(
-              "helloworld.Greeter", "SayHello"),
-          io.grpc.protobuf.ProtoUtils.marshaller(examples.HelloRequest.getDefaultInstance()),
-          io.grpc.protobuf.ProtoUtils.marshaller(examples.HelloReply.getDefaultInstance()));
+      io.grpc.MethodDescriptor.<examples.HelloRequest, examples.HelloReply>newBuilder()
+          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName(generateFullMethodName(
+              "helloworld.Greeter", "SayHello"))
+          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              examples.HelloRequest.getDefaultInstance()))
+          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+              examples.HelloReply.getDefaultInstance()))
+          .build();
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -85,7 +88,7 @@ public static GreeterBlockingStub newBlockingStub(
   }
 
   /**
-   * Creates a new ListenableFuture-style stub that supports unary and streaming output calls on the service
+   * Creates a new ListenableFuture-style stub that supports unary calls on the service
    */
   public static GreeterFutureStub newFutureStub(
       io.grpc.Channel channel) {

src/main/java/io/vertx/grpc/VertxServer.java

@@ -1,7 +1,6 @@
 package io.vertx.grpc;
 
 import io.grpc.Server;
-import io.grpc.internal.ServerImpl;
 import io.grpc.netty.NettyServerBuilder;
 import io.netty.handler.ssl.SslContext;
 import io.vertx.core.AsyncResult;
@@ -41,7 +40,7 @@ private static class ActualServer {
     final AtomicInteger count = new AtomicInteger();
     final VertxEventLoopGroup group = new VertxEventLoopGroup();
     final HandlerManager<String> manager = new HandlerManager<>(group);
-    final ServerImpl server;
+    final Server server;
     final ThreadLocal<List<ContextImpl>> contextLocal = new ThreadLocal<>();
 
     private ActualServer(Vertx vertx, ServerID id, HttpServerOptions options, NettyServerBuilder builder) {