closes #67, release 2.1.4 #

Alexander Furer · Alexander Furer · commit f42a742099a4 · 2017-11-23T10:21:01.000+02:00
diff --git a/README.adoc b/README.adoc
@@ -19,7 +19,7 @@ repositories {
    
 }
 dependencies {
-    compile('org.lognet:grpc-spring-boot-starter:2.1.3')
+    compile('org.lognet:grpc-spring-boot-starter:2.1.4')
 }
 ----
 
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
@@ -1,3 +1,6 @@
+== Version 2.1.4
+- gRPC version upgraded to 1.8.0
+
 == Version 2.1.3
 - Random gRPC server port support
 - Fixed wrong interceptors ordering bug.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
     ext {
         springBootVersion = '1.5.8.RELEASE'
-        grpcVersion = '1.7.0'
+        grpcVersion = '1.8.0'
     }
     repositories {
         mavenCentral()
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.1.4-SNAPSHOT
+version=2.1.4
 #group=io.github.lognet
 group=org.lognet
 description=Spring Boot starter for Google RPC.
diff --git a/grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java b/grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/CalculatorGrpc.java
@@ -1,24 +1,24 @@
 package io.grpc.examples;
 
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.MethodDescriptor.generateFullMethodName;
 import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
 import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
 import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
 import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
 import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
 
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0)",
+    value = "by gRPC proto compiler (version 1.8.0)",
     comments = "Source: calculator.proto")
 public final class CalculatorGrpc {
 
@@ -28,18 +28,37 @@ private CalculatorGrpc() {}
 
   // Static method descriptors that strictly reflect the proto.
   @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getCalculateMethod()} instead. 
   public static final io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
-      io.grpc.examples.CalculatorOuterClass.CalculatorResponse> METHOD_CALCULATE =
-      io.grpc.MethodDescriptor.<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse>newBuilder()
-          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName(generateFullMethodName(
-              "Calculator", "Calculate"))
-          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              io.grpc.examples.CalculatorOuterClass.CalculatorRequest.getDefaultInstance()))
-          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              io.grpc.examples.CalculatorOuterClass.CalculatorResponse.getDefaultInstance()))
-          .setSchemaDescriptor(new CalculatorMethodDescriptorSupplier("Calculate"))
-          .build();
+      io.grpc.examples.CalculatorOuterClass.CalculatorResponse> METHOD_CALCULATE = getCalculateMethod();
+
+  private static volatile io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
+      io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
+      io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod() {
+    io.grpc.MethodDescriptor<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse> getCalculateMethod;
+    if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
+      synchronized (CalculatorGrpc.class) {
+        if ((getCalculateMethod = CalculatorGrpc.getCalculateMethod) == null) {
+          CalculatorGrpc.getCalculateMethod = getCalculateMethod = 
+              io.grpc.MethodDescriptor.<io.grpc.examples.CalculatorOuterClass.CalculatorRequest, io.grpc.examples.CalculatorOuterClass.CalculatorResponse>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "Calculator", "Calculate"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.examples.CalculatorOuterClass.CalculatorRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.examples.CalculatorOuterClass.CalculatorResponse.getDefaultInstance()))
+                  .setSchemaDescriptor(new CalculatorMethodDescriptorSupplier("Calculate"))
+                  .build();
+          }
+        }
+     }
+     return getCalculateMethod;
+  }
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -72,13 +91,13 @@ public static abstract class CalculatorImplBase implements io.grpc.BindableServi
      */
     public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
         io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
-      asyncUnimplementedUnaryCall(METHOD_CALCULATE, responseObserver);
+      asyncUnimplementedUnaryCall(getCalculateMethod(), responseObserver);
     }
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
-            METHOD_CALCULATE,
+            getCalculateMethod(),
             asyncUnaryCall(
               new MethodHandlers<
                 io.grpc.examples.CalculatorOuterClass.CalculatorRequest,
@@ -111,7 +130,7 @@ protected CalculatorStub build(io.grpc.Channel channel,
     public void calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request,
         io.grpc.stub.StreamObserver<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(METHOD_CALCULATE, getCallOptions()), request, responseObserver);
+          getChannel().newCall(getCalculateMethod(), getCallOptions()), request, responseObserver);
     }
   }
 
@@ -137,7 +156,7 @@ protected CalculatorBlockingStub build(io.grpc.Channel channel,
      */
     public io.grpc.examples.CalculatorOuterClass.CalculatorResponse calculate(io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
       return blockingUnaryCall(
-          getChannel(), METHOD_CALCULATE, getCallOptions(), request);
+          getChannel(), getCalculateMethod(), getCallOptions(), request);
     }
   }
 
@@ -164,7 +183,7 @@ protected CalculatorFutureStub build(io.grpc.Channel channel,
     public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.CalculatorOuterClass.CalculatorResponse> calculate(
         io.grpc.examples.CalculatorOuterClass.CalculatorRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(METHOD_CALCULATE, getCallOptions()), request);
+          getChannel().newCall(getCalculateMethod(), getCallOptions()), request);
     }
   }
 
@@ -252,7 +271,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
         if (result == null) {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new CalculatorFileDescriptorSupplier())
-              .addMethod(METHOD_CALCULATE)
+              .addMethod(getCalculateMethod())
               .build();
         }
       }
diff --git a/grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java b/grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java
@@ -1,27 +1,27 @@
 package io.grpc.examples;
 
-import static io.grpc.stub.ClientCalls.asyncUnaryCall;
-import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.MethodDescriptor.generateFullMethodName;
 import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ClientCalls.blockingUnaryCall;
