diff options
author | Muxi Yan <mxyan@google.com> | 2018-10-19 11:57:18 -0700 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2018-10-19 11:57:18 -0700 |
commit | 9f9141082bcd4167488780f93eeec8d40c17e007 (patch) | |
tree | 9fa25546f817dc5a479fb5fa6e63f116e272d804 /src/objective-c | |
parent | cc9157a248e20a2f24972241ae1f2d41ea171a8b (diff) |
compressAlgorithm->compressionAlgorithm
Diffstat (limited to 'src/objective-c')
-rw-r--r-- | src/objective-c/GRPCClient/GRPCCallOptions.h | 4 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/GRPCCallOptions.m | 32 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCChannelPool.m | 4 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCHost.m | 2 |
4 files changed, 21 insertions, 21 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.h b/src/objective-c/GRPCClient/GRPCCallOptions.h index 9a8362cbcc..484f15fde6 100644 --- a/src/objective-c/GRPCClient/GRPCCallOptions.h +++ b/src/objective-c/GRPCClient/GRPCCallOptions.h @@ -119,7 +119,7 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) { * The compression algorithm to be used by the gRPC call. For more details refer to * https://github.com/grpc/grpc/blob/master/doc/compression.md */ -@property(readonly) GRPCCompressAlgorithm compressAlgorithm; +@property(readonly) GRPCCompressionAlgorithm compressionAlgorithm; /** * Enable/Disable gRPC call's retry feature. The default is enabled. For details of this feature @@ -266,7 +266,7 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) { * The compression algorithm to be used by the gRPC call. For more details refer to * https://github.com/grpc/grpc/blob/master/doc/compression.md */ -@property(readwrite) GRPCCompressAlgorithm compressAlgorithm; +@property(readwrite) GRPCCompressionAlgorithm compressionAlgorithm; /** * Enable/Disable gRPC call's retry feature. The default is enabled. For details of this feature diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m index 37ed3ebd1d..3dc21b7287 100644 --- a/src/objective-c/GRPCClient/GRPCCallOptions.m +++ b/src/objective-c/GRPCClient/GRPCCallOptions.m @@ -24,7 +24,7 @@ static const NSTimeInterval kDefaultTimeout = 0; static NSDictionary *const kDefaultInitialMetadata = nil; static NSString *const kDefaultUserAgentPrefix = nil; static const NSUInteger kDefaultResponseSizeLimit = 0; -static const GRPCCompressAlgorithm kDefaultCompressAlgorithm = GRPCCompressNone; +static const GRPCCompressionAlgorithm kDefaultCompressionAlgorithm = GRPCCompressNone; static const BOOL kDefaultEnableRetry = YES; static const NSTimeInterval kDefaultKeepaliveInterval = 0; static const NSTimeInterval kDefaultKeepaliveTimeout = 0; @@ -52,7 +52,7 @@ static NSUInteger kDefaultChannelID = 0; NSDictionary *_initialMetadata; NSString *_userAgentPrefix; NSUInteger _responseSizeLimit; - GRPCCompressAlgorithm _compressAlgorithm; + GRPCCompressionAlgorithm _compressionAlgorithm; BOOL _enableRetry; NSTimeInterval _keepaliveInterval; NSTimeInterval _keepaliveTimeout; @@ -77,7 +77,7 @@ static NSUInteger kDefaultChannelID = 0; @synthesize initialMetadata = _initialMetadata; @synthesize userAgentPrefix = _userAgentPrefix; @synthesize responseSizeLimit = _responseSizeLimit; -@synthesize compressAlgorithm = _compressAlgorithm; +@synthesize compressionAlgorithm = _compressionAlgorithm; @synthesize enableRetry = _enableRetry; @synthesize keepaliveInterval = _keepaliveInterval; @synthesize keepaliveTimeout = _keepaliveTimeout; @@ -102,7 +102,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:kDefaultInitialMetadata userAgentPrefix:kDefaultUserAgentPrefix responseSizeLimit:kDefaultResponseSizeLimit - compressAlgorithm:kDefaultCompressAlgorithm + compressionAlgorithm:kDefaultCompressionAlgorithm enableRetry:kDefaultEnableRetry keepaliveInterval:kDefaultKeepaliveInterval keepaliveTimeout:kDefaultKeepaliveTimeout @@ -127,7 +127,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:(NSDictionary *)initialMetadata userAgentPrefix:(NSString *)userAgentPrefix responseSizeLimit:(NSUInteger)responseSizeLimit - compressAlgorithm:(GRPCCompressAlgorithm)compressAlgorithm + compressionAlgorithm:(GRPCCompressionAlgorithm)compressionAlgorithm enableRetry:(BOOL)enableRetry keepaliveInterval:(NSTimeInterval)keepaliveInterval keepaliveTimeout:(NSTimeInterval)keepaliveTimeout @@ -151,7 +151,7 @@ static NSUInteger kDefaultChannelID = 0; _initialMetadata = [[NSDictionary alloc] initWithDictionary:initialMetadata copyItems:YES]; _userAgentPrefix = [userAgentPrefix copy]; _responseSizeLimit = responseSizeLimit; - _compressAlgorithm = compressAlgorithm; + _compressionAlgorithm = compressionAlgorithm; _enableRetry = enableRetry; _keepaliveInterval = keepaliveInterval; _keepaliveTimeout = keepaliveTimeout; @@ -181,7 +181,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:_initialMetadata userAgentPrefix:_userAgentPrefix responseSizeLimit:_responseSizeLimit - compressAlgorithm:_compressAlgorithm + compressionAlgorithm:_compressionAlgorithm enableRetry:_enableRetry keepaliveInterval:_keepaliveInterval keepaliveTimeout:_keepaliveTimeout @@ -209,7 +209,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:_initialMetadata userAgentPrefix:_userAgentPrefix responseSizeLimit:_responseSizeLimit - compressAlgorithm:_compressAlgorithm + compressionAlgorithm:_compressionAlgorithm enableRetry:_enableRetry keepaliveInterval:_keepaliveInterval keepaliveTimeout:_keepaliveTimeout @@ -233,7 +233,7 @@ static NSUInteger kDefaultChannelID = 0; [callOptions.userAgentPrefix isEqualToString:_userAgentPrefix])) return NO; if (!(callOptions.responseSizeLimit == _responseSizeLimit)) return NO; - if (!(callOptions.compressAlgorithm == _compressAlgorithm)) return NO; + if (!(callOptions.compressionAlgorithm == _compressionAlgorithm)) return NO; if (!(callOptions.enableRetry == _enableRetry)) return NO; if (!(callOptions.keepaliveInterval == _keepaliveInterval)) return NO; if (!(callOptions.keepaliveTimeout == _keepaliveTimeout)) return NO; @@ -270,7 +270,7 @@ static NSUInteger kDefaultChannelID = 0; NSUInteger result = 0; result ^= _userAgentPrefix.hash; result ^= _responseSizeLimit; - result ^= _compressAlgorithm; + result ^= _compressionAlgorithm; result ^= _enableRetry; result ^= (unsigned int)(_keepaliveInterval * 1000); result ^= (unsigned int)(_keepaliveTimeout * 1000); @@ -301,7 +301,7 @@ static NSUInteger kDefaultChannelID = 0; @dynamic initialMetadata; @dynamic userAgentPrefix; @dynamic responseSizeLimit; -@dynamic compressAlgorithm; +@dynamic compressionAlgorithm; @dynamic enableRetry; @dynamic keepaliveInterval; @dynamic keepaliveTimeout; @@ -326,7 +326,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:kDefaultInitialMetadata userAgentPrefix:kDefaultUserAgentPrefix responseSizeLimit:kDefaultResponseSizeLimit - compressAlgorithm:kDefaultCompressAlgorithm + compressionAlgorithm:kDefaultCompressionAlgorithm enableRetry:kDefaultEnableRetry keepaliveInterval:kDefaultKeepaliveInterval keepaliveTimeout:kDefaultKeepaliveTimeout @@ -353,7 +353,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:_initialMetadata userAgentPrefix:_userAgentPrefix responseSizeLimit:_responseSizeLimit - compressAlgorithm:_compressAlgorithm + compressionAlgorithm:_compressionAlgorithm enableRetry:_enableRetry keepaliveInterval:_keepaliveInterval keepaliveTimeout:_keepaliveTimeout @@ -381,7 +381,7 @@ static NSUInteger kDefaultChannelID = 0; initialMetadata:_initialMetadata userAgentPrefix:_userAgentPrefix responseSizeLimit:_responseSizeLimit - compressAlgorithm:_compressAlgorithm + compressionAlgorithm:_compressionAlgorithm enableRetry:_enableRetry keepaliveInterval:_keepaliveInterval keepaliveTimeout:_keepaliveTimeout @@ -432,8 +432,8 @@ static NSUInteger kDefaultChannelID = 0; _responseSizeLimit = responseSizeLimit; } -- (void)setCompressAlgorithm:(GRPCCompressAlgorithm)compressAlgorithm { - _compressAlgorithm = compressAlgorithm; +- (void)setCompressionAlgorithm:(GRPCCompressionAlgorithm)compressionAlgorithm { + _compressionAlgorithm = compressionAlgorithm; } - (void)setEnableRetry:(BOOL)enableRetry { diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m index 6659d193c6..4908b82fea 100644 --- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m +++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m @@ -94,9 +94,9 @@ extern const char *kCFStreamVarName; [NSNumber numberWithUnsignedInteger:_callOptions.responseSizeLimit]; } - if (_callOptions.compressAlgorithm != GRPC_COMPRESS_NONE) { + if (_callOptions.compressionAlgorithm != GRPC_COMPRESS_NONE) { args[@GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM] = - [NSNumber numberWithInt:_callOptions.compressAlgorithm]; + [NSNumber numberWithInt:_callOptions.compressionAlgorithm]; } if (_callOptions.keepaliveInterval != 0) { diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m index 5fe022a1ba..41d3bec4ef 100644 --- a/src/objective-c/GRPCClient/private/GRPCHost.m +++ b/src/objective-c/GRPCClient/private/GRPCHost.m @@ -102,7 +102,7 @@ static NSMutableDictionary *gHostCache; GRPCMutableCallOptions *options = [[GRPCMutableCallOptions alloc] init]; options.userAgentPrefix = _userAgentPrefix; options.responseSizeLimit = _responseSizeLimitOverride; - options.compressAlgorithm = (GRPCCompressAlgorithm)_compressAlgorithm; + options.compressionAlgorithm = (GRPCCompressionAlgorithm)_compressAlgorithm; options.enableRetry = _retryEnabled; options.keepaliveInterval = (NSTimeInterval)_keepaliveInterval / 1000; options.keepaliveTimeout = (NSTimeInterval)_keepaliveTimeout / 1000; |