Backward compatibility

1 files changed, 11 insertions, 3 deletions

diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc
index 466da4c3b4..92b9c828fb 100644
--- a/src/compiler/objective_c_plugin.cc
+++ b/src/compiler/objective_c_plugin.cc
@@ -59,8 +59,16 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
       return true;
     }
 
-    ::grpc::string file_name =
-        google::protobuf::compiler::objectivec::FilePath(file);
+    ::grpc::string file_name;
+
+    // Simple parameter parsing as we have only one parameter.
+    // TODO(mxyan): Complete parameter parsing.
+    bool dash_as_separator = (0 == parameter.compare("--filename-dash-as-separator"));
+    if (dash_as_separator) {
+      file_name = google::protobuf::compiler::objectivec::FilePath(file);
+    } else {
+      file_name = grpc_generator::FileNameInUpperCamel(file);
+    }
     ::grpc::string prefix = file->options().objc_class_prefix();
 
     {
@@ -78,7 +86,7 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
       ::grpc::string proto_imports;
       for (int i = 0; i < file->dependency_count(); i++) {
         ::grpc::string header =
-            grpc_objective_c_generator::MessageHeaderName(file->dependency(i));
+            grpc_objective_c_generator::MessageHeaderName(file->dependency(i), dash_as_separator);
         const grpc::protobuf::FileDescriptor *dependency = file->dependency(i);
         if (IsProtobufLibraryBundledProtoFile(dependency)) {
           ::grpc::string base_name = header;