diff --git a/src/objective-c/GRPCClient/ProtoMethod.h b/src/objective-c/GRPCClient/ProtoMethod.h index 814c15646410c0bd9ccbb70bc22c9b222357ab2a..86d582a03e5cff48ef7a6dd4dae60c94bbee39e7 100644 --- a/src/objective-c/GRPCClient/ProtoMethod.h +++ b/src/objective-c/GRPCClient/ProtoMethod.h @@ -38,10 +38,9 @@ // A fully-qualified gRPC method name. Full qualification is needed because a gRPC endpoint can // implement multiple interfaces. // TODO(jcanizales): Move to ProtoRPC package. -// TODO(jcanizales): Rename interface -> service. @interface ProtoMethod : NSObject @property(nonatomic, readonly) NSString *package; -@property(nonatomic, readonly) NSString *interface; +@property(nonatomic, readonly) NSString *service; @property(nonatomic, readonly) NSString *method; - (instancetype)initWithPackage:(NSString *)package interface:(NSString *)interface diff --git a/src/objective-c/GRPCClient/ProtoMethod.m b/src/objective-c/GRPCClient/ProtoMethod.m index 1f5f836b7d06b49b843faeee467fbe792a233908..4c78b4f61c7c1fa6c402003bb7b180b9daaab5c4 100644 --- a/src/objective-c/GRPCClient/ProtoMethod.m +++ b/src/objective-c/GRPCClient/ProtoMethod.m @@ -39,7 +39,7 @@ method:(NSString *)method { if ((self = [super init])) { _package = [package copy]; - _interface = [interface copy]; + _service = [interface copy]; _method = [method copy]; } return self; diff --git a/src/objective-c/GRPCClient/private/GRPCMethodName+HTTP2Encoding.m b/src/objective-c/GRPCClient/private/GRPCMethodName+HTTP2Encoding.m index f31d33408b041f94ff44f4e5e4fea92e7df83fff..cb4efc82cfdab78baa1f99c2400bc7396ab3755f 100644 --- a/src/objective-c/GRPCClient/private/GRPCMethodName+HTTP2Encoding.m +++ b/src/objective-c/GRPCClient/private/GRPCMethodName+HTTP2Encoding.m @@ -36,9 +36,9 @@ @implementation ProtoMethod (HTTP2Encoding) - (NSString *)HTTP2Path { if (self.package) { - return [NSString stringWithFormat:@"/%@.%@/%@", self.package, self.interface, self.method]; + return [NSString stringWithFormat:@"/%@.%@/%@", self.package, self.service, self.method]; } else { - return [NSString stringWithFormat:@"/%@/%@", self.interface, self.method]; + return [NSString stringWithFormat:@"/%@/%@", self.service, self.method]; } } @end