Skip to content

Add nullable/nonnull to avoid complier complain #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
csutanyu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add nullable/nonnull to avoid complier complain #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Pod/Classes/Data/GDCSerializable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#import <Foundation/Foundation.h>

static NSString *const kJsonTypeKey = @"@type";
static NSString *const _Nonnull kJsonTypeKey = @"@type";

@protocol GDCSerializable <NSObject>
/// Creates a new instance by parsing Json format. If
Expand All @@ -16,7 +16,7 @@ static NSString *const kJsonTypeKey = @"@type";
/// the data can not be parsed.
///
/// @return A new instance of the class messaged.
+ (instancetype)parseFromJson:(nullable NSDictionary *)json error:(NSError **)errorPtr;
+ (nullable instancetype)parseFromJson:(nullable NSDictionary *)json error:(NSError *_Nullable * _Nullable)errorPtr;

/// Parses json patches of this type and merges it with this message.
///
Expand All @@ -33,5 +33,5 @@ static NSString *const kJsonTypeKey = @"@type";

/// Merges the fields from another message (of the same type) into this
/// message.
- (void)mergeFrom:(id)other;
- (void)mergeFrom:(nullable id<GDCSerializable>)other;
@end
5 changes: 3 additions & 2 deletions Pod/Classes/Data/GDCUrlCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
@class GPBMessage;
@class GPBFieldMask;


NS_ASSUME_NONNULL_BEGIN
@interface GDCUrlCache : NSObject
+ (GDCUrlCache *)instance;

- (void)storeCachedMessage:(GPBMessage *)respMessage forPath:(NSString *)path andRequest:(GPBMessage *)reqMessage andKeys:(GPBFieldMask *)keys withMaxAge:(int)maxAge;

- (nullable __kindof GPBMessage *)cachedMessageForPath:(NSString *)path andRequest:(GPBMessage *)reqMessage andKeys:(GPBFieldMask *)keys expired:(BOOL *)expired;

@end
@end
NS_ASSUME_NONNULL_END