enableRetry->retryEnabled

4 files changed, 21 insertions, 21 deletions

diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.h b/src/objective-c/GRPCClient/GRPCCallOptions.h
index d1daaa1d82..4c8bb605ea 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.h
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.h
@@ -132,7 +132,7 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
  * refer to
  * https://github.com/grpc/proposal/blob/master/A6-client-retries.md
  */
-@property(readonly) BOOL enableRetry;
+@property(readonly) BOOL retryEnabled;
 
 // HTTP/2 keep-alive feature. The parameter \a keepaliveInterval specifies the interval between two
 // PING frames. The parameter \a keepaliveTimeout specifies the length of the period for which the
@@ -279,7 +279,7 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
  * refer to
  * https://github.com/grpc/proposal/blob/master/A6-client-retries.md
  */
-@property(readwrite) BOOL enableRetry;
+@property(readwrite) BOOL retryEnabled;
 
 // HTTP/2 keep-alive feature. The parameter \a keepaliveInterval specifies the interval between two
 // PING frames. The parameter \a keepaliveTimeout specifies the length of the period for which the
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m
index fe75c17b09..85a5a9ac89 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.m
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.m
@@ -25,7 +25,7 @@ static NSDictionary *const kDefaultInitialMetadata = nil;
 static NSString *const kDefaultUserAgentPrefix = nil;
 static const NSUInteger kDefaultResponseSizeLimit = 0;
 static const GRPCCompressionAlgorithm kDefaultCompressionAlgorithm = GRPCCompressNone;
-static const BOOL kDefaultEnableRetry = YES;
+static const BOOL kDefaultRetryEnabled = YES;
 static const NSTimeInterval kDefaultKeepaliveInterval = 0;
 static const NSTimeInterval kDefaultKeepaliveTimeout = 0;
 static const NSTimeInterval kDefaultConnectMinTimeout = 0;
@@ -53,7 +53,7 @@ static const NSUInteger kDefaultChannelID = 0;
   NSString *_userAgentPrefix;
   NSUInteger _responseSizeLimit;
   GRPCCompressionAlgorithm _compressionAlgorithm;
-  BOOL _enableRetry;
+  BOOL _retryEnabled;
   NSTimeInterval _keepaliveInterval;
   NSTimeInterval _keepaliveTimeout;
   NSTimeInterval _connectMinTimeout;
@@ -78,7 +78,7 @@ static const NSUInteger kDefaultChannelID = 0;
 @synthesize userAgentPrefix = _userAgentPrefix;
 @synthesize responseSizeLimit = _responseSizeLimit;
 @synthesize compressionAlgorithm = _compressionAlgorithm;
-@synthesize enableRetry = _enableRetry;
+@synthesize retryEnabled = _retryEnabled;
 @synthesize keepaliveInterval = _keepaliveInterval;
 @synthesize keepaliveTimeout = _keepaliveTimeout;
 @synthesize connectMinTimeout = _connectMinTimeout;
@@ -103,7 +103,7 @@ static const NSUInteger kDefaultChannelID = 0;
                        userAgentPrefix:kDefaultUserAgentPrefix
                      responseSizeLimit:kDefaultResponseSizeLimit
                   compressionAlgorithm:kDefaultCompressionAlgorithm
-                           enableRetry:kDefaultEnableRetry
+                          retryEnabled:kDefaultRetryEnabled
                      keepaliveInterval:kDefaultKeepaliveInterval
                       keepaliveTimeout:kDefaultKeepaliveTimeout
                      connectMinTimeout:kDefaultConnectMinTimeout
@@ -128,7 +128,7 @@ static const NSUInteger kDefaultChannelID = 0;
                         userAgentPrefix:(NSString *)userAgentPrefix
                       responseSizeLimit:(NSUInteger)responseSizeLimit
                    compressionAlgorithm:(GRPCCompressionAlgorithm)compressionAlgorithm
-                            enableRetry:(BOOL)enableRetry
+                           retryEnabled:(BOOL)retryEnabled
                       keepaliveInterval:(NSTimeInterval)keepaliveInterval
                        keepaliveTimeout:(NSTimeInterval)keepaliveTimeout
                       connectMinTimeout:(NSTimeInterval)connectMinTimeout
@@ -152,7 +152,7 @@ static const NSUInteger kDefaultChannelID = 0;
     _userAgentPrefix = [userAgentPrefix copy];
     _responseSizeLimit = responseSizeLimit;
     _compressionAlgorithm = compressionAlgorithm;
-    _enableRetry = enableRetry;
+    _retryEnabled = retryEnabled;
     _keepaliveInterval = keepaliveInterval;
     _keepaliveTimeout = keepaliveTimeout;
     _connectMinTimeout = connectMinTimeout;
@@ -182,7 +182,7 @@ static const NSUInteger kDefaultChannelID = 0;
                                                     userAgentPrefix:_userAgentPrefix
                                                   responseSizeLimit:_responseSizeLimit
                                                compressionAlgorithm:_compressionAlgorithm
-                                                        enableRetry:_enableRetry
+                                                        retryEnabled:_retryEnabled
                                                   keepaliveInterval:_keepaliveInterval
                                                    keepaliveTimeout:_keepaliveTimeout
                                                   connectMinTimeout:_connectMinTimeout
@@ -210,7 +210,7 @@ static const NSUInteger kDefaultChannelID = 0;
               userAgentPrefix:_userAgentPrefix
             responseSizeLimit:_responseSizeLimit
          compressionAlgorithm:_compressionAlgorithm
