Rename HTTP2Path -> HTTPPath

pull/2301/head
Jorge Canizales 10 years ago
parent be808e36f6
commit 5260f53cda
  1. 2
      src/objective-c/ProtoRPC/ProtoMethod.h
  2. 2
      src/objective-c/ProtoRPC/ProtoMethod.m
  3. 2
      src/objective-c/ProtoRPC/ProtoRPC.m
  4. 8
      src/objective-c/tests/GRPCClientTests.m
  5. 4
      src/objective-c/tests/LocalClearTextTests.m

@ -40,7 +40,7 @@
@property(nonatomic, readonly) NSString *service;
@property(nonatomic, readonly) NSString *method;
@property(nonatomic, readonly) NSString *HTTP2Path;
@property(nonatomic, readonly) NSString *HTTPPath;
- (instancetype)initWithPackage:(NSString *)package
service:(NSString *)service

@ -45,7 +45,7 @@
return self;
}
- (NSString *)HTTP2Path {
- (NSString *)HTTPPath {
if (_package) {
return [NSString stringWithFormat:@"/%@.%@/%@", _package, _service, _method];
} else {

@ -71,7 +71,7 @@
// sending GPBMessages.
return [proto data];
}];
if ((self = [super initWithHost:host path:method.HTTP2Path requestsWriter:bytesWriter])) {
if ((self = [super initWithHost:host path:method.HTTPPath requestsWriter:bytesWriter])) {
// A writeable that parses the proto messages received.
_responseWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
[responsesWriteable writeValue:[responseClass parseFromData:value error:NULL]];

@ -73,7 +73,7 @@ static ProtoMethod *kUnaryCallMethod;
__weak XCTestExpectation *expectation = [self expectationWithDescription:@"Server reachable."];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kHostAddress
path:kInexistentMethod.HTTP2Path
path:kInexistentMethod.HTTPPath
requestsWriter:[GRXWriter writerWithValue:[NSData data]]];
id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
@ -95,7 +95,7 @@ static ProtoMethod *kUnaryCallMethod;
__weak XCTestExpectation *completion = [self expectationWithDescription:@"Empty RPC completed."];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kHostAddress
path:kEmptyCallMethod.HTTP2Path
path:kEmptyCallMethod.HTTPPath
requestsWriter:[GRXWriter writerWithValue:[NSData data]]];
id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
@ -123,7 +123,7 @@ static ProtoMethod *kUnaryCallMethod;
id<GRXWriter> requestsWriter = [GRXWriter writerWithValue:[request data]];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kHostAddress
path:kUnaryCallMethod.HTTP2Path
path:kUnaryCallMethod.HTTPPath
requestsWriter:requestsWriter];
id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
@ -153,7 +153,7 @@ static ProtoMethod *kUnaryCallMethod;
id<GRXWriter> requestsWriter = [GRXWriter writerWithValue:[request data]];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kHostAddress
path:kUnaryCallMethod.HTTP2Path
path:kUnaryCallMethod.HTTPPath
requestsWriter:requestsWriter];
call.requestMetadata[@"Authorization"] = @"Bearer bogusToken";

@ -94,7 +94,7 @@ static NSString * const kService = @"RouteGuide";
id<GRXWriter> requestsWriter = [GRXWriter emptyWriter];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kRouteGuideHost
path:method.HTTP2Path
path:method.HTTPPath
requestsWriter:requestsWriter];
id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
@ -125,7 +125,7 @@ static NSString * const kService = @"RouteGuide";
id<GRXWriter> requestsWriter = [GRXWriter writerWithValue:[point data]];
GRPCCall *call = [[GRPCCall alloc] initWithHost:kRouteGuideHost
path:method.HTTP2Path
path:method.HTTPPath
requestsWriter:requestsWriter];
id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {

Loading…
Cancel
Save