From e6d6a1b97806828db2534c6427c8f5814dd0e048 Mon Sep 17 00:00:00 2001
From: Muxi Yan <muxi@users.noreply.github.com>
Date: Thu, 3 May 2018 10:05:48 -0700
Subject: Revert "Revert "Provide protocol for initializer of generated
 messages""

---
 src/compiler/objective_c_generator.cc   | 2 +-
 src/objective-c/ProtoRPC/ProtoService.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 39f68cb956..7d4d4d1f5a 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -248,7 +248,7 @@ void PrintMethodImplementations(Printer* printer,
                 " */\n");
   printer.Print(vars,
                 "@interface $service_class$ :"
-                " GRPCProtoService<$service_class$>\n");
+                " GRPCProtoService<$service_class$, GRPCProtoServiceInit>\n");
   printer.Print(
       "- (instancetype)initWithHost:(NSString *)host"
       " NS_DESIGNATED_INITIALIZER;\n");
diff --git a/src/objective-c/ProtoRPC/ProtoService.h b/src/objective-c/ProtoRPC/ProtoService.h
index 29c4e9be36..c411bed60f 100644
--- a/src/objective-c/ProtoRPC/ProtoService.h
+++ b/src/objective-c/ProtoRPC/ProtoService.h
@@ -22,6 +22,12 @@
 @protocol GRXWriteable;
 @class GRXWriter;
 
+@protocol GRPCProtoServiceInit
+
+- (instancetype)initWithHost:(NSString *)host;
+
+@end
+
 __attribute__((deprecated("Please use GRPCProtoService."))) @interface ProtoService
     : NSObject -
       (instancetype)initWithHost : (NSString *)host packageName
-- 
cgit v1.2.3


From dcb05c16c67e1473880482fff0581f11edd3da1b Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Thu, 3 May 2018 10:16:34 -0700
Subject: Fix generater

---
 src/compiler/objective_c_generator.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 7d4d4d1f5a..2294615a28 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -222,7 +222,7 @@ void PrintMethodImplementations(Printer* printer,
   map< ::grpc::string, ::grpc::string> vars = {
       {"service_class", ServiceClassName(service)}};
 
-  printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n");
+  printer.Print(vars, "@protocol $service_class$ <NSObject, GRPCProtoServiceInit>\n\n");
   for (int i = 0; i < service->method_count(); i++) {
     PrintMethodDeclarations(&printer, service->method(i));
   }
@@ -248,7 +248,7 @@ void PrintMethodImplementations(Printer* printer,
                 " */\n");
   printer.Print(vars,
                 "@interface $service_class$ :"
-                " GRPCProtoService<$service_class$, GRPCProtoServiceInit>\n");
+                " GRPCProtoService<$service_class$>\n");
   printer.Print(
       "- (instancetype)initWithHost:(NSString *)host"
       " NS_DESIGNATED_INITIALIZER;\n");
-- 
cgit v1.2.3


From 77933b1897af206fc7722c53a07833d947ca45f3 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Thu, 3 May 2018 10:36:11 -0700
Subject: clang-format

---
 src/compiler/objective_c_generator.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 2294615a28..e97494f64c 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -222,7 +222,8 @@ void PrintMethodImplementations(Printer* printer,
   map< ::grpc::string, ::grpc::string> vars = {
       {"service_class", ServiceClassName(service)}};
 
-  printer.Print(vars, "@protocol $service_class$ <NSObject, GRPCProtoServiceInit>\n\n");
+  printer.Print(
+      vars, "@protocol $service_class$ <NSObject, GRPCProtoServiceInit>\n\n");
   for (int i = 0; i < service->method_count(); i++) {
     PrintMethodDeclarations(&printer, service->method(i));
   }
-- 
cgit v1.2.3