_Nullable -> nullable

pull/16190/head
Muxi Yan 6 years ago
parent 00ff5805a3
commit 29e1591904
  1. 8
      src/objective-c/GRPCClient/private/GRPCCronetChannelFactory.h
  2. 8
      src/objective-c/GRPCClient/private/GRPCInsecureChannelFactory.h
  3. 12
      src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.h
  4. 8
      src/objective-c/tests/APIv2Tests/APIv2Tests.m

@ -24,12 +24,12 @@ NS_ASSUME_NONNULL_BEGIN
@interface GRPCCronetChannelFactory : NSObject<GRPCChannelFactory>
+ (instancetype _Nullable)sharedInstance;
+ (nullable instancetype)sharedInstance;
- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary *_Nullable)args;
- (nullable grpc_channel *)createChannelWithHost:(NSString *)host
channelArgs:(nullable NSDictionary *)args;
- (instancetype _Nullable)init NS_UNAVAILABLE;
- (nullable instancetype)init NS_UNAVAILABLE;
@end

@ -23,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
@interface GRPCInsecureChannelFactory : NSObject<GRPCChannelFactory>
+ (instancetype _Nullable)sharedInstance;
+ (nullable instancetype)sharedInstance;
- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary *_Nullable)args;
- (nullable grpc_channel *)createChannelWithHost:(NSString *)host
channelArgs:(nullable NSDictionary *)args;
- (instancetype _Nullable)init NS_UNAVAILABLE;
- (nullable instancetype)init NS_UNAVAILABLE;
@end

@ -23,15 +23,15 @@ NS_ASSUME_NONNULL_BEGIN
@interface GRPCSecureChannelFactory : NSObject<GRPCChannelFactory>
+ (instancetype _Nullable)factoryWithPEMRootCertificates:(NSString *_Nullable)rootCerts
privateKey:(NSString *_Nullable)privateKey
certChain:(NSString *_Nullable)certChain
+ (nullable instancetype)factoryWithPEMRootCertificates:(nullable NSString *)rootCerts
privateKey:(nullable NSString *)privateKey
certChain:(nullable NSString *)certChain
error:(NSError **)errorPtr;
- (grpc_channel *_Nullable)createChannelWithHost:(NSString *)host
channelArgs:(NSDictionary *_Nullable)args;
- (nullable grpc_channel *)createChannelWithHost:(NSString *)host
channelArgs:(nullable NSDictionary *)args;
- (instancetype _Nullable)init NS_UNAVAILABLE;
- (nullable instancetype)init NS_UNAVAILABLE;
@end

@ -81,20 +81,20 @@ static const NSTimeInterval kTestTimeout = 16;
return self;
}
- (void)receivedInitialMetadata:(NSDictionary *_Nullable)initialMetadata {
- (void)receivedInitialMetadata:(NSDictionary *)initialMetadata {
if (self->_initialMetadataCallback) {
self->_initialMetadataCallback(initialMetadata);
}
}
- (void)receivedRawMessage:(GPBMessage *_Nullable)message {
- (void)receivedRawMessage:(GPBMessage *)message {
if (self->_messageCallback) {
self->_messageCallback(message);
}
}
- (void)closedWithTrailingMetadata:(NSDictionary *_Nullable)trailingMetadata
error:(NSError *_Nullable)error {
- (void)closedWithTrailingMetadata:(NSDictionary *)trailingMetadata
error:(NSError *)error {
if (self->_closeCallback) {
self->_closeCallback(trailingMetadata, error);
}

Loading…
Cancel
Save