aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-11-06 17:46:22 -0800
committerGravatar Muxi Yan <mxyan@google.com>2018-11-06 17:46:22 -0800
commitab9510560781dd2f27608e694518f67b7d425d9a (patch)
tree232cd3ab9feff809988d548c9de79980bd1d0c79
parenta0f5db15815d3ec5b2ad3b781cca5e2eb6468824 (diff)
clang-format
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.h4
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.m13
-rw-r--r--src/objective-c/ProtoRPC/ProtoRPC.h4
-rw-r--r--src/objective-c/tests/APIv2Tests/APIv2Tests.m35
4 files changed, 29 insertions, 27 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.h b/src/objective-c/GRPCClient/GRPCCall.h
index 260305a989..bde69f01c5 100644
--- a/src/objective-c/GRPCClient/GRPCCall.h
+++ b/src/objective-c/GRPCClient/GRPCCall.h
@@ -196,7 +196,7 @@ extern NSString *const kGRPCTrailersKey;
- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
/** Initialize with all properties. */
- (instancetype)initWithHost:(NSString *)host
@@ -224,7 +224,7 @@ extern NSString *const kGRPCTrailersKey;
- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
/**
* Designated initializer for a call.
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index b3bddf08a0..321a0bd1bd 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -468,7 +468,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
- (void)cancelCall {
// Can be called from any thread, any number of times.
- @synchronized (self) {
+ @synchronized(self) {
[_wrappedCall cancel];
}
}
@@ -732,18 +732,19 @@ const char *kCFStreamVarName = "grpc_cfstream";
_responseWriteable =
[[GRXConcurrentWriteable alloc] initWithWriteable:writeable dispatchQueue:_responseQueue];
- GRPCWrappedCall *wrappedCall = [[GRPCWrappedCall alloc] initWithHost:_host path:_path callOptions:_callOptions];
+ GRPCWrappedCall *wrappedCall =
+ [[GRPCWrappedCall alloc] initWithHost:_host path:_path callOptions:_callOptions];
if (wrappedCall == nil) {
[self maybeFinishWithError:[NSError errorWithDomain:kGRPCErrorDomain
code:GRPCErrorCodeUnavailable
userInfo:@{
- NSLocalizedDescriptionKey :
- @"Failed to create call or channel."
- }]];
+ NSLocalizedDescriptionKey :
+ @"Failed to create call or channel."
+ }]];
return;
}
- @synchronized (self) {
+ @synchronized(self) {
_wrappedCall = wrappedCall;
}
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.h b/src/objective-c/ProtoRPC/ProtoRPC.h
index 3d137a53ff..b0f4ced99e 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.h
+++ b/src/objective-c/ProtoRPC/ProtoRPC.h
@@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
/**
* Users should not use this initializer directly. Call objects will be created, initialized, and
@@ -92,7 +92,7 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
/**
* Users should not use this initializer directly. Call objects will be created, initialized, and
diff --git a/src/objective-c/tests/APIv2Tests/APIv2Tests.m b/src/objective-c/tests/APIv2Tests/APIv2Tests.m
index 7fc353391f..d681163419 100644
--- a/src/objective-c/tests/APIv2Tests/APIv2Tests.m
+++ b/src/objective-c/tests/APIv2Tests/APIv2Tests.m
@@ -449,28 +449,29 @@ static const NSTimeInterval kTestTimeout = 16;
request.responseSize = kSimpleDataLength;
request.payload.body = [NSMutableData dataWithLength:kSimpleDataLength];
GRPCRequestOptions *requestOptions =
- [[GRPCRequestOptions alloc] initWithHost:kHostAddress
- path:kUnaryCallMethod.HTTPPath
- safety:GRPCCallSafetyDefault];
+ [[GRPCRequestOptions alloc] initWithHost:kHostAddress
+ path:kUnaryCallMethod.HTTPPath
+ safety:GRPCCallSafetyDefault];
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
options.transportType = GRPCTransportTypeInsecure;
options.compressionAlgorithm = GRPCCompressGzip;
GRPCCall2 *call = [[GRPCCall2 alloc]
- initWithRequestOptions:requestOptions
- responseHandler: [[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
- messageCallback:^(NSData *data) {
- NSError *error;
- RMTSimpleResponse *response = [RMTSimpleResponse parseFromData:data error:&error];
- XCTAssertNil(error, @"Error when parsing response: %@", error);
- XCTAssertEqual(response.payload.body.length, kSimpleDataLength);
- }
- closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
- XCTAssertNil(error, @"Received failure: %@", error);
- [completion fulfill];
- }]
-
- callOptions:options];
+ initWithRequestOptions:requestOptions
+ responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
+ messageCallback:^(NSData *data) {
+ NSError *error;
+ RMTSimpleResponse *response =
+ [RMTSimpleResponse parseFromData:data error:&error];
+ XCTAssertNil(error, @"Error when parsing response: %@", error);
+ XCTAssertEqual(response.payload.body.length, kSimpleDataLength);
+ }
+ closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
+ XCTAssertNil(error, @"Received failure: %@", error);
+ [completion fulfill];
+ }]
+
+ callOptions:options];
[call start];
[call writeData:[request data]];