Skip to content

Commit 40a9a2c

Browse files
committed
Merge pull request #728 from ParsePlatform/nlutsenko.initializers
Improve designated initializer flow for all classes with custom initializers.
2 parents 4d01525 + 5eaf898 commit 40a9a2c

File tree

74 files changed

+65
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+65
-160
lines changed

Parse/Internal/Analytics/Controller/PFAnalyticsController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
2727
///--------------------------------------
2828

2929
- (instancetype)init NS_UNAVAILABLE;
30+
+ (instancetype)new NS_UNAVAILABLE;
31+
3032
- (instancetype)initWithDataSource:(id<PFEventuallyQueueProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3133

3234
+ (instancetype)controllerWithDataSource:(id<PFEventuallyQueueProvider>)dataSource;

Parse/Internal/Analytics/Controller/PFAnalyticsController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ @implementation PFAnalyticsController
2727
#pragma mark - Init
2828
///--------------------------------------
2929

30-
- (instancetype)init {
31-
PFNotDesignatedInitializer();
32-
}
33-
3430
- (instancetype)initWithDataSource:(id<PFEventuallyQueueProvider>)dataSource {
3531
self = [super init];
3632
if (!self) return nil;

Parse/Internal/CloudCode/PFCloudCodeController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
///--------------------------------------
2424

2525
- (instancetype)init NS_UNAVAILABLE;
26+
+ (instancetype)new NS_UNAVAILABLE;
27+
2628
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
2729

2830
+ (instancetype)controllerWithDataSource:(id<PFCommandRunnerProvider>)dataSource;

Parse/Internal/CloudCode/PFCloudCodeController.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ @implementation PFCloudCodeController
2222

2323
///--------------------------------------
2424
#pragma mark - Init
25-
///--------------------------------------
26-
27-
- (instancetype)init {
28-
PFNotDesignatedInitializer();
29-
}
25+
///--------------------------------------s
3026

3127
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource {
3228
self = [super init];

Parse/Internal/Commands/CommandRunner/URLRequestConstructor/PFCommandURLRequestConstructor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
///--------------------------------------
2727

2828
- (instancetype)init NS_UNAVAILABLE;
29+
+ (instancetype)new NS_UNAVAILABLE;
30+
2931
+ (instancetype)constructorWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource serverURL:(NSURL *)serverURL;
3032

3133
///--------------------------------------

Parse/Internal/Commands/CommandRunner/URLRequestConstructor/PFCommandURLRequestConstructor.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ @implementation PFCommandURLRequestConstructor
2727
#pragma mark - Init
2828
///--------------------------------------
2929

30-
- (instancetype)init {
31-
PFNotDesignatedInitializer();
32-
}
33-
3430
- (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource serverURL:(NSURL *)serverURL {
3531
self = [super init];
3632
if (!self) return nil;

Parse/Internal/Commands/CommandRunner/URLSession/PFURLSessionCommandRunner.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
1616
@interface PFURLSessionCommandRunner : NSObject <PFCommandRunning>
1717

1818
- (instancetype)init NS_UNAVAILABLE;
19+
+ (instancetype)new NS_UNAVAILABLE;
1920

2021
+ (instancetype)commandRunnerWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
2122
retryAttempts:(NSUInteger)retryAttempts

Parse/Internal/Commands/CommandRunner/URLSession/PFURLSessionCommandRunner.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ @implementation PFURLSessionCommandRunner
4848
#pragma mark - Init
4949
///--------------------------------------
5050

51-
- (instancetype)init {
52-
PFNotDesignatedInitializer();
53-
}
54-
5551
- (instancetype)initWithDataSource:(id<PFInstallationIdentifierStoreProvider>)dataSource
5652
applicationId:(NSString *)applicationId
5753
clientKey:(NSString *)clientKey

Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
3737
///--------------------------------------
3838

3939
- (instancetype)init NS_UNAVAILABLE;
40+
+ (instancetype)new NS_UNAVAILABLE;
41+
4042
- (instancetype)initWithConfiguration:(NSURLSessionConfiguration *)configuration
4143
delegate:(id<PFURLSessionDelegate>)delegate NS_DESIGNATED_INITIALIZER;
4244

Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ @implementation PFURLSession
3737
#pragma mark - Init
3838
///--------------------------------------
3939

40-
- (instancetype)init {
41-
PFNotDesignatedInitializer();
42-
}
43-
4440
- (instancetype)initWithConfiguration:(NSURLSessionConfiguration *)configuration
4541
delegate:(id<PFURLSessionDelegate>)delegate {
4642
// NOTE: cast to id suppresses warning about designated initializer.

Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionDataTaskDelegate.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
2626
@property (nullable, nonatomic, copy, readonly) NSString *responseString;
2727

2828
- (instancetype)init NS_UNAVAILABLE;
29+
+ (instancetype)new NS_UNAVAILABLE;
30+
2931
- (instancetype)initForDataTask:(NSURLSessionDataTask *)dataTask
3032
withCancellationToken:(nullable BFCancellationToken *)cancellationToken NS_DESIGNATED_INITIALIZER;
3133

Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionDataTaskDelegate.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ @implementation PFURLSessionDataTaskDelegate
3131
#pragma mark - Init
3232
///--------------------------------------
3333

34-
- (instancetype)init {
35-
PFNotDesignatedInitializer();
36-
}
37-
3834
- (instancetype)initForDataTask:(NSURLSessionDataTask *)dataTask
3935
withCancellationToken:(BFCancellationToken *)cancellationToken {
4036
self = [super init];

Parse/Internal/Config/Controller/PFConfigController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
///--------------------------------------
2929

3030
- (instancetype)init NS_UNAVAILABLE;
31+
+ (instancetype)new NS_UNAVAILABLE;
32+
3133
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider, PFCommandRunnerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3234

3335
///--------------------------------------

Parse/Internal/Config/Controller/PFConfigController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ @implementation PFConfigController
3434
#pragma mark - Init
3535
///--------------------------------------
3636

37-
- (instancetype)init {
38-
PFNotDesignatedInitializer();
39-
}
40-
4137
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider, PFCommandRunnerProvider>)dataSource {
4238
self = [super init];
4339
if (!self) return nil;

Parse/Internal/Config/Controller/PFCurrentConfigController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
///--------------------------------------
2626

2727
- (instancetype)init NS_UNAVAILABLE;
28+
+ (instancetype)new NS_UNAVAILABLE;
29+
2830
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
2931

3032
+ (instancetype)controllerWithDataSource:(id<PFPersistenceControllerProvider>)dataSource;

Parse/Internal/Config/Controller/PFCurrentConfigController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ @implementation PFCurrentConfigController
3434
#pragma mark - Init
3535
///--------------------------------------
3636

37-
- (instancetype)init {
38-
PFNotDesignatedInitializer();
39-
}
40-
4137
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource {
4238
self = [super init];
4339
if (!self) return nil;

Parse/Internal/File/Controller/PFFileController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
///--------------------------------------
3333

3434
- (instancetype)init NS_UNAVAILABLE;
35+
+ (instancetype)new NS_UNAVAILABLE;
36+
3537
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider, PFFileManagerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3638

3739
+ (instancetype)controllerWithDataSource:(id<PFCommandRunnerProvider, PFFileManagerProvider>)dataSource;

Parse/Internal/File/Controller/PFFileController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ @implementation PFFileController
4444
#pragma mark - Init
4545
///--------------------------------------
4646

47-
- (instancetype)init {
48-
PFNotDesignatedInitializer();
49-
}
50-
5147
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider, PFFileManagerProvider>)dataSource {
5248
self = [super init];
5349
if (!self) return nil;

Parse/Internal/File/Controller/PFFileStagingController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
2828
///--------------------------------------
2929

3030
- (instancetype)init NS_UNAVAILABLE;
31+
+ (instancetype)new NS_UNAVAILABLE;
32+
3133
- (instancetype)initWithDataSource:(id<PFFileManagerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3234

3335
+ (instancetype)controllerWithDataSource:(id<PFFileManagerProvider>)dataSource;

Parse/Internal/File/Controller/PFFileStagingController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ @implementation PFFileStagingController {
2626
#pragma mark - Init
2727
///--------------------------------------
2828

29-
- (instancetype)init {
30-
PFNotDesignatedInitializer();
31-
}
32-
3329
- (instancetype)initWithDataSource:(id<PFFileManagerProvider>)dataSource {
3430
self = [super init];
3531
if (!self) return nil;

Parse/Internal/Installation/InstallationIdentifierStore/PFInstallationIdentifierStore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
///--------------------------------------
2525

2626
- (instancetype)init NS_UNAVAILABLE;
27+
+ (instancetype)new NS_UNAVAILABLE;
28+
2729
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
2830

2931
///--------------------------------------

Parse/Internal/Installation/InstallationIdentifierStore/PFInstallationIdentifierStore.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ @implementation PFInstallationIdentifierStore
3737
#pragma mark - Init
3838
///--------------------------------------
3939

40-
- (instancetype)init {
41-
PFNotDesignatedInitializer();
42-
}
43-
4440
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource {
4541
self = [super init];
4642
if (!self) return nil;

Parse/Internal/KeyValueCache/PFKeyValueCache.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
2020
///--------------------------------------
2121

2222
- (instancetype)init NS_UNAVAILABLE;
23+
+ (instancetype)new NS_UNAVAILABLE;
24+
2325
- (instancetype)initWithCacheDirectoryPath:(NSString *)path;
2426

2527
///--------------------------------------

Parse/Internal/KeyValueCache/PFKeyValueCache.m

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ @interface PFKeyValueCacheEntry ()
3232

3333
@implementation PFKeyValueCacheEntry
3434

35-
- (instancetype)init {
36-
PFNotDesignatedInitializer();
37-
}
38-
3935
- (instancetype)initWithValue:(NSString *)value {
4036
return [self initWithValue:value creationTime:[NSDate date]];
4137
}
@@ -73,10 +69,6 @@ @implementation PFKeyValueCache {
7369
#pragma mark - Init
7470
///--------------------------------------
7571

76-
- (instancetype)init {
77-
PFNotDesignatedInitializer();
78-
}
79-
8072
- (instancetype)initWithCacheDirectoryPath:(NSString *)path {
8173
return [self initWithCacheDirectoryURL:[NSURL fileURLWithPath:path]
8274
fileManager:[NSFileManager defaultManager]

Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ @implementation PFOfflineStore
9393
#pragma mark - Init
9494
///--------------------------------------
9595

96-
- (instancetype)init {
97-
PFNotDesignatedInitializer();
98-
}
99-
10096
- (instancetype)initWithFileManager:(PFFileManager *)fileManager options:(PFOfflineStoreOptions)options {
10197
self = [super init];
10298
if (!self) return nil;

Parse/Internal/LocalDataStore/SQLite/PFSQLiteDatabaseController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
2626
///--------------------------------------
2727

2828
- (instancetype)init NS_UNAVAILABLE;
29+
+ (instancetype)new NS_UNAVAILABLE;
30+
2931
- (instancetype)initWithFileManager:(PFFileManager *)fileManager NS_DESIGNATED_INITIALIZER;
3032
+ (instancetype)controllerWithFileManager:(PFFileManager *)fileManager;
3133

Parse/Internal/LocalDataStore/SQLite/PFSQLiteDatabaseController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ @implementation PFSQLiteDatabaseController {
2525
#pragma mark - Init
2626
///--------------------------------------
2727

28-
- (instancetype)init {
29-
PFNotDesignatedInitializer();
30-
}
31-
3228
- (instancetype)initWithFileManager:(PFFileManager *)fileManager {
3329
self = [super init];
3430
if (!self) return nil;

Parse/Internal/MultiProcessLock/PFMultiProcessFileLock.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
///--------------------------------------
2121

2222
- (instancetype)init NS_UNAVAILABLE;
23+
+ (instancetype)new NS_UNAVAILABLE;
24+
2325
- (instancetype)initForFileWithPath:(NSString *)path NS_DESIGNATED_INITIALIZER;
2426
+ (instancetype)lockForFileWithPath:(NSString *)path;
2527

Parse/Internal/MultiProcessLock/PFMultiProcessFileLock.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ @implementation PFMultiProcessFileLock
3030
#pragma mark - Init
3131
///--------------------------------------
3232

33-
- (instancetype)init {
34-
PFNotDesignatedInitializer();
35-
}
36-
3733
- (instancetype)initForFileWithPath:(NSString *)path {
3834
self = [super init];
3935
if (!self) return nil;

Parse/Internal/Object/BatchController/PFObjectBatchController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
2828
///--------------------------------------
2929

3030
- (instancetype)init NS_UNAVAILABLE;
31+
+ (instancetype)new NS_UNAVAILABLE;
32+
3133
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3234
+ (instancetype)controllerWithDataSource:(id<PFCommandRunnerProvider>)dataSource;
3335

Parse/Internal/Object/BatchController/PFObjectBatchController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ @implementation PFObjectBatchController
3030
#pragma mark - Init
3131
///--------------------------------------
3232

33-
- (instancetype)init {
34-
PFNotDesignatedInitializer();
35-
}
36-
3733
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource {
3834
self = [super init];
3935
if (!self) return nil;

Parse/Internal/Object/Controller/PFObjectController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
2626
///--------------------------------------
2727

2828
- (instancetype)init NS_UNAVAILABLE;
29+
+ (instancetype)new NS_UNAVAILABLE;
30+
2931
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3032
+ (instancetype)controllerWithDataSource:(id<PFCommandRunnerProvider>)dataSource;
3133

Parse/Internal/Object/Controller/PFObjectController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ @implementation PFObjectController
2727
#pragma mark - Init
2828
///--------------------------------------
2929

30-
- (instancetype)init {
31-
PFNotDesignatedInitializer();
32-
}
33-
3430
- (instancetype)initWithDataSource:(id<PFCommandRunnerProvider>)dataSource {
3531
self = [super init];
3632
if (!self) return nil;

Parse/Internal/Object/FilePersistence/PFObjectFilePersistenceController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
///--------------------------------------
2727

2828
- (instancetype)init NS_UNAVAILABLE;
29+
+ (instancetype)new NS_UNAVAILABLE;
30+
2931
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3032
+ (instancetype)controllerWithDataSource:(id<PFPersistenceControllerProvider>)dataSource;
3133

Parse/Internal/Object/FilePersistence/PFObjectFilePersistenceController.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ @implementation PFObjectFilePersistenceController
2323
#pragma mark - Init
2424
///--------------------------------------
2525

26-
- (instancetype)init {
27-
PFNotDesignatedInitializer();
28-
}
29-
3026
- (instancetype)initWithDataSource:(id<PFPersistenceControllerProvider>)dataSource {
3127
self = [super init];
3228
if (!self) return nil;

Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
///--------------------------------------
2929

3030
- (instancetype)init NS_UNAVAILABLE;
31+
+ (instancetype)new NS_UNAVAILABLE;
32+
3133
- (instancetype)initWithDataSource:(id<PFFileManagerProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3234
+ (instancetype)storeWithDataSource:(id<PFFileManagerProvider>)dataSource;
3335

Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ @interface PFObjectLocalIdStore () {
8181

8282
@implementation PFObjectLocalIdStore
8383

84-
- (instancetype)init {
85-
PFNotDesignatedInitializer();
86-
}
87-
8884
/**
8985
* Creates a new LocalIdManager with default options.
9086
*/

Parse/Internal/Object/PinningStore/PFPinningObjectStore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
2828
///--------------------------------------
2929

3030
- (instancetype)init NS_UNAVAILABLE;
31+
+ (instancetype)new NS_UNAVAILABLE;
32+
3133
- (instancetype)initWithDataSource:(id<PFOfflineStoreProvider>)dataSource NS_DESIGNATED_INITIALIZER;
3234
+ (instancetype)storeWithDataSource:(id<PFOfflineStoreProvider>)dataSource;
3335

0 commit comments

Comments
 (0)