Update reflection API

extensions/include/grpc++/impl/reflection.grpc.pb.h

@@ -100,31 +100,31 @@ class ServerReflection GRPC_FINAL {
     virtual ~StubInterface() {}
     // The reflection service is structured as a bidirectional stream, ensuring
     // all related requests go to a single server.
-    std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>> DescriptorDatabaseInfo(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>>(DescriptorDatabaseInfoRaw(context));
+    std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> ServerReflectionInfo(::grpc::ClientContext* context) {
+      return std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(ServerReflectionInfoRaw(context));
     }
-    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>> AsyncDescriptorDatabaseInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>>(AsyncDescriptorDatabaseInfoRaw(context, cq, tag));
+    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> AsyncServerReflectionInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
+      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(AsyncServerReflectionInfoRaw(context, cq, tag));
     }
   private:
-    virtual ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* DescriptorDatabaseInfoRaw(::grpc::ClientContext* context) = 0;
-    virtual ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* AsyncDescriptorDatabaseInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) = 0;
+    virtual ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflectionInfoRaw(::grpc::ClientContext* context) = 0;
+    virtual ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* AsyncServerReflectionInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) = 0;
   };
   class Stub GRPC_FINAL : public StubInterface {
    public:
     Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
-    std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>> DescriptorDatabaseInfo(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>>(DescriptorDatabaseInfoRaw(context));
+    std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> ServerReflectionInfo(::grpc::ClientContext* context) {
+      return std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(ServerReflectionInfoRaw(context));
     }
-    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>> AsyncDescriptorDatabaseInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>>(AsyncDescriptorDatabaseInfoRaw(context, cq, tag));
+    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> AsyncServerReflectionInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
+      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(AsyncServerReflectionInfoRaw(context, cq, tag));
     }
 
    private:
     std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* DescriptorDatabaseInfoRaw(::grpc::ClientContext* context) GRPC_OVERRIDE;
-    ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* AsyncDescriptorDatabaseInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;
-    const ::grpc::RpcMethod rpcmethod_DescriptorDatabaseInfo_;
+    ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflectionInfoRaw(::grpc::ClientContext* context) GRPC_OVERRIDE;
+    ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* AsyncServerReflectionInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;
+    const ::grpc::RpcMethod rpcmethod_ServerReflectionInfo_;
   };
   static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
 
@@ -134,42 +134,42 @@ class ServerReflection GRPC_FINAL {
     virtual ~Service();
     // The reflection service is structured as a bidirectional stream, ensuring
     // all related requests go to a single server.
-    virtual ::grpc::Status DescriptorDatabaseInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseResponse, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest>* stream);
+    virtual ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream);
   };
   template <class BaseClass>