+import static io.grpc.stub.ClientCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ClientCalls.asyncUnaryCall;
 import static io.grpc.stub.ClientCalls.blockingServerStreamingCall;
+import static io.grpc.stub.ClientCalls.blockingUnaryCall;
 import static io.grpc.stub.ClientCalls.futureUnaryCall;
-import static io.grpc.MethodDescriptor.generateFullMethodName;
-import static io.grpc.stub.ServerCalls.asyncUnaryCall;
-import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
 import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
-import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
+import static io.grpc.stub.ServerCalls.asyncClientStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncServerStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnaryCall;
 import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
+import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall;
 
 /**
  * <pre>
  * The greeter service definition.
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0)",
+    value = "by gRPC proto compiler (version 1.8.0)",
     comments = "Source: greeter.proto")
 public final class GreeterGrpc {
 
@@ -31,18 +31,37 @@ private GreeterGrpc() {}
 
   // Static method descriptors that strictly reflect the proto.
   @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @java.lang.Deprecated // Use {@link #getSayHelloMethod()} instead. 
   public static final io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
-      io.grpc.examples.GreeterOuterClass.HelloReply> METHOD_SAY_HELLO =
-      io.grpc.MethodDescriptor.<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply>newBuilder()
-          .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName(generateFullMethodName(
-              "Greeter", "SayHello"))
-          .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              io.grpc.examples.GreeterOuterClass.HelloRequest.getDefaultInstance()))
-          .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
-              io.grpc.examples.GreeterOuterClass.HelloReply.getDefaultInstance()))
-          .setSchemaDescriptor(new GreeterMethodDescriptorSupplier("SayHello"))
-          .build();
+      io.grpc.examples.GreeterOuterClass.HelloReply> METHOD_SAY_HELLO = getSayHelloMethod();
+
+  private static volatile io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
+      io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
+
+  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  public static io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest,
+      io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod() {
+    io.grpc.MethodDescriptor<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply> getSayHelloMethod;
+    if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
+      synchronized (GreeterGrpc.class) {
+        if ((getSayHelloMethod = GreeterGrpc.getSayHelloMethod) == null) {
+          GreeterGrpc.getSayHelloMethod = getSayHelloMethod = 
+              io.grpc.MethodDescriptor.<io.grpc.examples.GreeterOuterClass.HelloRequest, io.grpc.examples.GreeterOuterClass.HelloReply>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(
+                  "Greeter", "SayHello"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.examples.GreeterOuterClass.HelloRequest.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  io.grpc.examples.GreeterOuterClass.HelloReply.getDefaultInstance()))
+                  .setSchemaDescriptor(new GreeterMethodDescriptorSupplier("SayHello"))
+                  .build();
+          }
+        }
+     }
+     return getSayHelloMethod;
+  }
 
   /**
    * Creates a new async stub that supports all call types for the service
@@ -81,13 +100,13 @@ public static abstract class GreeterImplBase implements io.grpc.BindableService
      */
     public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
         io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver) {
-      asyncUnimplementedUnaryCall(METHOD_SAY_HELLO, responseObserver);
+      asyncUnimplementedUnaryCall(getSayHelloMethod(), responseObserver);
     }
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
-            METHOD_SAY_HELLO,
+            getSayHelloMethod(),
             asyncUnaryCall(
               new MethodHandlers<
                 io.grpc.examples.GreeterOuterClass.HelloRequest,
@@ -126,7 +145,7 @@ protected GreeterStub build(io.grpc.Channel channel,
     public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
         io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(METHOD_SAY_HELLO, getCallOptions()), request, responseObserver);
+          getChannel().newCall(getSayHelloMethod(), getCallOptions()), request, responseObserver);
     }
   }
 
@@ -158,7 +177,7 @@ protected GreeterBlockingStub build(io.grpc.Channel channel,
      */
     public io.grpc.examples.GreeterOuterClass.HelloReply sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request) {
       return blockingUnaryCall(
-          getChannel(), METHOD_SAY_HELLO, getCallOptions(), request);
+          getChannel(), getSayHelloMethod(), getCallOptions(), request);
     }
   }
 
@@ -191,7 +210,7 @@ protected GreeterFutureStub build(io.grpc.Channel channel,
     public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.GreeterOuterClass.HelloReply> sayHello(
         io.grpc.examples.GreeterOuterClass.HelloRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(METHOD_SAY_HELLO, getCallOptions()), request);
+          getChannel().newCall(getSayHelloMethod(), getCallOptions()), request);
     }
   }
 
@@ -279,7 +298,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
         if (result == null) {
           serviceDescriptor = result = io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
               .setSchemaDescriptor(new GreeterFileDescriptorSupplier())
-              .addMethod(METHOD_SAY_HELLO)
+              .addMethod(getSayHelloMethod())
               .build();
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ repositories {`
`19`	`19`
`20`	`20`	`}`
`21`	`21`	`dependencies {`
`22`		`- compile('org.lognet:grpc-spring-boot-starter:2.1.3')`
	`22`	`+ compile('org.lognet:grpc-spring-boot-starter:2.1.4')`
`23`	`23`	`}`
`24`	`24`	`----`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`buildscript {`
`3`	`3`	`ext {`
`4`	`4`	`springBootVersion = '1.5.8.RELEASE'`
`5`		`- grpcVersion = '1.7.0'`
	`5`	`+ grpcVersion = '1.8.0'`
`6`	`6`	`}`
`7`	`7`	`repositories {`
`8`	`8`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version=2.1.4-SNAPSHOT`
	`1`	`+version=2.1.4`
`2`	`2`	`#group=io.github.lognet`
`3`	`3`	`group=org.lognet`
`4`	`4`	`description=Spring Boot starter for Google RPC.`