commit 4999649653b9262d661eb833724ee28cefedb2bd
author Yang Gao <yangg@google.com> Thu Mar 12 16:40:19 2015 -0700
committer Yang Gao <yangg@google.com> Thu Mar 12 16:40:19 2015 -0700
tree 81fde27cf3ed59fa2400b892c31fb49873942d46
parent 179f8684dc87bfccf9b74968afe96fc371eb170e

Rename to AsyncGeneric*

src/cpp/server/async_generic_service.cc

diff --git a/src/cpp/server/generic_service.cc b/src/cpp/server/async_generic_service.cc
similarity index 84%
rename from src/cpp/server/generic_service.cc
rename to src/cpp/server/async_generic_service.cc
index 8ced775..67241fe 100644
--- a/src/cpp/server/generic_service.cc
+++ b/src/cpp/server/async_generic_service.cc
@@ -31,16 +31,16 @@
  *
  */
 
-#include <grpc++/generic_service.h>
+#include <grpc++/async_generic_service.h>
 
 #include <grpc++/server.h>
 
 namespace grpc {
 
-void GenericService::RequestCall(GenericServerContext* ctx,
-                                 GenericServerReaderWriter* reader_writer,
-                                 CompletionQueue* cq, void* tag) {
-  server_->RequestGenericCall(ctx, reader_writer, cq, tag);
+void AsyncGenericService::RequestCall(
+    GenericServerContext* ctx, GenericServerAsyncReaderWriter* reader_writer,
+    CompletionQueue* cq, void* tag) {
+  server_->RequestAsyncGenericCall(ctx, reader_writer, cq, tag);
 }
 
 } // namespace grpc

src/cpp/server/server.cc

diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index f72b8a3..cc632a7 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -39,7 +39,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc++/completion_queue.h>
-#include <grpc++/generic_service.h>
+#include <grpc++/async_generic_service.h>
 #include <grpc++/impl/rpc_service_method.h>
 #include <grpc++/impl/service_type.h>
 #include <grpc++/server_context.h>
@@ -228,7 +228,7 @@
   return true;
 }
 
-void Server::RegisterGenericService(GenericService* service) {
+void Server::RegisterAsyncGenericService(AsyncGenericService* service) {
   GPR_ASSERT(service->server_ == nullptr &&
              "Can only register an generic service against one server.");
   service->server_ = this;
@@ -395,9 +395,9 @@
   new AsyncRequest(this, registered_method, context, request, stream, cq, tag);
 }
 
-void Server::RequestGenericCall(GenericServerContext* context,
-                                ServerAsyncStreamingInterface* stream,
-                                CompletionQueue* cq, void* tag) {
+void Server::RequestAsyncGenericCall(GenericServerContext* context,
+                                     ServerAsyncStreamingInterface* stream,
+                                     CompletionQueue* cq, void* tag) {
   new AsyncRequest(this, context, stream, cq, tag);
 }
 

src/cpp/server/server_builder.cc

diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 083509e..835596d 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -52,10 +52,10 @@
   async_services_.push_back(service);
 }
 
-void ServerBuilder::RegisterGenericService(GenericService* service) {
+void ServerBuilder::RegisterAsyncGenericService(AsyncGenericService* service) {
   if (generic_service_) {
     gpr_log(GPR_ERROR,
-            "Adding multiple GenericService is unsupported for now. "
+            "Adding multiple AsyncGenericService is unsupported for now. "
             "Dropping the service %p", service);
     return;
   }
@@ -96,7 +96,7 @@
     }
   }
   if (generic_service_) {
-    server->RegisterGenericService(generic_service_);
+    server->RegisterAsyncGenericService(generic_service_);
   }
   for (auto& port : ports_) {
     int r = server->AddPort(port.addr, port.creds.get());