[occ] Avoid using private namespace in gRPC

Author: teo

occ/plugin/OccLiteServer.cxx

@@ -70,7 +70,7 @@ OccLite::Service::Service(fair::mq::PluginServices* pluginServices)
     AddMethod(eventStream);
 }
 
-::grpc::Status OccLite::Service::GetState(::grpc_impl::ServerContext* context,
+::grpc::Status OccLite::Service::GetState(::grpc::ServerContext* context,
                                           const OccLite::nopb::GetStateRequest* request,
                                           OccLite::nopb::GetStateResponse* response)
 {
@@ -89,7 +89,7 @@ ::grpc::Status OccLite::Service::GetState(::grpc_impl::ServerContext* context,
     return grpc::Status::OK;
 }
 
-::grpc::Status OccLite::Service::Transition(::grpc_impl::ServerContext* context,
+::grpc::Status OccLite::Service::Transition(::grpc::ServerContext* context,
                                             const OccLite::nopb::TransitionRequest* request,
                                             OccLite::nopb::TransitionResponse* response)
 {
@@ -108,7 +108,7 @@ ::grpc::Status OccLite::Service::Transition(::grpc_impl::ServerContext* context,
 
 ::grpc::Status
 
-OccLite::Service::EventStream(::grpc_impl::ServerContext* context, const OccLite::nopb::EventStreamRequest* request,
+OccLite::Service::EventStream(::grpc::ServerContext* context, const OccLite::nopb::EventStreamRequest* request,
                               ::grpc::ServerWriter<OccLite::nopb::EventStreamResponse>* writer)
 {
     (void) context;

occ/plugin/OccLiteServer.h

@@ -29,7 +29,7 @@
 
 #include <grpcpp/impl/codegen/service_type.h>
 #include <grpcpp/impl/codegen/sync_stream.h>
-#include <grpcpp/server_impl.h>
+#include <grpcpp/server.h>
 
 #include <mutex>
 
@@ -60,15 +60,15 @@ class Service : public ::grpc::Service
     virtual ~Service()
     {}
 
-    ::grpc::Status EventStream(::grpc_impl::ServerContext* context,
+    ::grpc::Status EventStream(::grpc::ServerContext* context,
                                const nopb::EventStreamRequest* request,
                                ::grpc::ServerWriter<nopb::EventStreamResponse>* writer);
 
-    ::grpc::Status GetState(::grpc_impl::ServerContext*,
+    ::grpc::Status GetState(::grpc::ServerContext*,
                             const nopb::GetStateRequest*,
                             nopb::GetStateResponse*);
 
-    ::grpc::Status Transition(::grpc_impl::ServerContext* context,
+    ::grpc::Status Transition(::grpc::ServerContext* context,
                               const nopb::TransitionRequest* request,
                               nopb::TransitionResponse* response);