commit 90fbf9b274fccd776b407223b1cc94de5cbbc147
author Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> Fri Apr 08 20:14:26 2016 +0200
committer Eric Anderson <ejona@google.com> Fri Apr 08 11:14:26 2016 -0700
tree 25f7ec34d81dbe5f6c40e9c1c5dc131b9bf874e4
parent 30d4f95a58ccff0a1dc6e497eb3fa4f501129c92

Adapt BindableService in ServerBuilder#addService

Makes binding services to server as simple as it can get.

compiler/src/java_plugin/cpp/java_generator.cpp

diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index fc8f472..81e452d 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -776,7 +776,7 @@
   vars["MethodType"] = "io.grpc.MethodDescriptor.MethodType";
   vars["ServerMethodDefinition"] =
       "io.grpc.ServerMethodDefinition";
-  vars["BindableService"] = "io.grpc.stub.BindableService";
+  vars["BindableService"] = "io.grpc.BindableService";
   vars["ServerServiceDefinition"] =
       "io.grpc.ServerServiceDefinition";
   vars["AbstractStub"] = "io.grpc.stub.AbstractStub";

compiler/src/test/golden/TestService.java.txt

diff --git a/compiler/src/test/golden/TestService.java.txt b/compiler/src/test/golden/TestService.java.txt
index 4f19fde..b029819 100644
--- a/compiler/src/test/golden/TestService.java.txt
+++ b/compiler/src/test/golden/TestService.java.txt
@@ -224,7 +224,7 @@
     }
   }
 
-  public static abstract class AbstractTestService implements TestService, io.grpc.stub.BindableService {
+  public static abstract class AbstractTestService implements TestService, io.grpc.BindableService {
     @Override public io.grpc.ServerServiceDefinition bindService() {
       return TestServiceGrpc.bindService(this);
     }

compiler/src/testLite/golden/TestService.java.txt

diff --git a/compiler/src/testLite/golden/TestService.java.txt b/compiler/src/testLite/golden/TestService.java.txt
index da72d6f..726bf70 100644
--- a/compiler/src/testLite/golden/TestService.java.txt
+++ b/compiler/src/testLite/golden/TestService.java.txt
@@ -224,7 +224,7 @@
     }
   }
 
-  public static abstract class AbstractTestService implements TestService, io.grpc.stub.BindableService {
+  public static abstract class AbstractTestService implements TestService, io.grpc.BindableService {
     @Override public io.grpc.ServerServiceDefinition bindService() {
       return TestServiceGrpc.bindService(this);
     }

compiler/src/testNano/golden/TestService.java.txt

diff --git a/compiler/src/testNano/golden/TestService.java.txt b/compiler/src/testNano/golden/TestService.java.txt
index 3aacbf8..0be68b1 100644
--- a/compiler/src/testNano/golden/TestService.java.txt
+++ b/compiler/src/testNano/golden/TestService.java.txt
@@ -302,7 +302,7 @@
     }
   }
 
-  public static abstract class AbstractTestService implements TestService, io.grpc.stub.BindableService {
+  public static abstract class AbstractTestService implements TestService, io.grpc.BindableService {
     @Override public io.grpc.ServerServiceDefinition bindService() {
       return TestServiceGrpc.bindService(this);
     }