moved member variables from protected to private

Per style guide, the member variables are not protected but private and
accessed through methods.

2 files changed, 27 insertions, 10 deletions

diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index b09c590a7e..77ae7206b4 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -153,11 +153,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
   /// \param num_cqs How many completion queues does \a cqs hold.
   void Start(ServerCompletionQueue** cqs, size_t num_cqs) override;
 
-  // Pointer to the wrapped grpc_server.
-  grpc_server* server_;
-
-  // Server status
-  bool started_;
+  grpc_server* server() override { return server_; };
 
  private:
   friend class AsyncGenericService;
@@ -191,8 +187,6 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
     return max_receive_message_size_;
   };
 
-  grpc_server* server() override { return server_; };
-
   ServerInitializer* initializer();
 
   const int max_receive_message_size_;
@@ -209,6 +203,8 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
 
   // Server status
   std::mutex mu_;
+  // Server status
+  bool started_;
   bool shutdown_;
   bool shutdown_notified_;  // Was notify called on the shutdown_cv_
 
@@ -219,6 +215,9 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
   std::vector<grpc::string> services_;
   bool has_generic_service_;
 
+  // Pointer to the wrapped grpc_server.
+  grpc_server* server_;
+
   std::unique_ptr<ServerInitializer> server_initializer_;
 
   std::unique_ptr<HealthCheckServiceInterface> health_check_service_;
diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 8f148bcd06..5ae0fb161d 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -226,9 +226,24 @@ class ServerBuilder {
     Service* service;
   };
 
-  std::vector<std::unique_ptr<ServerBuilderOption>> options_;
-  std::vector<std::unique_ptr<NamedService>> services_;
-  std::vector<Port> ports_;
+  std::vector<Port> ports() { return ports_; }
+
+  std::vector<std::reference_wrapper<NamedService>> services() {
+    std::vector<std::reference_wrapper<NamedService>> service_refs;
+    for (auto &ptr : services_) {
+      service_refs.push_back(std::ref(*ptr));
+    }
+    return service_refs;
+  }
+
+  std::vector<std::reference_wrapper<ServerBuilderOption>> options() {
+    std::vector<std::reference_wrapper<ServerBuilderOption>> option_refs;
+    for (auto &ptr : options_) {
+      option_refs.push_back(std::ref(*ptr));
+    }
+    return option_refs;
+  }
+
 
  private:
   friend class ::grpc::testing::ServerBuilderPluginTest;
@@ -254,6 +269,9 @@ class ServerBuilder {
 
   int max_receive_message_size_;
   int max_send_message_size_;
+  std::vector<std::unique_ptr<ServerBuilderOption>> options_;
+  std::vector<std::unique_ptr<NamedService>> services_;
+  std::vector<Port> ports_;
 
   SyncServerSettings sync_server_settings_;