Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "only generate full or lite client, never both"

Browse Source 
This reverts commit 1b8418b546.
pull/20149/head
Jan Tattermusch 5 years ago
parent f78966eb52
commit 7b2c253530
3 changed files with 37 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/compiler/csharp_generator.cc
  2. 4
      src/compiler/csharp_generator.h
  3. 12
      src/compiler/csharp_plugin.cc

38
src/compiler/csharp_generator.cc
Unescape View File

@ -176,8 +176,9 @@ std::string GetServiceClassName(const ServiceDescriptor* service) {
return service->name();
}
std::string GetClientClassName(const ServiceDescriptor* service) {
return service->name() + "Client";
std::string GetClientClassName(const ServiceDescriptor* service,
bool lite_client) {
return service->name() + (lite_client ? "LiteClient" : "Client");
}
std::string GetServerClassName(const ServiceDescriptor* service) {
@ -420,18 +421,17 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
out->Print("/// <summary>Client for $servicename$</summary>\n",
"servicename", GetServiceClassName(service));
out->Print("public partial class $name$ : grpc::ClientBase<$name$>\n",
"name", GetClientClassName(service));
"name", GetClientClassName(service, lite_client));
} else {
out->Print("/// <summary>Lite client for $servicename$</summary>\n",
"servicename", GetServiceClassName(service));
out->Print("public partial class $name$ : grpc::LiteClientBase\n", "name",
GetClientClassName(service));
GetClientClassName(service, lite_client));
}
out->Print("{\n");
out->Indent();
// constructors
if (!lite_client) {
out->Print(
"/// <summary>Creates a new client for $servicename$</summary>\n"
"/// <param name=\"channel\">The channel to use to make remote "
@ -441,7 +441,6 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
"name", GetClientClassName(service));
out->Print("{\n");
out->Print("}\n");
}
out->Print(
"/// <summary>Creates a new client for $servicename$ that uses a custom "
"<c>CallInvoker</c>.</summary>\n"
@ -450,14 +449,14 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
"servicename", GetServiceClassName(service));
out->Print(
"public $name$(grpc::CallInvoker callInvoker) : base(callInvoker)\n",
"name", GetClientClassName(service));
"name", GetClientClassName(service, lite_client));
out->Print("{\n");
out->Print("}\n");
out->Print(
"/// <summary>Protected parameterless constructor to allow creation"
" of test doubles.</summary>\n");
out->Print("protected $name$() : base()\n", "name",
GetClientClassName(service));
GetClientClassName(service, lite_client));
out->Print("{\n");
out->Print("}\n");
if (!lite_client) {
@ -469,7 +468,7 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
out->Print(
"protected $name$(ClientBaseConfiguration configuration)"
" : base(configuration)\n",
"name", GetClientClassName(service));
"name", GetClientClassName(service, lite_client));
out->Print("{\n");
out->Print("}\n");
}
@ -598,11 +597,11 @@ void GenerateClientStub(Printer* out, const ServiceDescriptor* service,
out->Print(
"protected override $name$ NewInstance(ClientBaseConfiguration "
"configuration)\n",
"name", GetClientClassName(service));
"name", GetClientClassName(service, lite_client));
out->Print("{\n");
out->Indent();
out->Print("return new $name$(configuration);\n", "name",
GetClientClassName(service));
GetClientClassName(service, lite_client));
out->Outdent();
out->Print("}\n");
}
@ -686,8 +685,8 @@ void GenerateBindServiceWithBinderMethod(Printer* out,
}
void GenerateService(Printer* out, const ServiceDescriptor* service,
bool generate_client, bool generate_server,
bool internal_access, bool lite_client) {
bool generate_client, bool generate_lite_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",
@ -709,7 +708,10 @@ void GenerateService(Printer* out, const ServiceDescriptor* service,
GenerateServerClass(out, service);
}
if (generate_client) {
GenerateClientStub(out, service, lite_client);
GenerateClientStub(out, service, false);
}
if (generate_lite_client) {
GenerateClientStub(out, service, true);
}
if (generate_server) {
@ -724,8 +726,8 @@ void GenerateService(Printer* out, const ServiceDescriptor* service,
} // anonymous namespace
grpc::string GetServices(const FileDescriptor* file, bool generate_client,
bool generate_server, bool internal_access,
bool lite_client) {
bool generate_lite_client, bool generate_server,
bool internal_access) {
grpc::string output;
{
// Scope the output stream so it closes and finalizes output to the string.
@ -766,8 +768,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_server,
internal_access, lite_client);
GenerateService(&out, file->service(i), generate_client,
generate_lite_client, generate_server, internal_access);
}
if (file_namespace != "") {
out.Outdent();

4
src/compiler/csharp_generator.h
Unescape View File

@ -26,8 +26,8 @@
namespace grpc_csharp_generator {
grpc::string GetServices(const grpc::protobuf::FileDescriptor* file,
bool generate_client, bool generate_server,
bool internal_access, bool lite_client);
bool generate_client, bool generate_lite_client,
bool generate_server, bool internal_access);
} // namespace grpc_csharp_generator

12
src/compiler/csharp_plugin.cc
Unescape View File

@ -38,19 +38,18 @@ class CSharpGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
bool generate_client = true;
bool generate_server = true;
bool generate_lite_client = true;
bool internal_access = false;
bool lite_client = 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") {
internal_access = true;
} else if (options[i].first == "lite_client") {
// will only be used if generate_client is true.
// NOTE: experimental option, can be removed in future release
lite_client = true;
} else {
*error = "Unknown generator option: " + options[i].first;
return false;
@ -58,7 +57,8 @@ class CSharpGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
}
grpc::string code = grpc_csharp_generator::GetServices(
file, generate_client, generate_server, internal_access, lite_client);
file, generate_client, generate_lite_client, generate_server,
internal_access);
if (code.size() == 0) {
return true; // don't generate a file if there are no services
}

Write Preview
Loading…
Cancel
Save