Upgrade to 1.12.0

vert-x3 · May 11, 2018 · a8e0499 · a8e0499
1 parent 826d166
commit a8e0499
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ ScratchPad.java
 src/main/resources/ext-js/*.js
 src/main/java/io/vertx/java/**/*.java
 *.swp
+.vscode
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 
   <properties>
     <stack.version>3.6.0-SNAPSHOT</stack.version>
-    <vertx.grpc.version>1.9.0</vertx.grpc.version>
+    <vertx.grpc.version>1.12.0</vertx.grpc.version>
     <jetty.alpnAgent.version>2.0.7</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>

diff --git a/src/main/java/examples/GreeterGrpc.java b/src/main/java/examples/GreeterGrpc.java
@@ -21,7 +21,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.9.0)",
+    value = "by gRPC proto compiler (version 1.12.0)",
     comments = "Source: helloworld.proto")
 public final class GreeterGrpc {
 
@@ -62,14 +62,19 @@ public void onCompleted() {
   @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
   @java.lang.Deprecated // Use {@link #getSayHelloMethod()} instead. 
   public static final io.grpc.MethodDescriptor<examples.HelloRequest,
-      examples.HelloReply> METHOD_SAY_HELLO = getSayHelloMethod();
+      examples.HelloReply> METHOD_SAY_HELLO = getSayHelloMethodHelper();
 
   private static volatile io.grpc.MethodDescriptor<examples.HelloRequest,
       examples.HelloReply> getSayHelloMethod;
 
   @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
   public static io.grpc.MethodDescriptor<examples.HelloRequest,
       examples.HelloReply> getSayHelloMethod() {
+    return getSayHelloMethodHelper();
+  }
+
+  private static io.grpc.MethodDescriptor<examples.HelloRequest,
+      examples.HelloReply> getSayHelloMethodHelper() {
     io.grpc.MethodDescriptor<examples.HelloRequest, examples.HelloReply> getSayHelloMethod;
     if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
       synchronized (GreeterGrpc.class) {
@@ -136,13 +141,13 @@ public static abstract class GreeterImplBase implements io.grpc.BindableService
      */
     public void sayHello(examples.HelloRequest request,
         io.grpc.stub.StreamObserver<examples.HelloReply> responseObserver) {
-      asyncUnimplementedUnaryCall(getSayHelloMethod(), responseObserver);
+      asyncUnimplementedUnaryCall(getSayHelloMethodHelper(), responseObserver);
     }
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
-            getSayHelloMethod(),
+            getSayHelloMethodHelper(),
             asyncUnaryCall(
               new MethodHandlers<
                 examples.HelloRequest,
@@ -181,7 +186,7 @@ protected GreeterStub build(io.grpc.Channel channel,
     public void sayHello(examples.HelloRequest request,
         io.grpc.stub.StreamObserver<examples.HelloReply> responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(getSayHelloMethod(), getCallOptions()), request, responseObserver);
+          getChannel().newCall(getSayHelloMethodHelper(), getCallOptions()), request, responseObserver);
     }
   }
 
@@ -213,7 +218,7 @@ protected GreeterBlockingStub build(io.grpc.Channel channel,
      */
     public examples.HelloReply sayHello(examples.HelloRequest request) {
       return blockingUnaryCall(
-          getChannel(), getSayHelloMethod(), getCallOptions(), request);
+          getChannel(), getSayHelloMethodHelper(), getCallOptions(), request);
     }
   }
 
@@ -246,7 +251,7 @@ protected GreeterFutureStub build(io.grpc.Channel channel,
     public com.google.common.util.concurrent.ListenableFuture<examples.HelloReply> sayHello(
         examples.HelloRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(getSayHelloMethod(), getCallOptions()), request);
+          getChannel().newCall(getSayHelloMethodHelper(), getCallOptions()), request);
     }
   }
 
@@ -264,13 +269,13 @@ public static abstract class GreeterVertxImplBase implements io.grpc.BindableSer
      */
     public void sayHello(examples.HelloRequest request,
         io.vertx.core.Future<examples.HelloReply> response) {
-      asyncUnimplementedUnaryCall(getSayHelloMethod(), GreeterGrpc.toObserver(response.completer()));
+      asyncUnimplementedUnaryCall(getSayHelloMethodHelper(), GreeterGrpc.toObserver(response.completer()));
     }
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
-            getSayHelloMethod(),
+            getSayHelloMethodHelper(),
             asyncUnaryCall(
               new VertxMethodHandlers<
                 examples.HelloRequest,
@@ -309,7 +314,7 @@ protected GreeterVertxStub build(io.grpc.Channel channel,
     public void sayHello(examples.HelloRequest request,
         io.vertx.core.Handler<io.vertx.core.AsyncResult<examples.HelloReply>> response) {
       asyncUnaryCall(
-          getChannel().newCall(getSayHelloMethod(), getCallOptions()), request, GreeterGrpc.toObserver(response));
+          getChannel().newCall(getSayHelloMethodHelper(), getCallOptions()), request, GreeterGrpc.toObserver(response));
     }
   }
 
@@ -441,7 +446,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
         if (result == null) {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new GreeterFileDescriptorSupplier())
-              .addMethod(getSayHelloMethod())
+              .addMethod(getSayHelloMethodHelper())
               .build();
         }
       }