diff options
author | Jorge Canizales <jcanizales@google.com> | 2015-07-17 12:19:13 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2015-07-17 12:20:08 -0700 |
commit | 29f55d5655dc095205f8d02e01dcd0e2583c39eb (patch) | |
tree | 41e07046867b5408f0839aa7f334d38545983564 /src/objective-c/ProtoRPC | |
parent | a38baaec9c30d7a765d7afd2f83d0a109dbdbec8 (diff) |
Remove GRXWriter wrappers that are now unnecessary
With GRXWriter a subclass of all writers, we can map the requestsWriter directly
without a dumb wrapper, and return GRXImmediateWriter objects where GRXWriter is
expected.
Diffstat (limited to 'src/objective-c/ProtoRPC')
-rw-r--r-- | src/objective-c/ProtoRPC/ProtoRPC.m | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m index 067c359765..889d71a308 100644 --- a/src/objective-c/ProtoRPC/ProtoRPC.m +++ b/src/objective-c/ProtoRPC/ProtoRPC.m @@ -35,7 +35,6 @@ #import <GPBProtocolBuffers.h> #import <RxLibrary/GRXWriteable.h> -#import <RxLibrary/GRXForwardingWriter.h> #import <RxLibrary/GRXWriter+Transformations.h> @implementation ProtoRPC { @@ -65,12 +64,11 @@ format:@"A protobuf class to parse the responses must be provided."]; } // A writer that serializes the proto messages to send. - id<GRXWriter> bytesWriter = - [[[GRXForwardingWriter alloc] initWithWriter:requestsWriter] map:^id(GPBMessage *proto) { - // TODO(jcanizales): Fail with an understandable error message if the requestsWriter isn't - // sending GPBMessages. - return [proto data]; - }]; + GRXWriter *bytesWriter = [requestsWriter map:^id(GPBMessage *proto) { + // TODO(jcanizales): Fail with an understandable error message if the requestsWriter isn't + // sending GPBMessages. + return [proto data]; + }]; if ((self = [super initWithHost:host path:method.HTTPPath requestsWriter:bytesWriter])) { // A writeable that parses the proto messages received. _responseWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) { |