From 346a00eb316f33ac4264ef8ec99243f2d43cb16b Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Fri, 18 Sep 2020 14:25:48 -0700
Subject: [PATCH] Cleanup generic server contexts

---
 .../impl/codegen/async_generic_service.h      | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/include/grpcpp/impl/codegen/async_generic_service.h b/include/grpcpp/impl/codegen/async_generic_service.h
index 398768b4240..048af3326ee 100644
--- a/include/grpcpp/impl/codegen/async_generic_service.h
+++ b/include/grpcpp/impl/codegen/async_generic_service.h
@@ -36,20 +36,13 @@ typedef ServerAsyncResponseWriter<ByteBuffer> GenericServerAsyncResponseWriter;
 typedef ServerAsyncReader<ByteBuffer, ByteBuffer> GenericServerAsyncReader;
 typedef ServerAsyncWriter<ByteBuffer> GenericServerAsyncWriter;
 
-class GenericServerContext final : public ::grpc::ServerContext {
+class GenericServerContext final : public ServerContext {
  public:
   const std::string& method() const { return method_; }
   const std::string& host() const { return host_; }
 
  private:
-  friend class grpc::Server;
-  friend class grpc::ServerInterface;
-
-  void Clear() {
-    method_.clear();
-    host_.clear();
-    ::grpc::ServerContext::Clear();
-  }
+  friend class ServerInterface;
 
   std::string method_;
   std::string host_;
@@ -95,21 +88,13 @@ namespace experimental {
 /// ByteBuffer arguments.
 using ServerGenericBidiReactor = ServerBidiReactor<ByteBuffer, ByteBuffer>;
 
-class GenericCallbackServerContext final
-    : public ::grpc::CallbackServerContext {
+class GenericCallbackServerContext final : public grpc::CallbackServerContext {
  public:
   const std::string& method() const { return method_; }
   const std::string& host() const { return host_; }
 
  private:
   friend class ::grpc::Server;
-  friend class ::grpc::ServerInterface;
-
-  void Clear() {
-    method_.clear();
-    host_.clear();
-    ::grpc::CallbackServerContext::Clear();
-  }
 
   std::string method_;
   std::string host_;