From ca38ddb105f936cf5309c00cc9895a6dea1bf118 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 29 Apr 2015 13:16:42 -0700 Subject: [PATCH] Fixed ivar names and comments --- src/objective-c/GRPCClient/GRPCCall.m | 6 ++- .../GRPCClient/private/GRPCWrappedCall.m | 42 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m index 15369a67190..0f458b40cde 100644 --- a/src/objective-c/GRPCClient/GRPCCall.m +++ b/src/objective-c/GRPCClient/GRPCCall.m @@ -156,6 +156,7 @@ // Only called from the call queue. // The handler will be called from the network queue. - (void)startReadWithHandler:(void(^)(grpc_byte_buffer *))handler { + // TODO(jcanizales): Add error handlers for async failures [_wrappedCall startBatchWithOperations:@[[[GRPCOpRecvMessage alloc] initWithHandler:handler]]]; } @@ -206,6 +207,7 @@ // TODO(jcanizales): Rename to commitHeaders. - (void)sendHeaders:(NSDictionary *)metadata { + // TODO(jcanizales): Add error handlers for async failures [_wrappedCall startBatchWithOperations:@[[[GRPCOpSendMetadata alloc] initWithMetadata:metadata ?: @{} handler:nil]]]; } @@ -218,8 +220,7 @@ __weak GRPCCall *weakSelf = self; void(^resumingHandler)(void) = ^{ - // Resume the request writer (even in the case of error). - // TODO(jcanizales): No need to do it in the case of errors anymore? + // Resume the request writer. GRPCCall *strongSelf = weakSelf; if (strongSelf) { strongSelf->_requestWriter.state = GRXWriterStateStarted; @@ -277,6 +278,7 @@ // The second one (completionHandler), whenever the RPC finishes for any reason. - (void)invokeCallWithMetadataHandler:(void(^)(NSDictionary *))metadataHandler completionHandler:(void(^)(NSError *))completionHandler { + // TODO(jcanizales): Add error handlers for async failures [_wrappedCall startBatchWithOperations:@[[[GRPCOpRecvMetadata alloc] initWithHandler:metadataHandler]]]; [_wrappedCall startBatchWithOperations:@[[[GRPCOpRecvStatus alloc] diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m index 8db62264538..12788d0ada7 100644 --- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m +++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m @@ -43,7 +43,7 @@ @implementation GRPCOpSendMetadata{ void(^_handler)(void); - grpc_metadata *_send_metadata; + grpc_metadata *_sendMetadata; size_t _count; } @@ -53,7 +53,7 @@ - (instancetype)initWithMetadata:(NSDictionary *)metadata handler:(void (^)(void))handler { if (self = [super init]) { - _send_metadata = [metadata grpc_metadataArray]; + _sendMetadata = [metadata grpc_metadataArray]; _count = metadata.count; _handler = handler; } @@ -63,7 +63,7 @@ - (void)getOp:(grpc_op *)op { op->op = GRPC_OP_SEND_INITIAL_METADATA; op->data.send_initial_metadata.count = _count; - op->data.send_initial_metadata.metadata = _send_metadata; + op->data.send_initial_metadata.metadata = _sendMetadata; } - (void)finish { @@ -73,14 +73,14 @@ } - (void)dealloc { - gpr_free(_send_metadata); + gpr_free(_sendMetadata); } @end @implementation GRPCOpSendMessage{ void(^_handler)(void); - grpc_byte_buffer *_byte_buffer; + grpc_byte_buffer *_byteBuffer; } - (instancetype)init { @@ -92,7 +92,7 @@ [NSException raise:NSInvalidArgumentException format:@"message cannot be nil"]; } if (self = [super init]) { - _byte_buffer = [message grpc_byteBuffer]; + _byteBuffer = [message grpc_byteBuffer]; _handler = handler; } return self; @@ -100,7 +100,7 @@ - (void)getOp:(grpc_op *)op { op->op = GRPC_OP_SEND_MESSAGE; - op->data.send_message = _byte_buffer; + op->data.send_message = _byteBuffer; } - (void)finish { @@ -110,7 +110,7 @@ } - (void)dealloc { - gpr_free(_byte_buffer); + gpr_free(_byteBuffer); } @end @@ -144,7 +144,7 @@ @implementation GRPCOpRecvMetadata{ void(^_handler)(NSDictionary *); - grpc_metadata_array _recv_initial_metadata; + grpc_metadata_array _recvInitialMetadata; } - (instancetype) init { @@ -154,34 +154,34 @@ - (instancetype) initWithHandler:(void (^)(NSDictionary *))handler { if (self = [super init]) { _handler = handler; - grpc_metadata_array_init(&_recv_initial_metadata); + grpc_metadata_array_init(&_recvInitialMetadata); } return self; } - (void)getOp:(grpc_op *)op { op->op = GRPC_OP_RECV_INITIAL_METADATA; - op->data.recv_initial_metadata = &_recv_initial_metadata; + op->data.recv_initial_metadata = &_recvInitialMetadata; } - (void)finish { NSDictionary *metadata = [NSDictionary - grpc_dictionaryFromMetadata:_recv_initial_metadata.metadata - count:_recv_initial_metadata.count]; + grpc_dictionaryFromMetadata:_recvInitialMetadata.metadata + count:_recvInitialMetadata.count]; if (_handler) { _handler(metadata); } } - (void)dealloc { - grpc_metadata_array_destroy(&_recv_initial_metadata); + grpc_metadata_array_destroy(&_recvInitialMetadata); } @end @implementation GRPCOpRecvMessage{ void(^_handler)(grpc_byte_buffer *); - grpc_byte_buffer *_recv_message; + grpc_byte_buffer *_recvMessage; } - (instancetype)init { @@ -197,12 +197,12 @@ - (void)getOp:(grpc_op *)op { op->op = GRPC_OP_RECV_MESSAGE; - op->data.recv_message = &_recv_message; + op->data.recv_message = &_recvMessage; } - (void)finish { if (_handler) { - _handler(_recv_message); + _handler(_recvMessage); } } @@ -210,7 +210,7 @@ @implementation GRPCOpRecvStatus{ void(^_handler)(NSError *); - size_t _details_capacity; + size_t _detailsCapacity; grpc_status _status; } @@ -221,8 +221,6 @@ - (instancetype) initWithHandler:(void (^)(NSError *))handler { if (self = [super init]) { _handler = handler; - _status.details = NULL; - _details_capacity = 0; grpc_metadata_array_init(&_status.metadata); } return self; @@ -232,11 +230,11 @@ op->op = GRPC_OP_RECV_STATUS_ON_CLIENT; op->data.recv_status_on_client.status = &_status.status; op->data.recv_status_on_client.status_details = &_status.details; - op->data.recv_status_on_client.status_details_capacity = &_details_capacity; + op->data.recv_status_on_client.status_details_capacity = &_detailsCapacity; op->data.recv_status_on_client.trailing_metadata = &_status.metadata; } -- (void)opProcessor { +- (void)finish { if (_handler) { NSError *error = [NSError grpc_errorFromStatus:&_status]; _handler(error);