diff --git a/src/compiler/csharp_generator.cc b/src/compiler/csharp_generator.cc
index 7f178f63bb0..f630da7c58e 100644
--- a/src/compiler/csharp_generator.cc
+++ b/src/compiler/csharp_generator.cc
@@ -176,9 +176,8 @@ std::string GetServiceClassName(const ServiceDescriptor* service) {
return service->name();
}
-std::string GetClientClassName(const ServiceDescriptor* service,
- bool lite_client) {
- return service->name() + (lite_client ? "LiteClient" : "Client");
+std::string GetClientClassName(const ServiceDescriptor* service) {
+ return service->name() + "Client";
}
std::string GetServerClassName(const ServiceDescriptor* service) {
@@ -415,19 +414,11 @@ void GenerateServerClass(Printer* out, const ServiceDescriptor* service) {
out->Print("\n");
}
-void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
- bool lite_client) {
- if (!lite_client) {
- out->Print("/// Client for $servicename$\n",
- "servicename", GetServiceClassName(service));
- out->Print("public partial class $name$ : grpc::ClientBase<$name$>\n",
- "name", GetClientClassName(service, lite_client));
- } else {
- out->Print("/// Lite client for $servicename$\n",
- "servicename", GetServiceClassName(service));
- out->Print("public partial class $name$ : grpc::LiteClientBase\n", "name",
- GetClientClassName(service, lite_client));
- }
+void GenerateClientStub(Printer* out, const ServiceDescriptor* service) {
+ out->Print("/// Client for $servicename$\n", "servicename",
+ GetServiceClassName(service));
+ out->Print("public partial class $name$ : grpc::ClientBase<$name$>\n", "name",
+ GetClientClassName(service));
out->Print("{\n");
out->Indent();
@@ -449,30 +440,26 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
"servicename", GetServiceClassName(service));
out->Print(
"public $name$(grpc::CallInvoker callInvoker) : base(callInvoker)\n",
- "name", GetClientClassName(service, lite_client));
+ "name", GetClientClassName(service));
out->Print("{\n");
out->Print("}\n");
out->Print(
"/// Protected parameterless constructor to allow creation"
" of test doubles.\n");
out->Print("protected $name$() : base()\n", "name",
- GetClientClassName(service, lite_client));
+ GetClientClassName(service));
out->Print("{\n");
out->Print("}\n");
- if (!lite_client) {
- out->Print(
- "/// Protected constructor to allow creation of configured "
- "clients.\n"
- "/// The client "
- "configuration.\n");
- out->Print(
- "protected $name$(ClientBaseConfiguration configuration)"
- " : base(configuration)\n",
- "name", GetClientClassName(service, lite_client));
- out->Print("{\n");
- out->Print("}\n");
- }
- out->Print("\n");
+ out->Print(
+ "/// Protected constructor to allow creation of configured "
+ "clients.\n"
+ "/// The client configuration.\n");
+ out->Print(
+ "protected $name$(ClientBaseConfiguration configuration)"
+ " : base(configuration)\n",
+ "name", GetClientClassName(service));
+ out->Print("{\n");
+ out->Print("}\n\n");
for (int i = 0; i < service->method_count(); i++) {
const MethodDescriptor* method = service->method(i);
@@ -590,21 +577,19 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
}
// override NewInstance method
- if (!lite_client) {
- out->Print(
- "/// Creates a new instance of client from given "
- "ClientBaseConfiguration.\n");
- out->Print(
- "protected override $name$ NewInstance(ClientBaseConfiguration "
- "configuration)\n",
- "name", GetClientClassName(service, lite_client));
- out->Print("{\n");
- out->Indent();
- out->Print("return new $name$(configuration);\n", "name",
- GetClientClassName(service, lite_client));
- out->Outdent();
- out->Print("}\n");
- }
+ out->Print(
+ "/// Creates a new instance of client from given "
+ "ClientBaseConfiguration.\n");
+ out->Print(
+ "protected override $name$ NewInstance(ClientBaseConfiguration "
+ "configuration)\n",
+ "name", GetClientClassName(service));
+ out->Print("{\n");
+ out->Indent();
+ out->Print("return new $name$(configuration);\n", "name",
+ GetClientClassName(service));
+ out->Outdent();
+ out->Print("}\n");
out->Outdent();
out->Print("}\n");
@@ -685,8 +670,8 @@ void GenerateBindServiceWithBinderMethod(Printer* out,
}
void GenerateService(Printer* out, const ServiceDescriptor* service,
- bool generate_client, bool generate_lite_client,
- bool generate_server, bool internal_access) {
+ bool generate_client, bool generate_server,
+ bool internal_access) {
GenerateDocCommentBody(out, service);
out->Print("$access_level$ static partial class $classname$\n",
"access_level", GetAccessLevel(internal_access), "classname",
@@ -708,12 +693,8 @@ void GenerateService(Printer* out, const ServiceDescriptor* service,
GenerateServerClass(out, service);
}
if (generate_client) {
- GenerateClientStub(out, service, false);
- }
- if (generate_lite_client) {
- GenerateClientStub(out, service, true);
+ GenerateClientStub(out, service);
}
-
if (generate_server) {
GenerateBindServiceMethod(out, service);
GenerateBindServiceWithBinderMethod(out, service);
@@ -726,8 +707,7 @@ void GenerateService(Printer* out, const ServiceDescriptor* service,
} // anonymous namespace
grpc::string GetServices(const FileDescriptor* file, bool generate_client,
- bool generate_lite_client, bool generate_server,
- bool internal_access) {
+ bool generate_server, bool internal_access) {
grpc::string output;
{
// Scope the output stream so it closes and finalizes output to the string.
@@ -768,8 +748,8 @@ grpc::string GetServices(const FileDescriptor* file, bool generate_client,
out.Indent();
}
for (int i = 0; i < file->service_count(); i++) {
- GenerateService(&out, file->service(i), generate_client,
- generate_lite_client, generate_server, internal_access);
+ GenerateService(&out, file->service(i), generate_client, generate_server,
+ internal_access);
}
if (file_namespace != "") {
out.Outdent();
diff --git a/src/compiler/csharp_generator.h b/src/compiler/csharp_generator.h
index 842d136494c..fd36e11851b 100644
--- a/src/compiler/csharp_generator.h
+++ b/src/compiler/csharp_generator.h
@@ -26,8 +26,8 @@
namespace grpc_csharp_generator {
grpc::string GetServices(const grpc::protobuf::FileDescriptor* file,
- bool generate_client, bool generate_lite_client,
- bool generate_server, bool internal_access);
+ bool generate_client, bool generate_server,
+ bool internal_access);
} // namespace grpc_csharp_generator
diff --git a/src/compiler/csharp_plugin.cc b/src/compiler/csharp_plugin.cc
index a495f876792..5f13aa6749e 100644
--- a/src/compiler/csharp_plugin.cc
+++ b/src/compiler/csharp_plugin.cc
@@ -38,14 +38,10 @@ class CSharpGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
bool generate_client = true;
bool generate_server = true;
- bool generate_lite_client = true;
bool internal_access = false;
for (size_t i = 0; i < options.size(); i++) {
if (options[i].first == "no_client") {
generate_client = false;
- } else if (options[i].first == "no_lite_client") {
- // TODO: better option
- generate_lite_client = false;
} else if (options[i].first == "no_server") {
generate_server = false;
} else if (options[i].first == "internal_access") {
@@ -57,8 +53,7 @@ class CSharpGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
}
grpc::string code = grpc_csharp_generator::GetServices(
- file, generate_client, generate_lite_client, generate_server,
- internal_access);
+ file, generate_client, generate_server, internal_access);
if (code.size() == 0) {
return true; // don't generate a file if there are no services
}