Rename channelId->channelID

3 files changed, 23 insertions, 23 deletions

diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.h b/src/objective-c/GRPCClient/GRPCCallOptions.h
index dcd4de6223..9c6e00fd18 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.h
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.h
@@ -181,9 +181,9 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
 
 /**
  * Channel id allows a call to force creating a new channel (connection) rather than using a cached
- * channel. Calls using distinct channelId will not get cached to the same connection.
+ * channel. Calls using distinct channelID will not get cached to the same connection.
  */
-@property(readonly) NSUInteger channelId;
+@property(readonly) NSUInteger channelID;
 
 @end
 
@@ -307,16 +307,16 @@ typedef NS_ENUM(NSInteger, GRPCTransportType) {
 
 /**
  * A string that specify the domain where channel is being cached. Channels with different domains
- * will not get cached to the same connection. For example, a gRPC example app may use the channel
- * pool domain 'io.grpc.example' so that its calls do not reuse the channel created by other modules
- * in the same process.
+ * will not get cached to the same channel. For example, a gRPC example app may use the channel pool
+ * domain 'io.grpc.example' so that its calls do not reuse the channel created by other modules in
+ * the same process.
  */
 @property(copy, readwrite) NSString *channelPoolDomain;
 
 /**
  * Channel id allows a call to force creating a new channel (connection) rather than using a cached
- * channel. Calls using distinct channelId will not get cached to the same connection.
+ * channel. Calls using distinct channelID's will not get cached to the same channel.
  */
-@property(readwrite) NSUInteger channelId;
+@property(readwrite) NSUInteger channelID;
 
 @end
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m
index 539cb9929d..ad90fb829e 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.m
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.m
@@ -41,7 +41,7 @@ static const GRPCTransportType kDefaultTransportType = GRPCTransportTypeChttp2Bo
 static NSString *const kDefaultHostNameOverride = nil;
 static const id kDefaultLogContext = nil;
 static NSString *kDefaultChannelPoolDomain = nil;
-static NSUInteger kDefaultChannelId = 0;
+static NSUInteger kDefaultChannelID = 0;
 
 @implementation GRPCCallOptions {
  @protected
@@ -67,7 +67,7 @@ static NSUInteger kDefaultChannelId = 0;
   NSString *_hostNameOverride;
   id _logContext;
   NSString *_channelPoolDomain;
-  NSUInteger _channelId;
+  NSUInteger _channelID;
 }
 
 @synthesize serverAuthority = _serverAuthority;
@@ -92,7 +92,7 @@ static NSUInteger kDefaultChannelId = 0;
 @synthesize hostNameOverride = _hostNameOverride;
 @synthesize logContext = _logContext;
 @synthesize channelPoolDomain = _channelPoolDomain;
-@synthesize channelId = _channelId;
+@synthesize channelID = _channelID;
 
 - (instancetype)init {
   return [self initWithServerAuthority:kDefaultServerAuthority
@@ -117,7 +117,7 @@ static NSUInteger kDefaultChannelId = 0;
                       hostNameOverride:kDefaultHostNameOverride
                             logContext:kDefaultLogContext
                      channelPoolDomain:kDefaultChannelPoolDomain
-                             channelId:kDefaultChannelId];
+                             channelID:kDefaultChannelID];
 }
 
 - (instancetype)initWithServerAuthority:(NSString *)serverAuthority
@@ -142,7 +142,7 @@ static NSUInteger kDefaultChannelId = 0;
                        hostNameOverride:(NSString *)hostNameOverride
                              logContext:(id)logContext
                       channelPoolDomain:(NSString *)channelPoolDomain
-                              channelId:(NSUInteger)channelId {
+                              channelID:(NSUInteger)channelID {
   if ((self = [super init])) {
     _serverAuthority = serverAuthority;
     _timeout = timeout;
@@ -166,7 +166,7 @@ static NSUInteger kDefaultChannelId = 0;
     _hostNameOverride = hostNameOverride;
     _logContext = logContext;
     _channelPoolDomain = channelPoolDomain;
-    _channelId = channelId;
+    _channelID = channelID;
   }
   return self;
 }
@@ -195,7 +195,7 @@ static NSUInteger kDefaultChannelId = 0;
                                                    hostNameOverride:_hostNameOverride
                                                          logContext:_logContext
                                                   channelPoolDomain:_channelPoolDomain
-                                                          channelId:_channelId];
+                                                          channelID:_channelID];
   return newOptions;
 }
 
@@ -223,7 +223,7 @@ static NSUInteger kDefaultChannelId = 0;
              hostNameOverride:_hostNameOverride
                    logContext:_logContext
             channelPoolDomain:_channelPoolDomain
-                    channelId:_channelId];
+                    channelID:_channelID];
   return newOptions;
 }
 
@@ -253,7 +253,7 @@ static NSUInteger kDefaultChannelId = 0;
 @dynamic hostNameOverride;
 @dynamic logContext;
 @dynamic channelPoolDomain;
-@dynamic channelId;
+@dynamic channelID;
 
 - (instancetype)init {
   return [self initWithServerAuthority:kDefaultServerAuthority
@@ -278,7 +278,7 @@ static NSUInteger kDefaultChannelId = 0;
                       hostNameOverride:kDefaultHostNameOverride
                             logContext:kDefaultLogContext
                      channelPoolDomain:kDefaultChannelPoolDomain
-                             channelId:kDefaultChannelId];
+                             channelID:kDefaultChannelID];
 }
 
 - (nonnull id)copyWithZone:(NSZone *)zone {
@@ -305,7 +305,7 @@ static NSUInteger kDefaultChannelId = 0;
                                                    hostNameOverride:_hostNameOverride
                                                          logContext:_logContext
                                                   channelPoolDomain:_channelPoolDomain
-                                                          channelId:_channelId];
+                                                          channelID:_channelID];
   return newOptions;
 }
 
@@ -333,7 +333,7 @@ static NSUInteger kDefaultChannelId = 0;
              hostNameOverride:_hostNameOverride
                    logContext:_logContext
             channelPoolDomain:_channelPoolDomain
-                    channelId:_channelId];
+                    channelID:_channelID];
   return newOptions;
 }
 
@@ -449,8 +449,8 @@ static NSUInteger kDefaultChannelId = 0;
   _channelPoolDomain = channelPoolDomain;
 }
 
-- (void)setChannelId:(NSUInteger)channelId {
-  _channelId = channelId;
+- (void)setChannelID:(NSUInteger)channelID {
+  _channelID = channelID;
 }
 
 @end
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
index 9007f5fed5..37e42f8c75 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
@@ -186,7 +186,7 @@ const NSTimeInterval kChannelDestroyDelay = 30;
   if (!(obj.callOptions.channelPoolDomain == _callOptions.channelPoolDomain ||
         [obj.callOptions.channelPoolDomain isEqualToString:_callOptions.channelPoolDomain]))
     return NO;
-  if (!(obj.callOptions.channelId == _callOptions.channelId)) return NO;
+  if (!(obj.callOptions.channelID == _callOptions.channelID)) return NO;
 
   return YES;
 }
@@ -211,7 +211,7 @@ const NSTimeInterval kChannelDestroyDelay = 30;
   result ^= _callOptions.transportType;
   result ^= [_callOptions.logContext hash];
   result ^= _callOptions.channelPoolDomain.hash;
-  result ^= _callOptions.channelId;
+  result ^= _callOptions.channelID;
 
   return result;
 }