From 4f11ab1ffd20a3a0cf2c33a563fcd5437733c189 Mon Sep 17 00:00:00 2001
From: Makarand Dharmapurikar <makarandd@google.com>
Date: Wed, 8 Jun 2016 10:40:00 -0700
Subject: [PATCH] addressed feedback.
---
src/compiler/objective_c_generator.cc | 2 +-
src/objective-c/ProtoRPC/ProtoMethod.h | 2 +-
src/objective-c/ProtoRPC/ProtoRPC.h | 6 +++---
src/objective-c/ProtoRPC/ProtoRPC.m | 2 +-
src/objective-c/ProtoRPC/ProtoService.h | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 75665cd5c0..71a674174d 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -94,7 +94,7 @@ void PrintSimpleSignature(Printer *printer, const MethodDescriptor *method,
void PrintAdvancedSignature(Printer *printer, const MethodDescriptor *method,
map< ::grpc::string, ::grpc::string> vars) {
vars["method_name"] = "RPCTo" + vars["method_name"];
- vars["return_type"] = "GRPCProtoRPC *";
+ vars["return_type"] = "GRPCProtoCall *";
PrintMethodSignature(printer, method, vars);
}
diff --git a/src/objective-c/ProtoRPC/ProtoMethod.h b/src/objective-c/ProtoRPC/ProtoMethod.h
index bd1a848c19..f9fdbb35ff 100644
--- a/src/objective-c/ProtoRPC/ProtoMethod.h
+++ b/src/objective-c/ProtoRPC/ProtoMethod.h
@@ -51,7 +51,7 @@ __attribute__((deprecated("Please use GRPCProtoMethod.")))
@end
/**
- * This subclass is empty now. Eventually we'll remove ProtoService class
+ * This subclass is empty now. Eventually we'll remove ProtoMethod class
* to avoid potential naming conflict
*/
@interface GRPCProtoMethod : ProtoMethod
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.h b/src/objective-c/ProtoRPC/ProtoRPC.h
index 55fefb0aa8..f22d731f68 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.h
+++ b/src/objective-c/ProtoRPC/ProtoRPC.h
@@ -36,7 +36,7 @@
#import "ProtoMethod.h"
-__attribute__((deprecated("Please use GRPCProtoRPC.")))
+__attribute__((deprecated("Please use GRPCProtoCall.")))
@interface ProtoRPC : GRPCCall
- (instancetype)initWithHost:(NSString *)host
@@ -49,9 +49,9 @@ __attribute__((deprecated("Please use GRPCProtoRPC.")))
@end
/**
- * This subclass is empty now. Eventually we'll remove ProtoService class
+ * This subclass is empty now. Eventually we'll remove ProtoRPC class
* to avoid potential naming conflict
*/
-@interface GRPCProtoRPC : ProtoRPC
+@interface GRPCProtoCall : ProtoRPC
@end
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index 27c8b0eff7..fb0b566f19 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -118,6 +118,6 @@ static NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsing
}
@end
-@implementation GRPCProtoRPC
+@implementation GRPCProtoCall
@end
diff --git a/src/objective-c/ProtoRPC/ProtoService.h b/src/objective-c/ProtoRPC/ProtoService.h
index edec8a4770..87d06e1ae5 100644
--- a/src/objective-c/ProtoRPC/ProtoService.h
+++ b/src/objective-c/ProtoRPC/ProtoService.h
@@ -33,7 +33,7 @@
#import <Foundation/Foundation.h>
-@class GRPCProtoRPC;
+@class GRPCProtoCall;
@protocol GRXWriteable;
@class GRXWriter;
@@ -44,7 +44,7 @@ __attribute__((deprecated("Please use GRPCProtoService.")))
packageName:(NSString *)packageName
serviceName:(NSString *)serviceName NS_DESIGNATED_INITIALIZER;
-- (GRPCProtoRPC *)RPCToMethod:(NSString *)method
+- (GRPCProtoCall *)RPCToMethod:(NSString *)method
requestsWriter:(GRXWriter *)requestsWriter
responseClass:(Class)responseClass
responsesWriteable:(id<GRXWriteable>)responsesWriteable;
--
GitLab