release version 0.0.4

grpc version is bumped to 1.0.0-pre2
protobuf version is bumped to 3.0.0
 fixes #19

Author: jvmlet

README.md

@@ -14,9 +14,11 @@ repositories {
    
 }
 dependencies {
-    compile('org.lognet:grpc-spring-boot-starter:0.0.3')
+    compile('org.lognet:grpc-spring-boot-starter:0.0.4')
 }
 ```
+If you are using protobuf version lower than `3.0.0`, please use `org.lognet:grpc-spring-boot-starter:0.0.3` 
+
 
 ## Usage
 * Start by [generating](https://github.com/google/protobuf-gradle-plugin) stub and server interface(s) from your `.proto` file(s).
@@ -35,12 +37,12 @@ service Greeter {
     rpc SayHello ( HelloRequest) returns (  HelloReply) {}
 }
 ```
-Note the generated `io.grpc.examples.GreeterGrpc` class with static function `bindService`.(The generated classes were intentionally  committed for demo purposes).
+Note the generated `io.grpc.examples.GreeterGrpc.GreeterImplBase` class that implements `io.grpc.BindableService`.(The generated classes were intentionally  committed for demo purposes).
 
 All you need to do is to annotate your service implementation with `@org.lognet.springboot.grpc.GRpcService`
 
 ```java
-@GRpcService(grpcServiceOuterClass = GreeterGrpc.class)
+@GRpcService
     public static class GreeterService implements GreeterGrpc.Greeter{
         @Override
         public void sayHello(GreeterOuterClass.HelloRequest request, StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {

build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'idea'
 buildscript {
     ext {
         springBootVersion = '1.3.6.RELEASE'
+        grpcVersion = '1.0.0-pre2' //0.15.0
     }
     repositories {
         mavenCentral()

gradle.properties

@@ -1,4 +1,4 @@
-version=0.0.4-SNAPSHOT
+version=0.0.4
 group=org.lognet
 description=Spring Boot starter for Google RPC.
 gitHubUrl=https\://github.com/LogNet/grpc-spring-boot-starter

grpc-spring-boot-starter-demo/build.gradle

@@ -2,11 +2,11 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'spring-boot'
 
 dependencies {
-    compile 'io.grpc:grpc-stub:0.15.0'
-    compile 'io.grpc:grpc-protobuf:0.15.0'
-    compile 'io.grpc:grpc-netty:0.15.0'
-    compile("org.springframework.boot:spring-boot-starter-actuator")
-    compile('org.springframework.boot:spring-boot-starter-web')
+    compile "io.grpc:grpc-stub:${grpcVersion}"
+    compile "io.grpc:grpc-protobuf:${grpcVersion}"
+    compile "io.grpc:grpc-netty:${grpcVersion}"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile 'org.springframework.boot:spring-boot-starter-web'
     compile project(':grpc-spring-boot-starter')
 
     testCompile('org.springframework.boot:spring-boot-starter-test')
@@ -21,11 +21,11 @@ sourceSets {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0-beta-3'
+        artifact = 'com.google.protobuf:protoc:3.0.0'
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:0.15.0'
+            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
         }
     }
 

grpc-spring-boot-starter-demo/src/main/java/org/lognet/springboot/grpc/demo/GreeterApp.java

@@ -16,8 +16,8 @@
 @SpringBootApplication
 public class GreeterApp {
 
-    @GRpcService(grpcServiceOuterClass = GreeterGrpc.class)
-    public static class GreeterService implements GreeterGrpc.Greeter{
+    @GRpcService
+    public static class GreeterService extends GreeterGrpc.GreeterImplBase {
         @Override
         public void sayHello(GreeterOuterClass.HelloRequest request, StreamObserver<GreeterOuterClass.HelloReply> responseObserver) {
             final GreeterOuterClass.HelloReply.Builder replyBuilder = GreeterOuterClass.HelloReply.newBuilder().setMessage("Hello " + request.getName());

grpc-spring-boot-starter-demo/src/main/protoGen/io/grpc/examples/GreeterGrpc.java

@@ -21,7 +21,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 0.15.0)",
+    value = "by gRPC proto compiler (version 1.0.0-pre2)",
     comments = "Source: greeter.proto")
 public class GreeterGrpc {
 
@@ -68,28 +68,28 @@ public static GreeterFutureStub newFutureStub(
    * The greeter service definition.
    * </pre>
    */
-  @java.lang.Deprecated public static interface Greeter {
+  public static abstract class GreeterImplBase implements io.grpc.BindableService {
 
     /**
      * <pre>
      * Sends a greeting
      * </pre>
      */
-    public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
-        io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver);
-  }
-
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1469")
-  public static abstract class GreeterImplBase implements Greeter, io.grpc.BindableService {
-
-    @java.lang.Override
     public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
         io.grpc.stub.StreamObserver<io.grpc.examples.GreeterOuterClass.HelloReply> responseObserver) {
       asyncUnimplementedUnaryCall(METHOD_SAY_HELLO, responseObserver);
     }
 
     @java.lang.Override public io.grpc.ServerServiceDefinition bindService() {
-      return GreeterGrpc.bindService(this);
+      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+          .addMethod(
+            METHOD_SAY_HELLO,
+            asyncUnaryCall(
+              new MethodHandlers<
+                io.grpc.examples.GreeterOuterClass.HelloRequest,
+                io.grpc.examples.GreeterOuterClass.HelloReply>(
+                  this, METHODID_SAY_HELLO)))
+          .build();
     }
   }
 
@@ -98,34 +98,7 @@ public void sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request,
    * The greeter service definition.
    * </pre>
    */
-  @java.lang.Deprecated public static interface GreeterBlockingClient {
-
-    /**
-     * <pre>
-     * Sends a greeting
-     * </pre>
-     */
-    public io.grpc.examples.GreeterOuterClass.HelloReply sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request);
-  }
-
-  /**
-   * <pre>
-   * The greeter service definition.
-   * </pre>
-   */
-  @java.lang.Deprecated public static interface GreeterFutureClient {
-
-    /**
-     * <pre>
-     * Sends a greeting
-     * </pre>
-     */
-    public com.google.common.util.concurrent.ListenableFuture<io.grpc.examples.GreeterOuterClass.HelloReply> sayHello(
-        io.grpc.examples.GreeterOuterClass.HelloRequest request);
-  }
-
-  public static class GreeterStub extends io.grpc.stub.AbstractStub<GreeterStub>
-      implements Greeter {
+  public static final class GreeterStub extends io.grpc.stub.AbstractStub<GreeterStub> {
     private GreeterStub(io.grpc.Channel channel) {
       super(channel);
     }
@@ -141,16 +114,24 @@ protected GreeterStub build(io.grpc.Channel channel,
       return new GreeterStub(channel, callOptions);
     }
 
-    @java.lang.Override
+    /**
+     * <pre>
+     * Sends a greeting
+     * </pre>
+     */
     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);
     }
   }
 
-  public static class GreeterBlockingStub extends io.grpc.stub.AbstractStub<GreeterBlockingStub>
-      implements GreeterBlockingClient {
+  /**
+   * <pre>
+   * The greeter service definition.
+   * </pre>
+   */
+  public static final class GreeterBlockingStub extends io.grpc.stub.AbstractStub<GreeterBlockingStub> {
     private GreeterBlockingStub(io.grpc.Channel channel) {
       super(channel);
     }
@@ -166,15 +147,23 @@ protected GreeterBlockingStub build(io.grpc.Channel channel,
       return new GreeterBlockingStub(channel, callOptions);
     }
 
-    @java.lang.Override
+    /**
+     * <pre>
+     * Sends a greeting
+     * </pre>
+     */
     public io.grpc.examples.GreeterOuterClass.HelloReply sayHello(io.grpc.examples.GreeterOuterClass.HelloRequest request) {
       return blockingUnaryCall(
           getChannel(), METHOD_SAY_HELLO, getCallOptions(), request);
     }
   }
 
-  public static class GreeterFutureStub extends io.grpc.stub.AbstractStub<GreeterFutureStub>
-      implements GreeterFutureClient {
+  /**
+   * <pre>
+   * The greeter service definition.
+   * </pre>
+   */
+  public static final class GreeterFutureStub extends io.grpc.stub.AbstractStub<GreeterFutureStub> {
     private GreeterFutureStub(io.grpc.Channel channel) {
       super(channel);
     }
@@ -190,27 +179,29 @@ protected GreeterFutureStub build(io.grpc.Channel channel,
       return new GreeterFutureStub(channel, callOptions);
     }
 
-    @java.lang.Override
+    /**
+     * <pre>
+     * Sends a greeting
+     * </pre>
+     */
     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);
     }
   }
 
-  @java.lang.Deprecated public static abstract class AbstractGreeter extends GreeterImplBase {}
-
   private static final int METHODID_SAY_HELLO = 0;
 
   private static class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final Greeter serviceImpl;
+    private final GreeterImplBase serviceImpl;
     private final int methodId;
 
-    public MethodHandlers(Greeter serviceImpl, int methodId) {
+    public MethodHandlers(GreeterImplBase serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -244,16 +235,4 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
         METHOD_SAY_HELLO);
   }
 
-  @java.lang.Deprecated public static io.grpc.ServerServiceDefinition bindService(
-      final Greeter serviceImpl) {
-    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-        .addMethod(
-          METHOD_SAY_HELLO,
-          asyncUnaryCall(
-            new MethodHandlers<
-              io.grpc.examples.GreeterOuterClass.HelloRequest,
-              io.grpc.examples.GreeterOuterClass.HelloReply>(
-                serviceImpl, METHODID_SAY_HELLO)))
-        .build();
-  }
 }