Move ServerInitializer to grpc_impl namespace from grpc

6 years ago · 577ddfb1a1
parent a8f90b6df1
commit 577ddfb1a1
13 changed files with 93 additions and 43 deletions
--- a/1
+++ b/1
@ -237,6 +237,7 @@ GRPCXX_PUBLIC_HDRS = [
    "include/grpcpp/impl/server_builder_option.h",
    "include/grpcpp/impl/server_builder_plugin.h",
    "include/grpcpp/impl/server_initializer.h",
+    "include/grpcpp/impl/server_initializer_impl.h",
    "include/grpcpp/impl/service_type.h",
    "include/grpcpp/impl/sync_cxx11.h",
    "include/grpcpp/impl/sync_no_cxx11.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3017,6 +3017,7 @@ foreach(_hdr
  include/grpcpp/impl/server_builder_option.h
  include/grpcpp/impl/server_builder_plugin.h
  include/grpcpp/impl/server_initializer.h
+  include/grpcpp/impl/server_initializer_impl.h
  include/grpcpp/impl/service_type.h
  include/grpcpp/resource_quota.h
  include/grpcpp/security/auth_context.h
@ -3608,6 +3609,7 @@ foreach(_hdr
  include/grpcpp/impl/server_builder_option.h
  include/grpcpp/impl/server_builder_plugin.h
  include/grpcpp/impl/server_initializer.h
+  include/grpcpp/impl/server_initializer_impl.h
  include/grpcpp/impl/service_type.h
  include/grpcpp/resource_quota.h
  include/grpcpp/security/auth_context.h
@ -4571,6 +4573,7 @@ foreach(_hdr
  include/grpcpp/impl/server_builder_option.h
  include/grpcpp/impl/server_builder_plugin.h
  include/grpcpp/impl/server_initializer.h
+  include/grpcpp/impl/server_initializer_impl.h
  include/grpcpp/impl/service_type.h
  include/grpcpp/resource_quota.h
  include/grpcpp/security/auth_context.h
--- a/3
+++ b/3
@ -5344,6 +5344,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/impl/server_builder_option.h \
    include/grpcpp/impl/server_builder_plugin.h \
    include/grpcpp/impl/server_initializer.h \
+    include/grpcpp/impl/server_initializer_impl.h \
    include/grpcpp/impl/service_type.h \
    include/grpcpp/resource_quota.h \
    include/grpcpp/security/auth_context.h \
@ -5943,6 +5944,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/impl/server_builder_option.h \
    include/grpcpp/impl/server_builder_plugin.h \
    include/grpcpp/impl/server_initializer.h \
+    include/grpcpp/impl/server_initializer_impl.h \
    include/grpcpp/impl/service_type.h \
    include/grpcpp/resource_quota.h \
    include/grpcpp/security/auth_context.h \
@ -6855,6 +6857,7 @@ PUBLIC_HEADERS_CXX += \
    include/grpcpp/impl/server_builder_option.h \
    include/grpcpp/impl/server_builder_plugin.h \
    include/grpcpp/impl/server_initializer.h \
+    include/grpcpp/impl/server_initializer_impl.h \
    include/grpcpp/impl/service_type.h \
    include/grpcpp/resource_quota.h \
    include/grpcpp/security/auth_context.h \
--- a/build.yaml
+++ b/build.yaml
@ -1362,6 +1362,7 @@ filegroups:
  - include/grpcpp/impl/server_builder_option.h
  - include/grpcpp/impl/server_builder_plugin.h
  - include/grpcpp/impl/server_initializer.h
+  - include/grpcpp/impl/server_initializer_impl.h
  - include/grpcpp/impl/service_type.h
  - include/grpcpp/resource_quota.h
  - include/grpcpp/security/auth_context.h
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -103,6 +103,7 @@ Pod::Spec.new do |s|
                      'include/grpcpp/impl/server_builder_option.h',
                      'include/grpcpp/impl/server_builder_plugin.h',
                      'include/grpcpp/impl/server_initializer.h',
+                      'include/grpcpp/impl/server_initializer_impl.h',
                      'include/grpcpp/impl/service_type.h',
                      'include/grpcpp/resource_quota.h',
                      'include/grpcpp/security/auth_context.h',
--- a/include/grpcpp/ext/proto_server_reflection_plugin.h
+++ b/include/grpcpp/ext/proto_server_reflection_plugin.h
@ -22,8 +22,11 @@
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/config.h>

-namespace grpc {
+namespace grpc_impl {
+
 class ServerInitializer;
+}
+namespace grpc {
 class ProtoServerReflection;
 }  // namespace grpc

@ -34,8 +37,8 @@ class ProtoServerReflectionPlugin : public ::grpc::ServerBuilderPlugin {
 public:
  ProtoServerReflectionPlugin();
  ::grpc::string name() override;
-  void InitServer(::grpc::ServerInitializer* si) override;
-  void Finish(::grpc::ServerInitializer* si) override;
+  void InitServer(::grpc_impl::ServerInitializer* si) override;
+  void Finish(::grpc_impl::ServerInitializer* si) override;
  void ChangeArguments(const ::grpc::string& name, void* value) override;
  bool has_async_methods() const override;
  bool has_sync_methods() const override;
--- a/include/grpcpp/impl/server_builder_plugin.h
+++ b/include/grpcpp/impl/server_builder_plugin.h
@ -23,10 +23,13 @@

 #include <grpcpp/support/config.h>

+namespace grpc_impl {
+
+class ServerInitializer;
+}
 namespace grpc {

 class ServerBuilder;
-class ServerInitializer;
 class ChannelArguments;

 /// This interface is meant for internal usage only. Implementations of this
@ -44,10 +47,10 @@ class ServerBuilderPlugin {

  /// InitServer will be called in ServerBuilder::BuildAndStart(), after the
  /// Server instance is created.
-  virtual void InitServer(ServerInitializer* si) = 0;
+  virtual void InitServer(grpc_impl::ServerInitializer* si) = 0;

  /// Finish will be called at the end of ServerBuilder::BuildAndStart().
-  virtual void Finish(ServerInitializer* si) = 0;
+  virtual void Finish(grpc_impl::ServerInitializer* si) = 0;

  /// ChangeArguments is an interface that can be used in
  /// ServerBuilderOption::UpdatePlugins
--- a/include/grpcpp/impl/server_initializer.h
+++ b/include/grpcpp/impl/server_initializer.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2016 gRPC authors.
+ * Copyright 2019 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -19,36 +19,11 @@
 #ifndef GRPCPP_IMPL_SERVER_INITIALIZER_H
 #define GRPCPP_IMPL_SERVER_INITIALIZER_H

-#include <memory>
-#include <vector>
-
-#include <grpcpp/server.h>
+#include <grpcpp/impl/server_initializer_impl.h>

 namespace grpc {

-class Server;
-class Service;
-
-class ServerInitializer {
- public:
-  ServerInitializer(Server* server) : server_(server) {}
-
-  bool RegisterService(std::shared_ptr<Service> service) {
-    if (!server_->RegisterService(nullptr, service.get())) {
-      return false;
-    }
-    default_services_.push_back(service);
-    return true;
-  }
-
-  const std::vector<grpc::string>* GetServiceList() {
-    return &server_->services_;
-  }
-
- private:
-  Server* server_;
-  std::vector<std::shared_ptr<Service> > default_services_;
-};
+typedef ::grpc_impl::ServerInitializer ServerInitializer;

 }  // namespace grpc

--- a/include/grpcpp/impl/server_initializer_impl.h
+++ b/include/grpcpp/impl/server_initializer_impl.h
@ -0,0 +1,57 @@
+/*
+ *
+ * Copyright 2016 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPCPP_IMPL_SERVER_INITIALIZER_IMPL_H
+#define GRPCPP_IMPL_SERVER_INITIALIZER_IMPL_H
+
+#include <memory>
+#include <vector>
+
+#include <grpcpp/server.h>
+
+namespace grpc {
+
+class Server;
+class Service;
+}  // namespace grpc
+namespace grpc_impl {
+
+class ServerInitializer {
+ public:
+  ServerInitializer(grpc::Server* server) : server_(server) {}
+
+  bool RegisterService(std::shared_ptr<grpc::Service> service) {
+    if (!server_->RegisterService(nullptr, service.get())) {
+      return false;
+    }
+    default_services_.push_back(service);
+    return true;
+  }
+
+  const std::vector<grpc::string>* GetServiceList() {
+    return &server_->services_;
+  }
+
+ private:
+  grpc::Server* server_;
+  std::vector<std::shared_ptr<grpc::Service> > default_services_;
+};
+
+}  // namespace grpc_impl
+
+#endif  // GRPCPP_IMPL_SERVER_INITIALIZER_IMPL_H
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@ -40,12 +40,15 @@

 struct grpc_server;

+namespace grpc_impl {
+
+class ServerInitializer;
+}
 namespace grpc {

 class AsyncGenericService;
 class HealthCheckServiceInterface;
 class ServerContext;
-class ServerInitializer;

 /// Represents a gRPC server.
 ///
@ -199,7 +202,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {

  friend class AsyncGenericService;
  friend class ServerBuilder;
-  friend class ServerInitializer;
+  friend class grpc_impl::ServerInitializer;

  class SyncRequest;
  class CallbackRequestBase;
@ -257,7 +260,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {

  CompletionQueue* CallbackCQ() override;

-  ServerInitializer* initializer();
+  grpc_impl::ServerInitializer* initializer();

  // A vector of interceptor factory objects.
  // This should be destroyed after health_check_service_ and this requirement
@ -321,7 +324,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
  // Pointer to the wrapped grpc_server.
  grpc_server* server_;

-  std::unique_ptr<ServerInitializer> server_initializer_;
+  std::unique_ptr<grpc_impl::ServerInitializer> server_initializer_;

  std::unique_ptr<HealthCheckServiceInterface> health_check_service_;
  bool health_check_service_disabled_;
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
@ -36,13 +36,13 @@ class LoadReportingServiceServerBuilderPlugin : public ServerBuilderPlugin {
  grpc::string name() override { return "load_reporting_service"; }

  // Creates a load reporting service.
-  void UpdateServerBuilder(grpc::ServerBuilder* builder) override;
+  void UpdateServerBuilder(ServerBuilder* builder) override;

  // Registers the load reporter service.
-  void InitServer(grpc::ServerInitializer* si) override;
+  void InitServer(grpc_impl::ServerInitializer* si) override;

  // Starts the load reporter service.
-  void Finish(grpc::ServerInitializer* si) override;
+  void Finish(grpc_impl::ServerInitializer* si) override;

  void ChangeArguments(const grpc::string& name, void* value) override {}
  void UpdateChannelArguments(grpc::ChannelArguments* args) override {}
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@ -309,7 +309,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
      sync_server_settings_.cq_timeout_msec, resource_quota_,
      std::move(interceptor_creators_)));

-  ServerInitializer* initializer = server->initializer();
+  grpc_impl::ServerInitializer* initializer = server->initializer();

  // Register all the completion queues with the server. i.e
  //  1. sync_server_cqs: internal completion queues created IF this is a sync
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@ -766,7 +766,7 @@ Server::Server(
      shutdown_(false),
      shutdown_notified_(false),
      server_(nullptr),
-      server_initializer_(new ServerInitializer(this)),
+      server_initializer_(new grpc_impl::ServerInitializer(this)),
      health_check_service_disabled_(false) {
  g_gli_initializer.summon();
  gpr_once_init(&g_once_init_callbacks, InitGlobalCallbacks);