Update proto compiler

src/compiler/objective_c_generator.cc

@@ -238,19 +238,21 @@ void PrintV2Implementation(Printer* printer, const MethodDescriptor* method,
 }
 
 void PrintMethodImplementations(Printer* printer,
-                                const MethodDescriptor* method) {
+                                const MethodDescriptor* method,
+                                const Parameters& generator_params) {
   map< ::grpc::string, ::grpc::string> vars = GetMethodVars(method);
 
   PrintProtoRpcDeclarationAsPragma(printer, method, vars);
 
-  // TODO(jcanizales): Print documentation from the method.
-  printer->Print("// Deprecated methods.\n");
-  PrintSimpleSignature(printer, method, vars);
-  PrintSimpleImplementation(printer, method, vars);
+  if (!generator_params.no_v1_compatibility) {
+    // TODO(jcanizales): Print documentation from the method.
+    PrintSimpleSignature(printer, method, vars);
+    PrintSimpleImplementation(printer, method, vars);
 
-  printer->Print("// Returns a not-yet-started RPC object.\n");
-  PrintAdvancedSignature(printer, method, vars);
-  PrintAdvancedImplementation(printer, method, vars);
+    printer->Print("// Returns a not-yet-started RPC object.\n");
+    PrintAdvancedSignature(printer, method, vars);
+    PrintAdvancedImplementation(printer, method, vars);
+  }
 
   PrintV2Signature(printer, method, vars);
   PrintV2Implementation(printer, method, vars);
@@ -276,9 +278,11 @@ void PrintMethodImplementations(Printer* printer,
   return output;
 }
 
-::grpc::string GetProtocol(const ServiceDescriptor* service) {
+::grpc::string GetProtocol(const ServiceDescriptor* service, const Parameters& generator_params) {
   ::grpc::string output;
 
+  if (generator_params.no_v1_compatibility) return output;
+
   // Scope the output stream so it closes and finalizes output to the string.
   grpc::protobuf::io::StringOutputStream output_stream(&output);
   Printer printer(&output_stream, '$');
@@ -292,7 +296,7 @@ void PrintMethodImplementations(Printer* printer,
                 "that have been deprecated. They do not\n"
                 " * recognize call options provided in the initializer. Using "
                 "the v2 protocol is recommended.\n"
-                " */\n");
+                " */\n\n");
   printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n");
   for (int i = 0; i < service->method_count(); i++) {
     PrintMethodDeclarations(&printer, service->method(i));
@@ -321,7 +325,7 @@ void PrintMethodImplementations(Printer* printer,
   return output;
 }
 
-::grpc::string GetInterface(const ServiceDescriptor* service) {
+::grpc::string GetInterface(const ServiceDescriptor* service, const Parameters& generator_params) {
   ::grpc::string output;
 
   // Scope the output stream so it closes and finalizes output to the string.
@@ -338,7 +342,11 @@ void PrintMethodImplementations(Printer* printer,
                 " */\n");
   printer.Print(vars,
                 "@interface $service_class$ :"
-                " GRPCProtoService<$service_class$, $service_class$2>\n");
+                " GRPCProtoService<$service_class$2");
+  if (!generator_params.no_v1_compatibility) {
+    printer.Print(vars, ", $service_class$");
+  }
+  printer.Print(">\n");
   printer.Print(
       "- (instancetype)initWithHost:(NSString *)host "
       "callOptions:(GRPCCallOptions "
@@ -347,17 +355,19 @@ void PrintMethodImplementations(Printer* printer,
   printer.Print(
       "+ (instancetype)serviceWithHost:(NSString *)host "
       "callOptions:(GRPCCallOptions *_Nullable)callOptions;\n");
-  printer.Print(
-      "// The following methods belong to a set of old APIs that have been "
-      "deprecated.\n");
-  printer.Print("- (instancetype)initWithHost:(NSString *)host;\n");
-  printer.Print("+ (instancetype)serviceWithHost:(NSString *)host;\n");
+  if (!generator_params.no_v1_compatibility) {
+    printer.Print(
+        "// The following methods belong to a set of old APIs that have been "
+        "deprecated.\n");
+    printer.Print("- (instancetype)initWithHost:(NSString *)host;\n");
+    printer.Print("+ (instancetype)serviceWithHost:(NSString *)host;\n");
+  }
   printer.Print("@end\n");
 
   return output;
 }
 
-::grpc::string GetSource(const ServiceDescriptor* service) {
+::grpc::string GetSource(const ServiceDescriptor* service, const Parameters& generator_params) {
   ::grpc::string output;
   {
     // Scope the output stream so it closes and finalizes output to the string.
@@ -381,13 +391,16 @@ void PrintMethodImplementations(Printer* printer,
                   "                 packageName:@\"$package$\"\n"
                   "                 serviceName:@\"$service_name$\"\n"
                   "                 callOptions:callOptions];\n"
-                  "}\n\n"
-                  "- (instancetype)initWithHost:(NSString *)host {\n"
-                  "  return [super initWithHost:host\n"
-                  "                 packageName:@\"$package$\"\n"
-                  "                 serviceName:@\"$service_name$\"];\n"
-                  "}\n\n"
-                  "#pragma clang diagnostic pop\n\n");
+                  "}\n\n");
+    if (!generator_params.no_v1_compatibility) {
+      printer.Print(vars,
+                    "- (instancetype)initWithHost:(NSString *)host {\n"
+                    "  return [super initWithHost:host\n"
+                    "                 packageName:@\"$package$\"\n"
+                    "                 serviceName:@\"$service_name$\"];\n"
+                    "}\n\n");
+    }
+    printer.Print("#pragma clang diagnostic pop\n\n");
 
     printer.Print(
         "// Override superclass initializer to disallow different"
@@ -404,11 +417,13 @@ void PrintMethodImplementations(Printer* printer,
         "  return [self initWithHost:host callOptions:callOptions];\n"
         "}\n\n");
 
+    printer.Print("#pragma mark - Class Methods\n\n");
+    if (!generator_params.no_v1_compatibility) {
+      printer.Print("+ (instancetype)serviceWithHost:(NSString *)host {\n"
+                    "  return [[self alloc] initWithHost:host];\n"
+                    "}\n\n");
+    }
     printer.Print(
-        "#pragma mark - Class Methods\n\n"
-        "+ (instancetype)serviceWithHost:(NSString *)host {\n"
-        "  return [[self alloc] initWithHost:host];\n"
-        "}\n\n"
         "+ (instancetype)serviceWithHost:(NSString *)host "
         "callOptions:(GRPCCallOptions *_Nullable)callOptions {\n"
         "  return [[self alloc] initWithHost:host callOptions:callOptions];\n"
@@ -417,7 +432,7 @@ void PrintMethodImplementations(Printer* printer,
     printer.Print("#pragma mark - Method Implementations\n\n");
 
     for (int i = 0; i < service->method_count(); i++) {
-      PrintMethodImplementations(&printer, service->method(i));
+      PrintMethodImplementations(&printer, service->method(i), generator_params);
     }
 
     printer.Print("@end\n");

src/compiler/objective_c_generator.h

@@ -23,6 +23,11 @@
 
 namespace grpc_objective_c_generator {
 
+struct Parameters {
+  // Do not generate V1 interface and implementation
+  bool no_v1_compatibility;
+};
+
 using ::grpc::protobuf::FileDescriptor;
 using ::grpc::protobuf::FileDescriptor;
 using ::grpc::protobuf::ServiceDescriptor;
@@ -34,7 +39,7 @@ string GetAllMessageClasses(const FileDescriptor* file);
 // Returns the content to be included defining the @protocol segment at the
 // insertion point of the generated implementation file. This interface is
 // legacy and for backwards compatibility.
-string GetProtocol(const ServiceDescriptor* service);
+string GetProtocol(const ServiceDescriptor* service, const Parameters& generator_params);
 
 // Returns the content to be included defining the @protocol segment at the
 // insertion point of the generated implementation file.
@@ -42,11 +47,11 @@ string GetV2Protocol(const ServiceDescriptor* service);
 
 // Returns the content to be included defining the @interface segment at the
 // insertion point of the generated implementation file.
-string GetInterface(const ServiceDescriptor* service);
+string GetInterface(const ServiceDescriptor* service, const Parameters& generator_params);
 
 // Returns the content to be included in the "global_scope" insertion point of
 // the generated implementation file.
-string GetSource(const ServiceDescriptor* service);
+string GetSource(const ServiceDescriptor* service, const Parameters& generator_params);
 
 }  // namespace grpc_objective_c_generator
 

src/compiler/objective_c_plugin.cc

@@ -83,13 +83,29 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
     ::grpc::string file_name =
         google::protobuf::compiler::objectivec::FilePath(file);
 
+    grpc_objective_c_generator::Parameters generator_params;
+    generator_params.no_v1_compatibility = false;
+
+    if (!parameter.empty()) {
+      std::vector<grpc::string> parameters_list =
+          grpc_generator::tokenize(parameter, ",");
+      for (auto parameter_string = parameters_list.begin();
+           parameter_string != parameters_list.end(); parameter_string++) {
+        std::vector<grpc::string> param =
+            grpc_generator::tokenize(*parameter_string, "=");
+        if (param[0] == "no_v1_compatibility") {
+          generator_params.no_v1_compatibility = true;
+        }
+      }
+    }
+
     {
       // Generate .pbrpc.h
 
       ::grpc::string imports = LocalImport(file_name + ".pbobjc.h");
 
-      ::grpc::string system_imports = SystemImport("ProtoRPC/ProtoService.h") +
-                                      SystemImport("ProtoRPC/ProtoRPC.h") +
+      ::grpc::string system_imports = (generator_params.no_v1_compatibility ? SystemImport("ProtoRPC/ProtoService.h") : SystemImport("ProtoRPC/ProtoServiceLegacy.h")) +
+                                      (generator_params.no_v1_compatibility ? SystemImport("ProtoRPC/ProtoRPC.h") : SystemImport("ProtoRPC/ProtoRPCLegacy.h")) +
                                       SystemImport("RxLibrary/GRXWriteable.h") +
                                       SystemImport("RxLibrary/GRXWriter.h");
 
@@ -118,13 +134,13 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
       ::grpc::string protocols;
       for (int i = 0; i < file->service_count(); i++) {
         const grpc::protobuf::ServiceDescriptor* service = file->service(i);
-        protocols += grpc_objective_c_generator::GetProtocol(service);
+        protocols += grpc_objective_c_generator::GetProtocol(service, generator_params);
       }
 
       ::grpc::string interfaces;
       for (int i = 0; i < file->service_count(); i++) {
         const grpc::protobuf::ServiceDescriptor* service = file->service(i);
-        interfaces += grpc_objective_c_generator::GetInterface(service);
+        interfaces += grpc_objective_c_generator::GetInterface(service, generator_params);
       }
 
       Write(context, file_name + ".pbrpc.h",
@@ -143,7 +159,7 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
 
       ::grpc::string imports = LocalImport(file_name + ".pbrpc.h") +
                                LocalImport(file_name + ".pbobjc.h") +
-                               SystemImport("ProtoRPC/ProtoRPC.h") +
+                               (generator_params.no_v1_compatibility ? SystemImport("ProtoRPC/ProtoRPC.h") : SystemImport("ProtoRPC/ProtoRPCLegacy.h")) +
                                SystemImport("RxLibrary/GRXWriter+Immediate.h");
 
       ::grpc::string class_imports;
@@ -154,7 +170,7 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
       ::grpc::string definitions;
       for (int i = 0; i < file->service_count(); i++) {
         const grpc::protobuf::ServiceDescriptor* service = file->service(i);
-        definitions += grpc_objective_c_generator::GetSource(service);
+        definitions += grpc_objective_c_generator::GetSource(service, generator_params);
       }
 
       Write(context, file_name + ".pbrpc.m",