aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-10-18 17:04:03 -0700
committerGravatar Muxi Yan <mxyan@google.com>2018-10-18 17:04:03 -0700
commit4264ea2b55f46c1904fc179fb0db7b733b8c3e4b (patch)
treef0894f19b96ae1d8b3c120646b7df47c016b22b7 /src
parent6ae2ea643d89f7b2e7839f9016a61361ce92b5d5 (diff)
clang-format
Diffstat (limited to 'src')
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.h10
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.m34
-rw-r--r--src/objective-c/GRPCClient/GRPCCallOptions.m26
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannel.m36
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannelPool.m35
-rw-r--r--src/objective-c/ProtoRPC/ProtoRPC.h6
-rw-r--r--src/objective-c/ProtoRPC/ProtoRPC.m10
-rw-r--r--src/objective-c/ProtoRPC/ProtoService.h13
-rw-r--r--src/objective-c/tests/ChannelTests/ChannelPoolTest.m35
-rw-r--r--src/objective-c/tests/GRPCClientTests.m101
-rw-r--r--src/objective-c/tests/InteropTests.m2
11 files changed, 161 insertions, 147 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.h b/src/objective-c/GRPCClient/GRPCCall.h
index 6adecec144..bd43a0a384 100644
--- a/src/objective-c/GRPCClient/GRPCCall.h
+++ b/src/objective-c/GRPCClient/GRPCCall.h
@@ -149,7 +149,7 @@ extern id const kGRPCHeadersKey;
extern id const kGRPCTrailersKey;
/** An object can implement this protocol to receive responses from server from a call. */
-@protocol GRPCResponseHandler <NSObject>
+@protocol GRPCResponseHandler<NSObject>
@optional
@@ -188,10 +188,12 @@ extern id const kGRPCTrailersKey;
- (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
/** Initialize with all properties. */
-- (instancetype)initWithHost:(NSString *)host path:(NSString *)path safety:(GRPCCallSafety)safety NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithHost:(NSString *)host
+ path:(NSString *)path
+ safety:(GRPCCallSafety)safety NS_DESIGNATED_INITIALIZER;
/** The host serving the RPC service. */
@property(copy, readonly) NSString *host;
@@ -214,7 +216,7 @@ extern id 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 399206a346..bd4b4e10f0 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -28,8 +28,8 @@
#include <grpc/support/time.h>
#import "GRPCCallOptions.h"
-#import "private/GRPCHost.h"
#import "private/GRPCConnectivityMonitor.h"
+#import "private/GRPCHost.h"
#import "private/GRPCRequestHeaders.h"
#import "private/GRPCWrappedCall.h"
#import "private/NSData+GRPC.h"
@@ -115,7 +115,9 @@ const char *kCFStreamVarName = "grpc_cfstream";
_initialMetadataPublished = NO;
_pipe = [GRXBufferedPipe pipe];
if (@available(iOS 8.0, *)) {
- _dispatchQueue = dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
+ _dispatchQueue = dispatch_queue_create(
+ NULL,
+ dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
} else {
// Fallback on earlier versions
_dispatchQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
@@ -129,7 +131,8 @@ const char *kCFStreamVarName = "grpc_cfstream";
- (instancetype)initWithRequestOptions:(GRPCRequestOptions *)requestOptions
responseHandler:(id<GRPCResponseHandler>)responseHandler {
- return [self initWithRequestOptions:requestOptions responseHandler:responseHandler callOptions:nil];
+ return
+ [self initWithRequestOptions:requestOptions responseHandler:responseHandler callOptions:nil];
}
- (void)start {
@@ -210,9 +213,9 @@ const char *kCFStreamVarName = "grpc_cfstream";
error:[NSError errorWithDomain:kGRPCErrorDomain
code:GRPCErrorCodeCancelled
userInfo:@{
- NSLocalizedDescriptionKey :
- @"Canceled by app"
- }]];
+ NSLocalizedDescriptionKey :
+ @"Canceled by app"
+ }]];
}
});
@@ -255,13 +258,12 @@ const char *kCFStreamVarName = "grpc_cfstream";
}
}
-- (void)issueClosedWithTrailingMetadata:(NSDictionary *)trailingMetadata
- error:(NSError *)error {
+- (void)issueClosedWithTrailingMetadata:(NSDictionary *)trailingMetadata error:(NSError *)error {
id<GRPCResponseHandler> handler = _handler;
NSDictionary *trailers = _call.responseTrailers;
if ([handler respondsToSelector:@selector(closedWithTrailingMetadata:error:)]) {
dispatch_async(handler.dispatchQueue, ^{
- [handler closedWithTrailingMetadata:trailers error:error];
+ [handler closedWithTrailingMetadata:trailers error:error];
});
}
}
@@ -388,7 +390,8 @@ const char *kCFStreamVarName = "grpc_cfstream";
requestsWriter:(GRXWriter *)requestWriter
callOptions:(GRPCCallOptions *)callOptions {
if (host.length == 0 || path.length == 0) {
- [NSException raise:NSInvalidArgumentException format:@"Neither host nor path can be nil or empty."];
+ [NSException raise:NSInvalidArgumentException
+ format:@"Neither host nor path can be nil or empty."];
}
if (safety > GRPCCallSafetyCacheableRequest) {
[NSException raise:NSInvalidArgumentException format:@"Invalid call safety value."];
@@ -457,7 +460,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
}
- (void)cancel {
- @synchronized (self) {
+ @synchronized(self) {
if (!self.isWaitingForToken) {
[self cancelCall];
} else {
@@ -720,8 +723,9 @@ const char *kCFStreamVarName = "grpc_cfstream";
[self maybeFinishWithError:[NSError errorWithDomain:kGRPCErrorDomain
code:GRPCErrorCodeUnavailable
userInfo:@{
- NSLocalizedDescriptionKey : @"Failed to create call or channel."
- }]];
+ NSLocalizedDescriptionKey :
+ @"Failed to create call or channel."
+ }]];
return;
}
@@ -773,11 +777,11 @@ const char *kCFStreamVarName = "grpc_cfstream";
_callOptions = callOptions;
}
if (_callOptions.authTokenProvider != nil) {
- @synchronized (self) {
+ @synchronized(self) {
self.isWaitingForToken = YES;
}
[self.tokenProvider getTokenWithHandler:^(NSString *token) {
- @synchronized (self) {
+ @synchronized(self) {
if (self.isWaitingForToken) {
if (token) {
self->_fetchedOauth2AccessToken = [token copy];
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m
index 8d2b84b748..37ed3ebd1d 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.m
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.m
@@ -110,7 +110,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:kDefaultConnectInitialBackoff
connectMaxBackoff:kDefaultConnectMaxBackoff
additionalChannelArgs:kDefaultAdditionalChannelArgs
- PEMRootCertificates:kDefaultPEMRootCertificates
+ PEMRootCertificates:kDefaultPEMRootCertificates
PEMPrivateKey:kDefaultPEMPrivateKey
PEMCertChain:kDefaultPEMCertChain
transportType:kDefaultTransportType
@@ -135,7 +135,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:(NSTimeInterval)connectInitialBackoff
connectMaxBackoff:(NSTimeInterval)connectMaxBackoff
additionalChannelArgs:(NSDictionary *)additionalChannelArgs
- PEMRootCertificates:(NSString *)PEMRootCertificates
+ PEMRootCertificates:(NSString *)PEMRootCertificates
PEMPrivateKey:(NSString *)PEMPrivateKey
PEMCertChain:(NSString *)PEMCertChain
transportType:(GRPCTransportType)transportType
@@ -158,7 +158,8 @@ static NSUInteger kDefaultChannelID = 0;
_connectMinTimeout = connectMinTimeout;
_connectInitialBackoff = connectInitialBackoff;
_connectMaxBackoff = connectMaxBackoff;
- _additionalChannelArgs = [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
+ _additionalChannelArgs =
+ [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
_PEMRootCertificates = [PEMRootCertificates copy];
_PEMPrivateKey = [PEMPrivateKey copy];
_PEMCertChain = [PEMCertChain copy];
@@ -188,7 +189,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:_additionalChannelArgs
- PEMRootCertificates:_PEMRootCertificates
+ PEMRootCertificates:_PEMRootCertificates
PEMPrivateKey:_PEMPrivateKey
PEMCertChain:_PEMCertChain
transportType:_transportType
@@ -216,7 +217,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy]
- PEMRootCertificates:_PEMRootCertificates
+ PEMRootCertificates:_PEMRootCertificates
PEMPrivateKey:_PEMPrivateKey
PEMCertChain:_PEMCertChain
transportType:_transportType
@@ -240,8 +241,7 @@ static NSUInteger kDefaultChannelID = 0;
if (!(callOptions.connectInitialBackoff == _connectInitialBackoff)) return NO;
if (!(callOptions.connectMaxBackoff == _connectMaxBackoff)) return NO;
if (!(callOptions.additionalChannelArgs == _additionalChannelArgs ||
- [callOptions.additionalChannelArgs
- isEqualToDictionary:_additionalChannelArgs]))
+ [callOptions.additionalChannelArgs isEqualToDictionary:_additionalChannelArgs]))
return NO;
if (!(callOptions.PEMRootCertificates == _PEMRootCertificates ||
[callOptions.PEMRootCertificates isEqualToString:_PEMRootCertificates]))
@@ -256,8 +256,7 @@ static NSUInteger kDefaultChannelID = 0;
[callOptions.hostNameOverride isEqualToString:_hostNameOverride]))
return NO;
if (!(callOptions.transportType == _transportType)) return NO;
- if (!(callOptions.logContext == _logContext ||
- [callOptions.logContext isEqual:_logContext]))
+ if (!(callOptions.logContext == _logContext || [callOptions.logContext isEqual:_logContext]))
return NO;
if (!(callOptions.channelPoolDomain == _channelPoolDomain ||
[callOptions.channelPoolDomain isEqualToString:_channelPoolDomain]))
@@ -335,7 +334,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:kDefaultConnectInitialBackoff
connectMaxBackoff:kDefaultConnectMaxBackoff
additionalChannelArgs:kDefaultAdditionalChannelArgs
- PEMRootCertificates:kDefaultPEMRootCertificates
+ PEMRootCertificates:kDefaultPEMRootCertificates
PEMPrivateKey:kDefaultPEMPrivateKey
PEMCertChain:kDefaultPEMCertChain
transportType:kDefaultTransportType
@@ -362,7 +361,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy]
- PEMRootCertificates:_PEMRootCertificates
+ PEMRootCertificates:_PEMRootCertificates
PEMPrivateKey:_PEMPrivateKey
PEMCertChain:_PEMCertChain
transportType:_transportType
@@ -390,7 +389,7 @@ static NSUInteger kDefaultChannelID = 0;
connectInitialBackoff:_connectInitialBackoff
connectMaxBackoff:_connectMaxBackoff
additionalChannelArgs:[_additionalChannelArgs copy]
- PEMRootCertificates:_PEMRootCertificates
+ PEMRootCertificates:_PEMRootCertificates
PEMPrivateKey:_PEMPrivateKey
PEMCertChain:_PEMCertChain
transportType:_transportType
@@ -482,7 +481,8 @@ static NSUInteger kDefaultChannelID = 0;
}
- (void)setAdditionalChannelArgs:(NSDictionary *)additionalChannelArgs {
- _additionalChannelArgs = [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
+ _additionalChannelArgs =
+ [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
}
- (void)setPEMRootCertificates:(NSString *)PEMRootCertificates {
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index 2420988f42..63bc267a76 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -75,8 +75,12 @@ NSTimeInterval kChannelDestroyDelay = 30;
_refCount = 1;
_disconnected = NO;
if (@available(iOS 8.0, *)) {
- _dispatchQueue = dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
- _timerQueue = dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_DEFAULT, -1));
+ _dispatchQueue = dispatch_queue_create(
+ NULL,
+ dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
+ _timerQueue =
+ dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(
+ DISPATCH_QUEUE_CONCURRENT, QOS_CLASS_DEFAULT, -1));
} else {
_dispatchQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
_timerQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_CONCURRENT);
@@ -101,7 +105,8 @@ NSTimeInterval kChannelDestroyDelay = 30;
self->_refCount--;
if (self->_refCount == 0) {
self->_lastDispatch = [NSDate date];
- dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (int64_t)kChannelDestroyDelay * 1e9);
+ dispatch_time_t delay =
+ dispatch_time(DISPATCH_TIME_NOW, (int64_t)kChannelDestroyDelay * 1e9);
dispatch_after(delay, self->_timerQueue, ^{
[self timerFire];
});
@@ -123,7 +128,8 @@ NSTimeInterval kChannelDestroyDelay = 30;
- (void)timerFire {
dispatch_async(_dispatchQueue, ^{
- if (self->_disconnected || self->_lastDispatch == nil || -[self->_lastDispatch timeIntervalSinceNow] < -kChannelDestroyDelay) {
+ if (self->_disconnected || self->_lastDispatch == nil ||
+ -[self->_lastDispatch timeIntervalSinceNow] < -kChannelDestroyDelay) {
return;
}
self->_lastDispatch = nil;
@@ -158,11 +164,12 @@ NSTimeInterval kChannelDestroyDelay = 30;
}
grpc_slice path_slice = grpc_slice_from_copied_string(path.UTF8String);
gpr_timespec deadline_ms =
- timeout == 0 ? gpr_inf_future(GPR_CLOCK_REALTIME)
- : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
- gpr_time_from_millis((int64_t)(timeout * 1000), GPR_TIMESPAN));
- call = grpc_channel_create_call(
- self->_unmanagedChannel, NULL, GRPC_PROPAGATE_DEFAULTS, queue.unmanagedQueue, path_slice,
+ timeout == 0
+ ? gpr_inf_future(GPR_CLOCK_REALTIME)
+ : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
+ gpr_time_from_millis((int64_t)(timeout * 1000), GPR_TIMESPAN));
+ call = grpc_channel_create_call(self->_unmanagedChannel, NULL, GRPC_PROPAGATE_DEFAULTS,
+ queue.unmanagedQueue, path_slice,
serverAuthority ? &host_slice : NULL, deadline_ms, NULL);
if (serverAuthority) {
grpc_slice_unref(host_slice);
@@ -214,11 +221,14 @@ NSTimeInterval kChannelDestroyDelay = 30;
if ((self = [super init])) {
_unmanagedChannel = unmanagedChannel;
_configuration = configuration;
- _channelRef = [[GRPCChannelRef alloc] initWithDestroyDelay:kChannelDestroyDelay destroyChannelCallback:^{
- [self destroyChannel];
- }];
+ _channelRef = [[GRPCChannelRef alloc] initWithDestroyDelay:kChannelDestroyDelay
+ destroyChannelCallback:^{
+ [self destroyChannel];
+ }];
if (@available(iOS 8.0, *)) {
- _dispatchQueue = dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
+ _dispatchQueue = dispatch_queue_create(
+ NULL,
+ dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
} else {
_dispatchQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
}
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
index 5d53cb2e99..6659d193c6 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
@@ -52,10 +52,11 @@ extern const char *kCFStreamVarName;
#ifdef GRPC_COMPILE_WITH_CRONET
if (![GRPCCall isUsingCronet]) {
#endif
- factory = [GRPCSecureChannelFactory factoryWithPEMRootCertificates:_callOptions.PEMRootCertificates
- privateKey:_callOptions.PEMPrivateKey
- certChain:_callOptions.PEMCertChain
- error:&error];
+ factory = [GRPCSecureChannelFactory
+ factoryWithPEMRootCertificates:_callOptions.PEMRootCertificates
+ privateKey:_callOptions.PEMPrivateKey
+ certChain:_callOptions.PEMCertChain
+ error:&error];
if (factory == nil) {
NSLog(@"Error creating secure channel factory: %@", error);
}
@@ -136,7 +137,8 @@ extern const char *kCFStreamVarName;
}
- (nonnull id)copyWithZone:(nullable NSZone *)zone {
- GRPCChannelConfiguration *newConfig = [[GRPCChannelConfiguration alloc] initWithHost:_host callOptions:_callOptions];
+ GRPCChannelConfiguration *newConfig =
+ [[GRPCChannelConfiguration alloc] initWithHost:_host callOptions:_callOptions];
return newConfig;
}
@@ -145,7 +147,8 @@ extern const char *kCFStreamVarName;
NSAssert([object isKindOfClass:[GRPCChannelConfiguration class]], @"Illegal :isEqual");
GRPCChannelConfiguration *obj = (GRPCChannelConfiguration *)object;
if (!(obj.host == _host || [obj.host isEqualToString:_host])) return NO;
- if (!(obj.callOptions == _callOptions || [obj.callOptions isChannelOptionsEqualTo:_callOptions])) return NO;
+ if (!(obj.callOptions == _callOptions || [obj.callOptions isChannelOptionsEqualTo:_callOptions]))
+ return NO;
return YES;
}
@@ -201,11 +204,13 @@ extern const char *kCFStreamVarName;
- (void)removeChannel:(GRPCChannel *)channel {
@synchronized(self) {
- [_channelPool enumerateKeysAndObjectsUsingBlock:^(GRPCChannelConfiguration * _Nonnull key, GRPCChannel * _Nonnull obj, BOOL * _Nonnull stop) {
- if (obj == channel) {
- [self->_channelPool removeObjectForKey:key];
- }
- }];
+ [_channelPool
+ enumerateKeysAndObjectsUsingBlock:^(GRPCChannelConfiguration *_Nonnull key,
+ GRPCChannel *_Nonnull obj, BOOL *_Nonnull stop) {
+ if (obj == channel) {
+ [self->_channelPool removeObjectForKey:key];
+ }
+ }];
}
}
@@ -217,9 +222,11 @@ extern const char *kCFStreamVarName;
- (void)removeAndCloseAllChannels {
@synchronized(self) {
- [_channelPool enumerateKeysAndObjectsUsingBlock:^(GRPCChannelConfiguration * _Nonnull key, GRPCChannel * _Nonnull obj, BOOL * _Nonnull stop) {
- [obj disconnect];
- }];
+ [_channelPool
+ enumerateKeysAndObjectsUsingBlock:^(GRPCChannelConfiguration *_Nonnull key,
+ GRPCChannel *_Nonnull obj, BOOL *_Nonnull stop) {
+ [obj disconnect];
+ }];
_channelPool = [NSMutableDictionary dictionary];
}
}
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.h b/src/objective-c/ProtoRPC/ProtoRPC.h
index db1e8c6deb..f2ba513495 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.h
+++ b/src/objective-c/ProtoRPC/ProtoRPC.h
@@ -24,7 +24,7 @@
@class GPBMessage;
/** An object can implement this protocol to receive responses from server from a call. */
-@protocol GRPCProtoResponseHandler <NSObject>
+@protocol GRPCProtoResponseHandler<NSObject>
@optional
@@ -59,7 +59,7 @@
- (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
@@ -81,7 +81,7 @@
- (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/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index d3005e30a5..238faa3343 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -88,7 +88,9 @@
_callOptions = [callOptions copy];
_responseClass = responseClass;
if (@available(iOS 8.0, *)) {
- _dispatchQueue = dispatch_queue_create(NULL, dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
+ _dispatchQueue = dispatch_queue_create(
+ NULL,
+ dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
} else {
_dispatchQueue = dispatch_queue_create(nil, DISPATCH_QUEUE_SERIAL);
}
@@ -120,9 +122,9 @@
error:[NSError errorWithDomain:kGRPCErrorDomain
code:GRPCErrorCodeCancelled
userInfo:@{
- NSLocalizedDescriptionKey :
- @"Canceled by app"
- }]];
+ NSLocalizedDescriptionKey :
+ @"Canceled by app"
+ }]];
});
}
_handler = nil;
diff --git a/src/objective-c/ProtoRPC/ProtoService.h b/src/objective-c/ProtoRPC/ProtoService.h
index 2985c5cb2d..3a16ab2402 100644
--- a/src/objective-c/ProtoRPC/ProtoService.h
+++ b/src/objective-c/ProtoRPC/ProtoService.h
@@ -30,14 +30,15 @@
__attribute__((deprecated("Please use GRPCProtoService."))) @interface ProtoService
: NSObject
-- (instancetype)init NS_UNAVAILABLE;
+ -
+ (instancetype)init NS_UNAVAILABLE;
-+ (instancetype)new NS_UNAVAILABLE;
++ (instancetype) new NS_UNAVAILABLE;
- -
- (instancetype)initWithHost : (NSString *)host packageName
- : (NSString *)packageName serviceName : (NSString *)serviceName callOptions
- : (GRPCCallOptions *)callOptions NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithHost:(NSString *)host
+ packageName:(NSString *)packageName
+ serviceName:(NSString *)serviceName
+ callOptions:(GRPCCallOptions *)callOptions NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithHost:(NSString *)host
packageName:(NSString *)packageName
diff --git a/src/objective-c/tests/ChannelTests/ChannelPoolTest.m b/src/objective-c/tests/ChannelTests/ChannelPoolTest.m
index db64ac6339..f4a9fb4a2c 100644
--- a/src/objective-c/tests/ChannelTests/ChannelPoolTest.m
+++ b/src/objective-c/tests/ChannelTests/ChannelPoolTest.m
@@ -57,11 +57,9 @@ NSString *kDummyHost = @"dummy.host";
GRPCChannelConfiguration *config1 =
[[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options1];
GRPCChannelPool *pool = [[GRPCChannelPool alloc] init];
- GRPCChannel *channel1 =
- [pool channelWithConfiguration:config1];
+ GRPCChannel *channel1 = [pool channelWithConfiguration:config1];
[pool removeChannel:channel1];
- GRPCChannel *channel2 =
- [pool channelWithConfiguration:config1];
+ GRPCChannel *channel2 = [pool channelWithConfiguration:config1];
XCTAssertNotEqual(channel1, channel2);
}
@@ -74,18 +72,14 @@ extern NSTimeInterval kChannelDestroyDelay;
options1.transportType = GRPCTransportTypeInsecure;
GRPCChannelConfiguration *config1 =
[[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options1];
- GRPCChannelPool *pool =
- [[GRPCChannelPool alloc] init];
- GRPCChannel *channel1 =
- [pool channelWithConfiguration:config1];
+ GRPCChannelPool *pool = [[GRPCChannelPool alloc] init];
+ GRPCChannel *channel1 = [pool channelWithConfiguration:config1];
[channel1 unmanagedCallUnref];
sleep(1);
- GRPCChannel *channel2 =
- [pool channelWithConfiguration:config1];
+ GRPCChannel *channel2 = [pool channelWithConfiguration:config1];
XCTAssertEqual(channel1, channel2);
sleep((int)kChannelDestroyDelay + 2);
- GRPCChannel *channel3 =
- [pool channelWithConfiguration:config1];
+ GRPCChannel *channel3 = [pool channelWithConfiguration:config1];
XCTAssertEqual(channel1, channel3);
kChannelDestroyDelay = kOriginalInterval;
}
@@ -96,12 +90,11 @@ extern NSTimeInterval kChannelDestroyDelay;
options1.transportType = GRPCTransportTypeInsecure;
GRPCCallOptions *options2 = [options1 copy];
GRPCChannelConfiguration *config1 =
- [[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options1];
+ [[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options1];
GRPCChannelConfiguration *config2 =
- [[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options2];
+ [[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options2];
GRPCChannelPool *pool = [[GRPCChannelPool alloc] init];
-
GRPCChannel *channel1 = [pool channelWithConfiguration:config1];
[pool removeAndCloseAllChannels];
GRPCChannel *channel2 = [pool channelWithConfiguration:config2];
@@ -119,17 +112,13 @@ extern NSTimeInterval kChannelDestroyDelay;
[[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options2];
GRPCChannelPool *pool = [[GRPCChannelPool alloc] init];
- GRPCChannel *channel1 =
- [pool channelWithConfiguration:config1];
- GRPCChannel *channel2 =
- [pool channelWithConfiguration:config2];
+ GRPCChannel *channel1 = [pool channelWithConfiguration:config1];
+ GRPCChannel *channel2 = [pool channelWithConfiguration:config2];
XCTAssertNotEqual(channel1, channel2);
[pool removeAndCloseAllChannels];
- GRPCChannel *channel3 =
- [pool channelWithConfiguration:config1];
- GRPCChannel *channel4 =
- [pool channelWithConfiguration:config2];
+ GRPCChannel *channel3 = [pool channelWithConfiguration:config1];
+ GRPCChannel *channel4 = [pool channelWithConfiguration:config2];
XCTAssertNotEqual(channel1, channel3);
XCTAssertNotEqual(channel2, channel4);
}
diff --git a/src/objective-c/tests/GRPCClientTests.m b/src/objective-c/tests/GRPCClientTests.m
index f961b6a86f..387fcab7e9 100644
--- a/src/objective-c/tests/GRPCClientTests.m
+++ b/src/objective-c/tests/GRPCClientTests.m
@@ -446,42 +446,40 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
options.initialMetadata = headers;
GRPCCall2 *call = [[GRPCCall2 alloc]
initWithRequestOptions:request
- responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:^(
+ responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:^(
NSDictionary *initialMetadata) {
- NSString *userAgent = initialMetadata[@"x-grpc-test-echo-useragent"];
- // Test the regex is correct
- NSString *expectedUserAgent = @"Foo grpc-objc/";
- expectedUserAgent =
- [expectedUserAgent stringByAppendingString:GRPC_OBJC_VERSION_STRING];
- expectedUserAgent = [expectedUserAgent stringByAppendingString:@" grpc-c/"];
- expectedUserAgent =
- [expectedUserAgent stringByAppendingString:GRPC_C_VERSION_STRING];
- expectedUserAgent =
- [expectedUserAgent stringByAppendingString:@" (ios; chttp2; "];
- expectedUserAgent = [expectedUserAgent
- stringByAppendingString:[NSString
- stringWithUTF8String:grpc_g_stands_for()]];
- expectedUserAgent = [expectedUserAgent stringByAppendingString:@")"];
- XCTAssertEqualObjects(userAgent, expectedUserAgent);
-
- NSError *error = nil;
- // Change in format of user-agent field in a direction that does not match
- // the regex will likely cause problem for certain gRPC users. For details,
- // refer to internal doc https://goo.gl/c2diBc
- NSRegularExpression *regex = [NSRegularExpression
- regularExpressionWithPattern:
- @" grpc-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)?/[^ ,]+( \\([^)]*\\))?"
- options:0
- error:&error];
-
- NSString *customUserAgent = [regex
- stringByReplacingMatchesInString:userAgent
- options:0
- range:NSMakeRange(0, [userAgent length])
- withTemplate:@""];
- XCTAssertEqualObjects(customUserAgent, @"Foo");
- [recvInitialMd fulfill];
- }
+ NSString *userAgent = initialMetadata[@"x-grpc-test-echo-useragent"];
+ // Test the regex is correct
+ NSString *expectedUserAgent = @"Foo grpc-objc/";
+ expectedUserAgent =
+ [expectedUserAgent stringByAppendingString:GRPC_OBJC_VERSION_STRING];
+ expectedUserAgent = [expectedUserAgent stringByAppendingString:@" grpc-c/"];
+ expectedUserAgent =
+ [expectedUserAgent stringByAppendingString:GRPC_C_VERSION_STRING];
+ expectedUserAgent = [expectedUserAgent stringByAppendingString:@" (ios; chttp2; "];
+ expectedUserAgent = [expectedUserAgent
+ stringByAppendingString:[NSString stringWithUTF8String:grpc_g_stands_for()]];
+ expectedUserAgent = [expectedUserAgent stringByAppendingString:@")"];
+ XCTAssertEqualObjects(userAgent, expectedUserAgent);
+
+ NSError *error = nil;
+ // Change in format of user-agent field in a direction that does not match
+ // the regex will likely cause problem for certain gRPC users. For details,
+ // refer to internal doc https://goo.gl/c2diBc
+ NSRegularExpression *regex = [NSRegularExpression
+ regularExpressionWithPattern:
+ @" grpc-[a-zA-Z0-9]+(-[a-zA-Z0-9]+)?/[^ ,]+( \\([^)]*\\))?"
+ options:0
+ error:&error];
+
+ NSString *customUserAgent =
+ [regex stringByReplacingMatchesInString:userAgent
+ options:0
+ range:NSMakeRange(0, [userAgent length])
+ withTemplate:@""];
+ XCTAssertEqualObjects(customUserAgent, @"Foo");
+ [recvInitialMd fulfill];
+ }
messageCallback:^(id message) {
XCTAssertNotNil(message);
XCTAssertEqual([message length], 0,
@@ -609,7 +607,7 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
options.transportType = GRPCTransportTypeInsecure;
GRPCCall2 *call = [[GRPCCall2 alloc]
initWithRequestOptions:requestOptions
- responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
+ responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
messageCallback:^(id message) {
NSData *data = (NSData *)message;
XCTAssertNotNil(data, @"nil value received as response.");
@@ -739,19 +737,18 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
GRPCCall2 *call = [[GRPCCall2 alloc]
initWithRequestOptions:requestOptions
- responseHandler:
- [[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
- messageCallback:^(id data) {
- XCTFail(
- @"Failure: response received; Expect: no response received.");
- }
- closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
- XCTAssertNotNil(error,
- @"Failure: no error received; Expect: receive "
- @"deadline exceeded.");
- XCTAssertEqual(error.code, GRPCErrorCodeDeadlineExceeded);
- [completion fulfill];
- }]
+ responseHandler:
+ [[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
+ messageCallback:^(id data) {
+ XCTFail(@"Failure: response received; Expect: no response received.");
+ }
+ closeCallback:^(NSDictionary *trailingMetadata, NSError *error) {
+ XCTAssertNotNil(error,
+ @"Failure: no error received; Expect: receive "
+ @"deadline exceeded.");
+ XCTAssertEqual(error.code, GRPCErrorCodeDeadlineExceeded);
+ [completion fulfill];
+ }]
callOptions:options];
[call start];
@@ -837,7 +834,9 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
__weak XCTestExpectation *completion = [self expectationWithDescription:@"Timeout in a second."];
NSString *const kDummyAddress = [NSString stringWithFormat:@"127.0.0.1:10000"];
GRPCRequestOptions *requestOptions =
- [[GRPCRequestOptions alloc] initWithHost:kDummyAddress path:@"/dummy/path" safety:GRPCCallSafetyDefault];
+ [[GRPCRequestOptions alloc] initWithHost:kDummyAddress
+ path:@"/dummy/path"
+ safety:GRPCCallSafetyDefault];
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
options.connectMinTimeout = timeout;
options.connectInitialBackoff = backoff;
@@ -846,7 +845,7 @@ static GRPCProtoMethod *kFullDuplexCallMethod;
NSDate *startTime = [NSDate date];
GRPCCall2 *call = [[GRPCCall2 alloc]
initWithRequestOptions:requestOptions
- responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
+ responseHandler:[[ClientTestsBlockCallbacks alloc] initWithInitialMetadataCallback:nil
messageCallback:^(id data) {
XCTFail(@"Received message. Should not reach here.");
}
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m
index ca49b5fc39..1188a75df7 100644
--- a/src/objective-c/tests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests.m
@@ -483,7 +483,7 @@ BOOL isRemoteInteropTest(NSString *host) {
id request = [RMTStreamingOutputCallRequest messageWithPayloadSize:requests[index]
requestedResponseSize:responses[index]];
GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init];
- options.transportType = [[self class] transportType ];
+ options.transportType = [[self class] transportType];
options.PEMRootCertificates = [[self class] PEMRootCertificates];
options.hostNameOverride = [[self class] hostNameOverride];