Add generic types for object collections to PFQueryState.

Author: nlutsenko

Parse/Internal/Query/State/PFMutableQueryState.h

@@ -58,7 +58,7 @@
 
 - (void)sortByKey:(NSString *)key ascending:(BOOL)ascending;
 - (void)addSortKey:(NSString *)key ascending:(BOOL)ascending;
-- (void)addSortKeysFromSortDescriptors:(NSArray *)sortDescriptors;
+- (void)addSortKeysFromSortDescriptors:(NSArray<NSSortDescriptor *> *)sortDescriptors;
 
 ///--------------------------------------
 #pragma mark - Includes
@@ -71,7 +71,7 @@
 #pragma mark - Selected Keys
 ///--------------------------------------
 
-- (void)selectKeys:(NSArray *)keys;
+- (void)selectKeys:(NSArray<NSString *> *)keys;
 
 ///--------------------------------------
 #pragma mark - Redirect

Parse/Internal/Query/State/PFMutableQueryState.m

@@ -13,10 +13,10 @@
 #import "PFQueryState_Private.h"
 
 @interface PFMutableQueryState () {
-    NSMutableDictionary *_conditions;
-    NSMutableArray *_sortKeys;
-    NSMutableSet *_includedKeys;
-    NSMutableDictionary *_extraOptions;
+    NSMutableDictionary<NSString *, id> *_conditions;
+    NSMutableArray<NSString *> *_sortKeys;
+    NSMutableSet<NSString *> *_includedKeys;
+    NSMutableDictionary<NSString *, NSString *> *_extraOptions;
 }
 
 @end
@@ -133,7 +133,7 @@ - (void)addSortKey:(NSString *)key ascending:(BOOL)ascending {
     }
 }
 
-- (void)addSortKeysFromSortDescriptors:(NSArray *)sortDescriptors {
+- (void)addSortKeysFromSortDescriptors:(NSArray<NSSortDescriptor *> *)sortDescriptors {
     [_sortKeys removeAllObjects];
     for (NSSortDescriptor *sortDescriptor in sortDescriptors) {
         [self addSortKey:sortDescriptor.key ascending:sortDescriptor.ascending];
@@ -164,7 +164,7 @@ - (void)includeKeys:(NSArray<NSString *> *)keys {
 #pragma mark - Selected Keys
 ///--------------------------------------
 
-- (void)selectKeys:(NSArray *)keys {
+- (void)selectKeys:(NSArray<NSString *> *)keys {
     if (keys) {
         _selectedKeys = (_selectedKeys ? [_selectedKeys setByAddingObjectsFromArray:keys] : [NSSet setWithArray:keys]);
     } else {

Parse/Internal/Query/State/PFQueryState.h

@@ -17,14 +17,14 @@
 
 @property (nonatomic, copy, readonly) NSString *parseClassName;
 
-@property (nonatomic, copy, readonly) NSDictionary *conditions;
+@property (nonatomic, copy, readonly) NSDictionary<NSString *, id> *conditions;
 
-@property (nonatomic, copy, readonly) NSArray *sortKeys;
+@property (nonatomic, copy, readonly) NSArray<NSString *> *sortKeys;
 @property (nonatomic, copy, readonly) NSString *sortOrderString;
 
-@property (nonatomic, copy, readonly) NSSet *includedKeys;
-@property (nonatomic, copy, readonly) NSSet *selectedKeys;
-@property (nonatomic, copy, readonly) NSDictionary *extraOptions;
+@property (nonatomic, copy, readonly) NSSet<NSString *> *includedKeys;
+@property (nonatomic, copy, readonly) NSSet<NSString *> *selectedKeys;
+@property (nonatomic, copy, readonly) NSDictionary<NSString *, NSString *> *extraOptions;
 
 @property (nonatomic, assign, readonly) NSInteger limit;
 @property (nonatomic, assign, readonly) NSInteger skip;

Parse/Internal/Query/State/PFQueryState_Private.h

@@ -13,13 +13,13 @@
 @protected
     NSString *_parseClassName;
 
-    NSDictionary *_conditions;
+    NSDictionary<NSString *, id> *_conditions;
 
-    NSArray *_sortKeys;
+    NSArray<NSString *> *_sortKeys;
 
-    NSSet *_includedKeys;
-    NSSet *_selectedKeys;
-    NSDictionary *_extraOptions;
+    NSSet<NSString *> *_includedKeys;
+    NSSet<NSString *> *_selectedKeys;
+    NSDictionary<NSString *, NSString *> *_extraOptions;
 
     NSInteger _limit;
     NSInteger _skip;