From 1ac8f9a26aab6fc6cfff967073e81ec3c84a07c2 Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Fri, 3 Jul 2015 12:05:04 -0700
Subject: [PATCH] Rename interface->service
---
src/objective-c/GRPCClient/ProtoMethod.h | 3 +--
src/objective-c/GRPCClient/ProtoMethod.m | 2 +-
.../GRPCClient/private/GRPCMethodName+HTTP2Encoding.m | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/objective-c/GRPCClient/ProtoMethod.h b/src/objective-c/GRPCClient/ProtoMethod.h
index 814c156464..86d582a03e 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 1f5f836b7d..4c78b4f61c 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 f31d33408b..cb4efc82cf 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
--
GitLab