Addressed reveiw comments about naming

3 files changed, 19 insertions, 20 deletions

diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc
index ae770654ff..300b209113 100644
--- a/test/cpp/end2end/proto_server_reflection_test.cc
+++ b/test/cpp/end2end/proto_server_reflection_test.cc
@@ -140,6 +140,7 @@ class ProtoServerReflectionTest : public ::testing::Test {
   std::unordered_set<string> known_types_;
   const google::protobuf::DescriptorPool* ref_desc_pool_;
   int port_;
+  reflection::ProtoServerReflectionPlugin plugin_;
 };
 
 TEST_F(ProtoServerReflectionTest, CheckResponseWithLocalDescriptorPool) {
diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc
index 6513a14992..6907d97bd5 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.cc
+++ b/test/cpp/util/proto_reflection_descriptor_database.cc
@@ -69,10 +69,7 @@ bool ProtoReflectionDescriptorDatabase::FindFileByName(
   request.set_file_by_filename(filename);
   ServerReflectionResponse response;
 
-  stream_mutex_.lock();
-  GetStream()->Write(request);
-  GetStream()->Read(&response);
-  stream_mutex_.unlock();
+  DoOneRequest(request, response);
 
   if (response.message_response_case() ==
       ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse) {
@@ -117,10 +114,7 @@ bool ProtoReflectionDescriptorDatabase::FindFileContainingSymbol(
   request.set_file_containing_symbol(symbol_name);
   ServerReflectionResponse response;
 
-  stream_mutex_.lock();
-  GetStream()->Write(request);
-  GetStream()->Read(&response);
-  stream_mutex_.unlock();
+  DoOneRequest(request, response);
 
   if (response.message_response_case() ==
       ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse) {
@@ -174,10 +168,7 @@ bool ProtoReflectionDescriptorDatabase::FindFileContainingExtension(
       field_number);
   ServerReflectionResponse response;
 
-  stream_mutex_.lock();
-  GetStream()->Write(request);
-  GetStream()->Read(&response);
-  stream_mutex_.unlock();
+  DoOneRequest(request, response);
 
   if (response.message_response_case() ==
       ServerReflectionResponse::MessageResponseCase::kFileDescriptorResponse) {
@@ -227,10 +218,7 @@ bool ProtoReflectionDescriptorDatabase::FindAllExtensionNumbers(
   request.set_all_extension_numbers_of_type(extendee_type);
   ServerReflectionResponse response;
 
-  stream_mutex_.lock();
-  GetStream()->Write(request);
-  GetStream()->Read(&response);
-  stream_mutex_.unlock();
+  DoOneRequest(request, response);
 
   if (response.message_response_case() ==
       ServerReflectionResponse::MessageResponseCase::
@@ -262,10 +250,7 @@ bool ProtoReflectionDescriptorDatabase::GetServices(
   request.set_list_services("");
   ServerReflectionResponse response;
 
-  stream_mutex_.lock();
-  GetStream()->Write(request);
-  GetStream()->Read(&response);
-  stream_mutex_.unlock();
+  DoOneRequest(request, response);
 
   if (response.message_response_case() ==
       ServerReflectionResponse::MessageResponseCase::kListServicesResponse) {
@@ -319,4 +304,13 @@ ProtoReflectionDescriptorDatabase::GetStream() {
   return stream_;
 }
 
+void ProtoReflectionDescriptorDatabase::DoOneRequest(
+    const ServerReflectionRequest& request,
+    ServerReflectionResponse& response) {
+  stream_mutex_.lock();
+  GetStream()->Write(request);
+  GetStream()->Read(&response);
+  stream_mutex_.unlock();
+}
+
 }  // namespace grpc
diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h
index c6f7b5f046..7656a496c2 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@@ -91,6 +91,10 @@ class ProtoReflectionDescriptorDatabase
 
   const std::shared_ptr<ClientStream> GetStream();
 
+  void DoOneRequest(
+    const grpc::reflection::v1alpha::ServerReflectionRequest& request,
+    grpc::reflection::v1alpha::ServerReflectionResponse& response);
+
   std::shared_ptr<ClientStream> stream_;
   grpc::ClientContext ctx_;
   std::unique_ptr<grpc::reflection::v1alpha::ServerReflection::Stub> stub_;