Skip to content

Commit c67b8dc

Browse files
Merge pull request #227 from ParsePlatform/richardross.generics.public.headers.7
Added BFTask generics to header of PFObject
2 parents 0003438 + fbe5b01 commit c67b8dc

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

Parse/Internal/Push/ChannelsController/PFPushChannelsController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ - (BFTask *)getSubscribedChannelsAsync {
5353
PFInstallation *installation = task.result;
5454

5555
BFTask *installationTask = (installation.objectId
56-
? [installation fetchInBackground]
57-
: [installation saveInBackground]);
56+
? (BFTask *)[installation fetchInBackground]
57+
: (BFTask *)[installation saveInBackground]);
5858

5959
return [installationTask continueWithSuccessBlock:^id(BFTask *task) {
6060
return [NSSet setWithArray:installation.channels];

Parse/PFObject.h

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
210210
/*!
211211
@abstract Clears any changes to this object's key that were done after last successful save and sets it back to the
212212
server state.
213-
213+
214214
@param key The key to revert changes for.
215215
*/
216216
- (void)revertObjectForKey:(NSString *)key;
@@ -316,7 +316,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
316316
317317
@returns The task that encapsulates the work being done.
318318
*/
319-
- (BFTask *)saveInBackground;
319+
- (BFTask PF_GENERIC(NSNumber *)*)saveInBackground;
320320

321321
/*!
322322
@abstract Saves the `PFObject` *asynchronously* and executes the given callback block.
@@ -354,7 +354,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
354354
355355
@returns The task that encapsulates the work being done.
356356
*/
357-
- (BFTask *)saveEventually;
357+
- (BFTask PF_GENERIC(NSNumber *)*)saveEventually;
358358

359359
/*!
360360
@abstract Saves this object to the server at some unspecified time in the future,
@@ -406,7 +406,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
406406
407407
@returns The task that encapsulates the work being done.
408408
*/
409-
+ (BFTask *)saveAllInBackground:(PF_NULLABLE NSArray *)objects;
409+
+ (BFTask PF_GENERIC(NSNumber *)*)saveAllInBackground:(PF_NULLABLE NSArray *)objects;
410410

411411
/*!
412412
@abstract Saves a collection of objects all at once `asynchronously` and executes the block when done.
@@ -460,7 +460,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
460460
@param objects The array of objects to delete.
461461
@returns The task that encapsulates the work being done.
462462
*/
463-
+ (BFTask *)deleteAllInBackground:(PF_NULLABLE NSArray *)objects;
463+
+ (BFTask PF_GENERIC(NSNumber *)*)deleteAllInBackground:(PF_NULLABLE NSArray *)objects;
464464

465465
/*!
466466
@abstract Deletes a collection of objects all at once *asynchronously* and executes the block when done.
@@ -569,7 +569,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
569569
570570
@returns The task that encapsulates the work being done.
571571
*/
572-
- (BFTask *)fetchInBackground;
572+
- (BFTask PF_GENERIC(__kindof PFObject *)*)fetchInBackground;
573573

574574
/*!
575575
@abstract Fetches the PFObject *asynchronously* and executes the given callback block.
@@ -596,7 +596,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
596596
597597
@returns The task that encapsulates the work being done.
598598
*/
599-
- (BFTask *)fetchIfNeededInBackground;
599+
- (BFTask PF_GENERIC(__kindof PFObject *)*)fetchIfNeededInBackground;
600600

601601
/*!
602602
@abstract Fetches the `PFObject` data *asynchronously* if <isDataAvailable> is `NO`, then calls the callback block.
@@ -659,7 +659,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
659659
660660
@returns The task that encapsulates the work being done.
661661
*/
662-
+ (BFTask *)fetchAllInBackground:(PF_NULLABLE NSArray *)objects;
662+
+ (BFTask PF_GENERIC(NSArray<__kindof PFObject *> *)*)fetchAllInBackground:(PF_NULLABLE NSArray PF_GENERIC(PFObject *)*)objects;
663663

664664
/*!
665665
@abstract Fetches all of the `PFObject` objects with the current data from the server *asynchronously*
@@ -694,7 +694,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
694694
695695
@returns The task that encapsulates the work being done.
696696
*/
697-
+ (BFTask *)fetchAllIfNeededInBackground:(PF_NULLABLE NSArray *)objects;
697+
+ (BFTask PF_GENERIC(NSArray<__kindof PFObject *> *)*)fetchAllIfNeededInBackground:(PF_NULLABLE NSArray PF_GENERIC(PFObject *)*)objects;
698698

699699
/*!
700700
@abstract Fetches all of the PFObjects with the current data from the server *asynchronously*
@@ -749,7 +749,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
749749
750750
@returns The task that encapsulates the work being done.
751751
*/
752-
- (BFTask *)fetchFromLocalDatastoreInBackground;
752+
- (BFTask PF_GENERIC(__kindof PFObject *)*)fetchFromLocalDatastoreInBackground;
753753

754754
/*!
755755
@abstract *Asynchronously* loads data from the local datastore into this object,
@@ -785,7 +785,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
785785
786786
@returns The task that encapsulates the work being done.
787787
*/
788-
- (BFTask *)deleteInBackground;
788+
- (BFTask PF_GENERIC(NSNumber *)*)deleteInBackground;
789789

790790
/*!
791791
@abstract Deletes the `PFObject` *asynchronously* and executes the given callback block.
@@ -824,7 +824,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
824824
825825
@returns The task that encapsulates the work being done.
826826
*/
827-
- (BFTask *)deleteEventually;
827+
- (BFTask PF_GENERIC(NSNull *)*)deleteEventually;
828828

829829
///--------------------------------------
830830
/// @name Dirtiness
@@ -847,7 +847,6 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
847847
*/
848848
- (BOOL)isDirtyForKey:(NSString *)key;
849849

850-
851850
///--------------------------------------
852851
/// @name Pinning
853852
///--------------------------------------
@@ -934,7 +933,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
934933
@see unpinInBackground
935934
@see PFObjectDefaultPin
936935
*/
937-
- (BFTask *)pinInBackground;
936+
- (BFTask PF_GENERIC(NSNumber *)*)pinInBackground;
938937

939938
/*!
940939
@abstract *Asynchronously* stores the object and every object it points to in the local datastore, recursively,
@@ -967,7 +966,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
967966
968967
@see unpinInBackgroundWithName:
969968
*/
970-
- (BFTask *)pinInBackgroundWithName:(NSString *)name;
969+
- (BFTask PF_GENERIC(NSNumber *)*)pinInBackgroundWithName:(NSString *)name;
971970

972971
/*!
973972
@abstract *Asynchronously* stores the object and every object it points to in the local datastore, recursively.
@@ -1079,7 +1078,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
10791078
@see unpinAllInBackground:
10801079
@see PFObjectDefaultPin
10811080
*/
1082-
+ (BFTask *)pinAllInBackground:(PF_NULLABLE NSArray *)objects;
1081+
+ (BFTask PF_GENERIC(NSNumber *)*)pinAllInBackground:(PF_NULLABLE NSArray PF_GENERIC(PFObject *)*)objects;
10831082

10841083
/*!
10851084
@abstract *Asynchronously* stores the objects and every object they point to in the local datastore, recursively,
@@ -1114,7 +1113,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
11141113
11151114
@see unpinAllInBackground:withName:
11161115
*/
1117-
+ (BFTask *)pinAllInBackground:(PF_NULLABLE NSArray *)objects withName:(NSString *)name;
1116+
+ (BFTask PF_GENERIC(NSNumber *)*)pinAllInBackground:(PF_NULLABLE NSArray *)objects withName:(NSString *)name;
11181117

11191118
/*!
11201119
@abstract *Asynchronously* stores the objects and every object they point to in the local datastore, recursively.
@@ -1196,7 +1195,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
11961195
@see pinInBackground
11971196
@see PFObjectDefaultPin
11981197
*/
1199-
- (BFTask *)unpinInBackground;
1198+
- (BFTask PF_GENERIC(NSNumber *)*)unpinInBackground;
12001199

12011200
/*!
12021201
@abstract *Asynchronously* removes the object and every object it points to in the local datastore, recursively,
@@ -1219,7 +1218,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
12191218
12201219
@see pinInBackgroundWithName:
12211220
*/
1222-
- (BFTask *)unpinInBackgroundWithName:(NSString *)name;
1221+
- (BFTask PF_GENERIC(NSNumber *)*)unpinInBackgroundWithName:(NSString *)name;
12231222

12241223
/*!
12251224
@abstract *Asynchronously* removes the object and every object it points to in the local datastore, recursively.
@@ -1286,7 +1285,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
12861285
12871286
@see PFObjectDefaultPin
12881287
*/
1289-
+ (BFTask *)unpinAllObjectsInBackground;
1288+
+ (BFTask PF_GENERIC(NSNumber *)*)unpinAllObjectsInBackground;
12901289

12911290
/*!
12921291
@abstract *Asynchronously* removes all objects in the local datastore
@@ -1306,7 +1305,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
13061305
13071306
@returns The task that encapsulates the work being done.
13081307
*/
1309-
+ (BFTask *)unpinAllObjectsInBackgroundWithName:(NSString *)name;
1308+
+ (BFTask PF_GENERIC(NSNumber *)*)unpinAllObjectsInBackgroundWithName:(NSString *)name;
13101309

13111310
/*!
13121311
@abstract *Asynchronously* removes all objects with the specified pin name.
@@ -1382,7 +1381,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
13821381
@see pinAllInBackground:
13831382
@see PFObjectDefaultPin
13841383
*/
1385-
+ (BFTask *)unpinAllInBackground:(PF_NULLABLE NSArray *)objects;
1384+
+ (BFTask PF_GENERIC(NSNumber *)*)unpinAllInBackground:(PF_NULLABLE NSArray *)objects;
13861385

13871386
/*!
13881387
@abstract *Asynchronously* removes the objects and every object they point to in the local datastore, recursively,
@@ -1407,7 +1406,7 @@ NS_REQUIRES_PROPERTY_DEFINITIONS
14071406
14081407
@see pinAllInBackground:withName:
14091408
*/
1410-
+ (BFTask *)unpinAllInBackground:(PF_NULLABLE NSArray *)objects withName:(NSString *)name;
1409+
+ (BFTask PF_GENERIC(NSNumber *)*)unpinAllInBackground:(PF_NULLABLE NSArray *)objects withName:(NSString *)name;
14111410

14121411
/*!
14131412
@abstract *Asynchronously* removes the objects and every object they point to in the local datastore, recursively.

0 commit comments

Comments
 (0)