-  class WithAsyncMethod_DescriptorDatabaseInfo : public BaseClass {
+  class WithAsyncMethod_ServerReflectionInfo : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
-    WithAsyncMethod_DescriptorDatabaseInfo() {
+    WithAsyncMethod_ServerReflectionInfo() {
       ::grpc::Service::MarkMethodAsync(0);
     }
-    ~WithAsyncMethod_DescriptorDatabaseInfo() GRPC_OVERRIDE {
+    ~WithAsyncMethod_ServerReflectionInfo() GRPC_OVERRIDE {
       BaseClassMustBeDerivedFromService(this);
     }
     // disable synchronous version of this method
-    ::grpc::Status DescriptorDatabaseInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseResponse, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
+    ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
       abort();
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }
-    void RequestDescriptorDatabaseInfo(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseResponse, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
+    void RequestServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
       ::grpc::Service::RequestAsyncBidiStreaming(0, context, stream, new_call_cq, notification_cq, tag);
     }
   };
-  typedef WithAsyncMethod_DescriptorDatabaseInfo<Service > AsyncService;
+  typedef WithAsyncMethod_ServerReflectionInfo<Service > AsyncService;
   template <class BaseClass>
-  class WithGenericMethod_DescriptorDatabaseInfo : public BaseClass {
+  class WithGenericMethod_ServerReflectionInfo : public BaseClass {
    private:
     void BaseClassMustBeDerivedFromService(const Service *service) {}
    public:
-    WithGenericMethod_DescriptorDatabaseInfo() {
+    WithGenericMethod_ServerReflectionInfo() {
       ::grpc::Service::MarkMethodGeneric(0);
     }
-    ~WithGenericMethod_DescriptorDatabaseInfo() GRPC_OVERRIDE {
+    ~WithGenericMethod_ServerReflectionInfo() GRPC_OVERRIDE {
       BaseClassMustBeDerivedFromService(this);
     }
     // disable synchronous version of this method
-    ::grpc::Status DescriptorDatabaseInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseResponse, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
+    ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
       abort();
       return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
     }

extensions/reflection/proto_server_reflection.cc

@@ -51,12 +51,14 @@ using google::protobuf::FileDescriptor;
 using google::protobuf::FieldDescriptor;
 using google::protobuf::DescriptorPool;
 using google::protobuf::FileDescriptorProto;
-using grpc::reflection::v1alpha::DescriptorDatabaseRequest;
+using grpc::reflection::v1alpha::ServerReflectionRequest;
 using grpc::reflection::v1alpha::ExtensionRequest;
-using grpc::reflection::v1alpha::DescriptorDatabaseResponse;
+using grpc::reflection::v1alpha::ServerReflectionResponse;
 using grpc::reflection::v1alpha::ListServiceResponse;
+using grpc::reflection::v1alpha::ServiceResponse;
 using grpc::reflection::v1alpha::ExtensionNumberResponse;
 using grpc::reflection::v1alpha::ErrorResponse;
+using grpc::reflection::v1alpha::FileDescriptorResponse;
 
 namespace grpc {
 
@@ -68,34 +70,34 @@ void ProtoServerReflection::SetServiceList(
   services_ = services;
 }
 
-Status ProtoServerReflection::DescriptorDatabaseInfo(
+Status ProtoServerReflection::ServerReflectionInfo(
     ServerContext* context,
-    ServerReaderWriter<DescriptorDatabaseResponse, DescriptorDatabaseRequest>*
+    ServerReaderWriter<ServerReflectionResponse, ServerReflectionRequest>*
         stream) {
-  DescriptorDatabaseRequest request;
-  DescriptorDatabaseResponse response;
+  ServerReflectionRequest request;
+  ServerReflectionResponse response;
   Status status;
   while (stream->Read(&request)) {
     switch (request.message_request_case()) {
-      case DescriptorDatabaseRequest::MessageRequestCase::kFileByFilename:
+      case ServerReflectionRequest::MessageRequestCase::kFileByFilename:
         status = GetFileByName(context, request.file_by_filename(), &response);
         break;
-      case DescriptorDatabaseRequest::MessageRequestCase::kFileContainingSymbol:
+      case ServerReflectionRequest::MessageRequestCase::kFileContainingSymbol:
         status = GetFileContainingSymbol(
             context, request.file_containing_symbol(), &response);
         break;
-      case DescriptorDatabaseRequest::MessageRequestCase::
+      case ServerReflectionRequest::MessageRequestCase::
           kFileContainingExtension:
         status = GetFileContainingExtension(
             context, &request.file_containing_extension(), &response);
         break;
-      case DescriptorDatabaseRequest::MessageRequestCase::
+      case ServerReflectionRequest::MessageRequestCase::
           kAllExtensionNumbersOfType:
         status = GetAllExtensionNumbers(
             context, request.all_extension_numbers_of_type(),
             response.mutable_all_extension_numbers_response());
         break;
-      case DescriptorDatabaseRequest::MessageRequestCase::kListServices:
+      case ServerReflectionRequest::MessageRequestCase::kListServices:
         status =
             ListService(context, response.mutable_list_services_response());
         break;
@@ -105,7 +107,7 @@ Status ProtoServerReflection::DescriptorDatabaseInfo(
 
     response.set_valid_host(request.host());
     response.set_allocated_original_request(
-        new DescriptorDatabaseRequest(request));
+        new ServerReflectionRequest(request));
     stream->Write(response);
   }
 
@@ -124,14 +126,15 @@ Status ProtoServerReflection::ListService(ServerContext* context,
     return Status(StatusCode::NOT_FOUND, "Services not found.");
   }
   for (auto it = services_->begin(); it != services_->end(); ++it) {
-    response->add_service(*it);
+    ServiceResponse* service_response = response->add_service();
+    service_response->set_name(*it);
   }
   return Status::OK;
 }
 
 Status ProtoServerReflection::GetFileByName(
     ServerContext* context, const grpc::string& filename,
-    DescriptorDatabaseResponse* response) {
+    ServerReflectionResponse* response) {
   if (descriptor_pool_ == nullptr) {
     return Status::CANCELLED;
   }
@@ -146,7 +149,7 @@ Status ProtoServerReflection::GetFileByName(
 
 Status ProtoServerReflection::GetFileContainingSymbol(
     ServerContext* context, const grpc::string& symbol,
-    DescriptorDatabaseResponse* response) {
+    ServerReflectionResponse* response) {
   if (descriptor_pool_ == nullptr) {
     return Status::CANCELLED;
   }
@@ -162,7 +165,7 @@ Status ProtoServerReflection::GetFileContainingSymbol(
 
 Status ProtoServerReflection::GetFileContainingExtension(
     ServerContext* context, const ExtensionRequest* request,
-    DescriptorDatabaseResponse* response) {
+    ServerReflectionResponse* response) {
   if (descriptor_pool_ == nullptr) {
     return Status::CANCELLED;
   }
@@ -204,12 +207,12 @@ Status ProtoServerReflection::GetAllExtensionNumbers(
 }
 
 void ProtoServerReflection::FillFileDescriptorProtoResponse(
-    const FileDescriptor* file_desc, DescriptorDatabaseResponse* response) {
+    const FileDescriptor* file_desc, ServerReflectionResponse* response) {
   FileDescriptorProto file_desc_proto;
   grpc::string data;
   file_desc->CopyTo(&file_desc_proto);
   file_desc_proto.SerializeToString(&data);
-  response->set_file_descriptor_proto(data);
+  response->mutable_file_descriptor_response()->add_file_descriptor_proto(data);
 }
 
 }  // namespace grpc

extensions/reflection/proto_server_reflection.h

@@ -54,10 +54,10 @@ class ProtoServerReflection GRPC_FINAL
 
   void SetServiceList(const std::vector<grpc::string>* services);
 
-  Status DescriptorDatabaseInfo(
+  Status ServerReflectionInfo(
       ServerContext* context,
-      ServerReaderWriter<reflection::v1alpha::DescriptorDatabaseResponse,
-                         reflection::v1alpha::DescriptorDatabaseRequest>*
+      ServerReaderWriter<reflection::v1alpha::ServerReflectionResponse,
+                         reflection::v1alpha::ServerReflectionRequest>*
           stream) GRPC_OVERRIDE;
 
  private:
@@ -66,16 +66,16 @@ class ProtoServerReflection GRPC_FINAL
 
   Status GetFileByName(
       ServerContext* context, const grpc::string& file_name,
-      reflection::v1alpha::DescriptorDatabaseResponse* response);
+      reflection::v1alpha::ServerReflectionResponse* response);
 
   Status GetFileContainingSymbol(
       ServerContext* context, const grpc::string& symbol,
-      reflection::v1alpha::DescriptorDatabaseResponse* response);
+      reflection::v1alpha::ServerReflectionResponse* response);
 
   Status GetFileContainingExtension(
       ServerContext* context,
       const reflection::v1alpha::ExtensionRequest* request,
-      reflection::v1alpha::DescriptorDatabaseResponse* response);
+      reflection::v1alpha::ServerReflectionResponse* response);
 
   Status GetAllExtensionNumbers(
       ServerContext* context, const grpc::string& type,
@@ -83,7 +83,7 @@ class ProtoServerReflection GRPC_FINAL
 
   void FillFileDescriptorProtoResponse(
       const google::protobuf::FileDescriptor* file_desc,
-      reflection::v1alpha::DescriptorDatabaseResponse* response);
+      reflection::v1alpha::ServerReflectionResponse* response);
 
   void FillErrorResponse(Status* status,
                          reflection::v1alpha::ErrorResponse* error_response);

extensions/reflection/reflection.grpc.pb.cc

@@ -52,7 +52,7 @@ namespace reflection {
 namespace v1alpha {
 
 static const char* ServerReflection_method_names[] = {
-  "/grpc.reflection.v1alpha.ServerReflection/DescriptorDatabaseInfo",
+  "/grpc.reflection.v1alpha.ServerReflection/ServerReflectionInfo",
 };
 
 std::unique_ptr< ServerReflection::Stub> ServerReflection::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
@@ -61,15 +61,15 @@ std::unique_ptr< ServerReflection::Stub> ServerReflection::NewStub(const std::sh
 }
 
 ServerReflection::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
-  : channel_(channel), rpcmethod_DescriptorDatabaseInfo_(ServerReflection_method_names[0], ::grpc::RpcMethod::BIDI_STREAMING, channel)
+  : channel_(channel), rpcmethod_ServerReflectionInfo_(ServerReflection_method_names[0], ::grpc::RpcMethod::BIDI_STREAMING, channel)
   {}
 
-::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* ServerReflection::Stub::DescriptorDatabaseInfoRaw(::grpc::ClientContext* context) {
-  return new ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>(channel_.get(), rpcmethod_DescriptorDatabaseInfo_, context);
+::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflection::Stub::ServerReflectionInfoRaw(::grpc::ClientContext* context) {
+  return new ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>(channel_.get(), rpcmethod_ServerReflectionInfo_, context);
 }
 
-::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>* ServerReflection::Stub::AsyncDescriptorDatabaseInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-  return new ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>(channel_.get(), cq, rpcmethod_DescriptorDatabaseInfo_, context, tag);
+::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflection::Stub::AsyncServerReflectionInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
+  return new ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>(channel_.get(), cq, rpcmethod_ServerReflectionInfo_, context, tag);
 }
 
 ServerReflection::Service::Service() {
@@ -77,14 +77,14 @@ ServerReflection::Service::Service() {
   AddMethod(new ::grpc::RpcServiceMethod(
       ServerReflection_method_names[0],
       ::grpc::RpcMethod::BIDI_STREAMING,
-      new ::grpc::BidiStreamingHandler< ServerReflection::Service, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest, ::grpc::reflection::v1alpha::DescriptorDatabaseResponse>(
-          std::mem_fn(&ServerReflection::Service::DescriptorDatabaseInfo), this)));
+      new ::grpc::BidiStreamingHandler< ServerReflection::Service, ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>(
+          std::mem_fn(&ServerReflection::Service::ServerReflectionInfo), this)));
 }
 
 ServerReflection::Service::~Service() {
 }
 
-::grpc::Status ServerReflection::Service::DescriptorDatabaseInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::DescriptorDatabaseResponse, ::grpc::reflection::v1alpha::DescriptorDatabaseRequest>* stream) {
+::grpc::Status ServerReflection::Service::ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream) {
   (void) context;
   (void) stream;
   return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");

src/proto/grpc/reflection/v1alpha/reflection.proto

@@ -36,12 +36,12 @@ package grpc.reflection.v1alpha;
 service ServerReflection {
   // The reflection service is structured as a bidirectional stream, ensuring
   // all related requests go to a single server.
-  rpc DescriptorDatabaseInfo(stream DescriptorDatabaseRequest)
-      returns (stream DescriptorDatabaseResponse);
+  rpc ServerReflectionInfo(stream ServerReflectionRequest)
+      returns (stream ServerReflectionResponse);
 }
 
-// The message sent by the client when calling DescriptorDatabaseInfo method.
-message DescriptorDatabaseRequest {
+// The message sent by the client when calling ServerReflectionInfo method.
+message ServerReflectionRequest {
   string host = 1;
   // To use reflection service, the client should set one of the following
   // fields in message_request. The server distinguishes requests by their
@@ -83,18 +83,20 @@ message ExtensionRequest {
   int32 extension_number = 2;
 }
 
-// The message sent by the server to answer DescriptorDatabaseInfo method.
-message DescriptorDatabaseResponse {
+// The message sent by the server to answer ServerReflectionInfo method.
+message ServerReflectionResponse {
   string valid_host = 1;
-  DescriptorDatabaseRequest original_request = 2;
+  ServerReflectionRequest original_request = 2;
   // The server set one of the following fields accroding to the message_request
   // in the request.
   oneof message_response {
-    // A serialized FileDescriptorProto message. We avoid taking a dependency on
-    // descriptor.proto, which uses proto2 only features, by making them opaque
-    // bytes instead. This message is used to answer file_by_filename,
-    // file_containing_symbol, file_containing_extension requests.
-    bytes file_descriptor_proto = 4;
+    // This message is used to answer file_by_filename, file_containing_symbol,
+    // file_containing_extension requests with transitive dependencies. As
+    // the repeated label is not allowed in oneof fields, we use a
+    // FileDescriptorResponse message to encapsulate the repeated fields.
+    // The reflection service is allowed to avoid sending FileDescriptorProtos
+    // that were previously sent in response to earlier requests in the stream.
+    FileDescriptorResponse file_descriptor_response = 4;
 
     // This message is used to answer all_extension_numbers_of_type requst.
     ExtensionNumberResponse all_extension_numbers_response = 5;
@@ -107,6 +109,16 @@ message DescriptorDatabaseResponse {
   }
 }
 
+// Serialized FileDescriptorProto messages sent by the server answering
+// a file_by_filename, file_containing_symbol, or file_containing_extension
+// request.
+message FileDescriptorResponse {
+  // Serialized FileDescriptorProto messages. We avoid taking a dependency on
+  // descriptor.proto, which uses proto2 only features, by making them opaque
+  // bytes instead.
+  repeated bytes file_descriptor_proto = 1;
+}
+
 // A list of extension numbers sent by the server answering
 // all_extension_numbers_of_type request.
 message ExtensionNumberResponse {
@@ -116,11 +128,19 @@ message ExtensionNumberResponse {
   repeated int32 extension_number = 2;
 }
 
-// A list of service names sent by the server answering list_services request.
+// A list of ServiceResponse sent by the server answering list_services request.
 message ListServiceResponse {
-  // Full names of registered services, including package names. The format
+  // The information of each service may be expanded in the future, so we use
+  // ServiceResponse message to encapsulate it.
+  repeated ServiceResponse service = 1;
+}
+
+// The information of a single service used by ListServiceResponse to answer
+// list_services request.
+message ServiceResponse {
+  // Full name of a registered service, including its package name. The format
   // is <package>.<service>
-  repeated string service = 1;
+  string name = 1;
 }
 
 // The error code and error message sent by the server when an error occurs.