-                  enableRetry:_enableRetry
+                  retryEnabled:_retryEnabled
             keepaliveInterval:_keepaliveInterval
              keepaliveTimeout:_keepaliveTimeout
             connectMinTimeout:_connectMinTimeout
@@ -234,7 +234,7 @@ static const NSUInteger kDefaultChannelID = 0;
     return NO;
   if (!(callOptions.responseSizeLimit == _responseSizeLimit)) return NO;
   if (!(callOptions.compressionAlgorithm == _compressionAlgorithm)) return NO;
-  if (!(callOptions.enableRetry == _enableRetry)) return NO;
+  if (!(callOptions.retryEnabled == _retryEnabled)) return NO;
   if (!(callOptions.keepaliveInterval == _keepaliveInterval)) return NO;
   if (!(callOptions.keepaliveTimeout == _keepaliveTimeout)) return NO;
   if (!(callOptions.connectMinTimeout == _connectMinTimeout)) return NO;
@@ -271,7 +271,7 @@ static const NSUInteger kDefaultChannelID = 0;
   result ^= _userAgentPrefix.hash;
   result ^= _responseSizeLimit;
   result ^= _compressionAlgorithm;
-  result ^= _enableRetry;
+  result ^= _retryEnabled;
   result ^= (unsigned int)(_keepaliveInterval * 1000);
   result ^= (unsigned int)(_keepaliveTimeout * 1000);
   result ^= (unsigned int)(_connectMinTimeout * 1000);
@@ -302,7 +302,7 @@ static const NSUInteger kDefaultChannelID = 0;
 @dynamic userAgentPrefix;
 @dynamic responseSizeLimit;
 @dynamic compressionAlgorithm;
-@dynamic enableRetry;
+@dynamic retryEnabled;
 @dynamic keepaliveInterval;
 @dynamic keepaliveTimeout;
 @dynamic connectMinTimeout;
@@ -327,7 +327,7 @@ static const NSUInteger kDefaultChannelID = 0;
                        userAgentPrefix:kDefaultUserAgentPrefix
                      responseSizeLimit:kDefaultResponseSizeLimit
                   compressionAlgorithm:kDefaultCompressionAlgorithm
-                           enableRetry:kDefaultEnableRetry
+                           retryEnabled:kDefaultRetryEnabled
                      keepaliveInterval:kDefaultKeepaliveInterval
                       keepaliveTimeout:kDefaultKeepaliveTimeout
                      connectMinTimeout:kDefaultConnectMinTimeout
@@ -354,7 +354,7 @@ static const NSUInteger kDefaultChannelID = 0;
                                                     userAgentPrefix:_userAgentPrefix
                                                   responseSizeLimit:_responseSizeLimit
                                                compressionAlgorithm:_compressionAlgorithm
-                                                        enableRetry:_enableRetry
+                                                        retryEnabled:_retryEnabled
                                                   keepaliveInterval:_keepaliveInterval
                                                    keepaliveTimeout:_keepaliveTimeout
                                                   connectMinTimeout:_connectMinTimeout
@@ -382,7 +382,7 @@ static const NSUInteger kDefaultChannelID = 0;
               userAgentPrefix:_userAgentPrefix
             responseSizeLimit:_responseSizeLimit
          compressionAlgorithm:_compressionAlgorithm
-                  enableRetry:_enableRetry
+                  retryEnabled:_retryEnabled
             keepaliveInterval:_keepaliveInterval
              keepaliveTimeout:_keepaliveTimeout
             connectMinTimeout:_connectMinTimeout
@@ -436,8 +436,8 @@ static const NSUInteger kDefaultChannelID = 0;
   _compressionAlgorithm = compressionAlgorithm;
 }
 
-- (void)setEnableRetry:(BOOL)enableRetry {
-  _enableRetry = enableRetry;
+- (void)setRetryEnabled:(BOOL)retryEnabled {
+  _retryEnabled = retryEnabled;
 }
 
 - (void)setKeepaliveInterval:(NSTimeInterval)keepaliveInterval {
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
index 80fa9c9151..1dfae32342 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
@@ -108,8 +108,8 @@ extern const char *kCFStreamVarName;
         [NSNumber numberWithUnsignedInteger:(unsigned int)(_callOptions.keepaliveTimeout * 1000)];
   }
 
-  if (_callOptions.enableRetry == NO) {
-    args[@GRPC_ARG_ENABLE_RETRIES] = [NSNumber numberWithInt:_callOptions.enableRetry];
+  if (_callOptions.retryEnabled == NO) {
+    args[@GRPC_ARG_ENABLE_RETRIES] = [NSNumber numberWithInt:_callOptions.retryEnabled];
   }
 
   if (_callOptions.connectMinTimeout > 0) {
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index c0d75c0f31..38b31c2ebc 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -103,7 +103,7 @@ static NSMutableDictionary *gHostCache;
   options.userAgentPrefix = _userAgentPrefix;
   options.responseSizeLimit = _responseSizeLimitOverride;
   options.compressionAlgorithm = (GRPCCompressionAlgorithm)_compressAlgorithm;
-  options.enableRetry = _retryEnabled;
+  options.retryEnabled = _retryEnabled;
   options.keepaliveInterval = (NSTimeInterval)_keepaliveInterval / 1000;
   options.keepaliveTimeout = (NSTimeInterval)_keepaliveTimeout / 1000;
   options.connectMinTimeout = (NSTimeInterval)_minConnectTimeout / 1000;