Merge pull request #549 from ParsePlatform/nlutsenko.public.modern

Update all public classes to modern Obj-C syntax.

Author: nlutsenko

Parse/PFACL.m

@@ -270,7 +270,7 @@ - (void)setUnresolvedReadAccess:(BOOL)allowed forUser:(PFUser *)user {
 - (void)setReadAccess:(BOOL)allowed forUser:(PFUser *)user {
     NSString *objectId = user.objectId;
     if (!objectId) {
-        if ([user isLazy]) {
+        if (user.isLazy) {
             [self setUnresolvedReadAccess:allowed forUser:user];
             return;
         }
@@ -296,7 +296,7 @@ - (void)setUnresolvedWriteAccess:(BOOL)allowed forUser:(PFUser *)user {
 - (void)setWriteAccess:(BOOL)allowed forUser:(PFUser *)user {
     NSString *objectId = user.objectId;
     if (!objectId) {
-        if ([user isLazy]) {
+        if (user.isLazy) {
             [self setUnresolvedWriteAccess:allowed forUser:user];
             return;
         }
@@ -336,7 +336,7 @@ - (BOOL)isEqual:(id)object {
 }
 
 - (NSUInteger)hash {
-    return [self.state hash] ^ [unresolvedUser hash];
+    return self.state.hash ^ unresolvedUser.hash;
 }
 
 ///--------------------------------------

Parse/PFConfig.m

@@ -96,16 +96,16 @@ - (id)objectForKeyedSubscript:(NSString *)keyedSubscript {
 #pragma mark Equality Testing
 
 - (NSUInteger)hash {
-    return [_parametersDictionary hash];
+    return _parametersDictionary.hash;
 }
 
 - (BOOL)isEqual:(id)object {
     if ([object isKindOfClass:[PFConfig class]]) {
         PFConfig *other = object;
 
         // Compare pointers first, to account for nil dictionary
-        return self.parametersDictionary == other.parametersDictionary ||
-            [self.parametersDictionary isEqual:other.parametersDictionary];
+        return (self.parametersDictionary == other.parametersDictionary ||
+                [self.parametersDictionary isEqual:other.parametersDictionary]);
     }
 
     return NO;

Parse/PFFile.m

@@ -75,25 +75,24 @@ + (instancetype)fileWithName:(NSString *)name contentsAtPath:(NSString *)path er
     BOOL directory = NO;
 
     if (![fileManager fileExistsAtPath:path isDirectory:&directory] || directory) {
-        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile at path '%@': "
-                             "file does not exist.", path];
+        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile at path '%@': file does not exist.", path];
         if (error) {
             *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                          code:NSFileNoSuchFileError
-                                     userInfo:@{ NSLocalizedDescriptionKey: message }];
+                                     userInfo:@{ NSLocalizedDescriptionKey : message }];
         }
         return nil;
     }
 
     NSDictionary *attributes = [fileManager attributesOfItemAtPath:path error:nil];
     unsigned long long length = [attributes[NSFileSize] unsignedLongValue];
     if (length > PFFileMaxFileSize) {
-        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile at path '%@': "
-                             "file is larger than %lluMB.", path, (PFFileMaxFileSize >> 20)];
+        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile at path '%@': file is larger than %lluMB.",
+                             path, (PFFileMaxFileSize >> 20)];
         if (error) {
             *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                          code:NSFileReadTooLargeError
-                                     userInfo:@{ NSLocalizedDescriptionKey: message }];
+                                     userInfo:@{ NSLocalizedDescriptionKey : message }];
         }
         return nil;
     }
@@ -123,18 +122,18 @@ + (instancetype)fileWithName:(NSString *)name
         if (error) {
             *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                          code:NSFileNoSuchFileError
-                                     userInfo:@{ NSLocalizedDescriptionKey: message }];
+                                     userInfo:@{ NSLocalizedDescriptionKey : message }];
         }
         return nil;
     }
 
-    if ([data length] > PFFileMaxFileSize) {
-        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile with data: "
-                             "data is larger than %lluMB.", (PFFileMaxFileSize >> 20)];
+    if (data.length > PFFileMaxFileSize) {
+        NSString *message = [NSString stringWithFormat:@"Failed to create PFFile with data: data is larger than %lluMB.",
+                             (PFFileMaxFileSize >> 20)];
         if (error) {
             *error = [NSError errorWithDomain:NSCocoaErrorDomain
                                          code:NSFileReadTooLargeError
-                                     userInfo:@{ NSLocalizedDescriptionKey: message }];
+                                     userInfo:@{ NSLocalizedDescriptionKey : message }];
         }
         return nil;
     }
@@ -249,7 +248,7 @@ - (void)getDataInBackgroundWithTarget:(id)target selector:(SEL)selector {
     }];
 }
 
-- (BFTask PF_GENERIC(NSString *) *)getFilePathInBackground {
+- (BFTask PF_GENERIC(NSString *)*)getFilePathInBackground {
     return [self getFilePathInBackgroundWithProgressBlock:nil];
 }
 

Parse/PFGeoPoint.m

@@ -48,7 +48,7 @@ + (void)geoPointForCurrentLocationInBackground:(PFGeoPointResultBlock)resultBloc
         return;
     }
 
-    void(^locationHandler)(CLLocation *, NSError *) = ^(CLLocation *location, NSError *error) {
+    void (^locationHandler)(CLLocation *, NSError *) = ^(CLLocation *location, NSError *error) {
         PFGeoPoint *newGeoPoint = [PFGeoPoint geoPointWithLocation:location];
         resultBlock(newGeoPoint, error);
     };
@@ -75,15 +75,14 @@ - (double)distanceInRadiansTo:(PFGeoPoint *)point {
     double d2r = M_PI / 180.0; // radian conversion factor
     double lat1rad = self.latitude * d2r;
     double long1rad = self.longitude * d2r;
-    double lat2rad = [point latitude] * d2r;
-    double long2rad = [point longitude] * d2r;
+    double lat2rad = point.latitude * d2r;
+    double long2rad = point.longitude * d2r;
     double deltaLat = lat1rad - lat2rad;
     double deltaLong = long1rad - long2rad;
     double sinDeltaLatDiv2 = sin(deltaLat / 2.);
     double sinDeltaLongDiv2 = sin(deltaLong / 2.);
     // Square of half the straight line chord distance between both points. [0.0, 1.0]
-    double a = sinDeltaLatDiv2 * sinDeltaLatDiv2
-    + cos(lat1rad) * cos(lat2rad) * sinDeltaLongDiv2 * sinDeltaLongDiv2;
+    double a = sinDeltaLatDiv2 * sinDeltaLatDiv2 + cos(lat1rad) * cos(lat2rad) * sinDeltaLongDiv2 * sinDeltaLongDiv2;
     a = fmin(1.0, a);
     return 2. * asin(sqrt(a));
 }

Parse/PFInstallation.m

@@ -276,7 +276,7 @@ - (void)_updateBadgeFromDevice {
 }
 
 - (void)_updateVersionInfoFromDevice {
-    NSDictionary *appInfo = [[NSBundle mainBundle] infoDictionary];
+    NSDictionary *appInfo = [NSBundle mainBundle].infoDictionary;
     NSString *appName = appInfo[(__bridge NSString *)kCFBundleNameKey];
     NSString *appVersion = appInfo[(__bridge NSString *)kCFBundleVersionKey];
     NSString *appIdentifier = appInfo[(__bridge NSString *)kCFBundleIdentifierKey];

Parse/PFObject.m

@@ -401,7 +401,7 @@ + (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sess
     // TODO: (nlutsenko) Get rid of this once we allow localIds in batches.
     NSArray *remaining = [uniqueObjects allObjects];
     NSMutableArray *finished = [NSMutableArray array];
-    while ([remaining count] > 0) {
+    while (remaining.count > 0) {
         // Partition the objects into two sets: those that can be save immediately,
         // and those that rely on other objects to be created first.
         NSMutableArray *current = [NSMutableArray array];
@@ -429,7 +429,7 @@ + (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sess
         // This has to happen separately from everything else because there [PFUser save]
         // is special-cased to work for lazy users, but new users can't be created by
         // PFMultiCommand's regular save.
-        if ([currentUser isLazy] && [current containsObject:currentUser]) {
+        if (currentUser.isLazy && [current containsObject:currentUser]) {
             task = [task continueAsyncWithSuccessBlock:^id(BFTask *task) {
                 return [currentUser saveInBackground];
             }];
@@ -447,12 +447,12 @@ + (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sess
             // and execute them concurrently with a wrapper task for all of them.
             NSArray *objectBatches = [PFInternalUtils arrayBySplittingArray:current
                                             withMaximumComponentsPerSegment:PFRESTObjectBatchCommandSubcommandsLimit];
-            NSMutableArray *tasks = [NSMutableArray arrayWithCapacity:[objectBatches count]];
+            NSMutableArray *tasks = [NSMutableArray arrayWithCapacity:objectBatches.count];
 
             for (NSArray *objectBatch in objectBatches) {
                 BFTask *batchTask = [self _enqueue:^BFTask *(BFTask *toAwait) {
                     return [toAwait continueAsyncWithBlock:^id(BFTask *task) {
-                        NSMutableArray *commands = [NSMutableArray arrayWithCapacity:[objectBatch count]];
+                        NSMutableArray *commands = [NSMutableArray arrayWithCapacity:objectBatch.count];
                         for (PFObject *object in objectBatch) {
                             PFRESTCommand *command = nil;
                             @synchronized ([object lock]) {
@@ -472,7 +472,7 @@ + (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sess
                                 continueAsyncWithBlock:^id(BFTask *commandRunnerTask) {
                                     NSArray *results = [commandRunnerTask.result result];
 
-                                    NSMutableArray *handleSaveTasks = [NSMutableArray arrayWithCapacity:[objectBatch count]];
+                                    NSMutableArray *handleSaveTasks = [NSMutableArray arrayWithCapacity:objectBatch.count];
 
                                     __block NSError *error = task.error;
                                     [objectBatch enumerateObjectsUsingBlock:^(PFObject *object, NSUInteger idx, BOOL *stop) {
@@ -565,10 +565,10 @@ + (BFTask *)_enqueueSaveEventuallyChildrenOfObject:(PFObject *)object
         // Remove object from the queue of objects to save as this method should only save children.
         [uniqueObjects removeObject:object];
 
-        NSArray *remaining = [uniqueObjects allObjects];
+        NSArray *remaining = uniqueObjects.allObjects;
         NSMutableArray *finished = [NSMutableArray array];
         NSMutableArray *enqueueTasks = [NSMutableArray array];
-        while ([remaining count] > 0) {
+        while (remaining.count > 0) {
             // Partition the objects into two sets: those that can be save immediately,
             // and those that rely on other objects to be created first.
             NSMutableArray *current = [NSMutableArray array];
@@ -600,7 +600,7 @@ + (BFTask *)_enqueueSaveEventuallyChildrenOfObject:(PFObject *)object
             // Unfortunately, ACLs with lazy users still cannot be saved, because the ACL does
             // does not get updated after the user save completes.
             // TODO: (nlutsenko) Make the ACL update after the user is saved.
-            if ([currentUser isLazy] && [current containsObject:currentUser]) {
+            if (currentUser.isLazy && [current containsObject:currentUser]) {
                 [enqueueTasks addObject:[currentUser _enqueueSaveEventuallyWithChildren:NO]];
                 [finished addObject:currentUser];
                 [current removeObject:currentUser];
@@ -941,7 +941,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
             if ([key isEqualToString:PFObjectOperationsRESTKey]) {
                 PFOperationSet *remoteOperationSet = nil;
                 NSArray *operations = (NSArray *)obj;
-                if ([operations count] > 0) {
+                if (operations.count > 0) {
                     // Add and enqueue any saveEventually operations, roll forward any other
                     // operations sets (operations sets here are generally failed/incomplete saves).
                     PFOperationSet *current = nil;
@@ -957,7 +957,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
                             // Check if queue already contains this operation set and discard it if does
                             if (![self _containsOperationSet:operationSet]) {
                                 // Insert the `saveEventually` operationSet before the last operation set at all times.
-                                NSUInteger index = ([operationSetQueue count] == 0 ? 0 : [operationSetQueue count] - 1);
+                                NSUInteger index = (operationSetQueue.count == 0 ? 0 : operationSetQueue.count - 1);
                                 [operationSetQueue insertObject:operationSet atIndex:index];
                                 [self _enqueueSaveEventuallyOperationAsync:operationSet];
                             }
@@ -1187,7 +1187,7 @@ - (BOOL)_containsOperationSet:(PFOperationSet *)operationSet {
  */
 - (PFOperationSet *)unsavedChanges {
     @synchronized (lock) {
-        return [operationSetQueue lastObject];
+        return operationSetQueue.lastObject;
     }
 }
 
@@ -1207,7 +1207,7 @@ - (BOOL)_hasChanges {
 - (BOOL)_hasOutstandingOperations {
     @synchronized (lock) {
         // > 1 since 1 is unsaved changes.
-        return [operationSetQueue count] > 1;
+        return operationSetQueue.count > 1;
     }
 }
 
@@ -1254,9 +1254,9 @@ - (void)removeOldKeysAfterFetch:(NSDictionary *)result {
         PFMutableObjectState *state = [self._state mutableCopy];
 
         NSMutableDictionary *removedDictionary = [NSMutableDictionary dictionaryWithDictionary:state.serverData];
-        [removedDictionary removeObjectsForKeys:[result allKeys]];
+        [removedDictionary removeObjectsForKeys:result.allKeys];
 
-        NSArray *removedKeys = [removedDictionary allKeys];
+        NSArray *removedKeys = removedDictionary.allKeys;
         [state removeServerDataObjectsForKeys:removedKeys];
         [_availableKeys minusSet:[NSSet setWithArray:removedKeys]];
 
@@ -1321,7 +1321,7 @@ - (void)_mergeFromServerWithResult:(NSDictionary *)result decoder:(PFDecoder *)d
             state.updatedAt = state.createdAt;
         }
         self._state = state;
-        [_availableKeys addObjectsFromArray:[result allKeys]];
+        [_availableKeys addObjectsFromArray:result.allKeys];
 
         dirty = NO;
     }
@@ -1969,7 +1969,7 @@ - (BOOL)isDirty {
 
 - (BOOL)isDirtyForKey:(NSString *)key {
     @synchronized (lock) {
-        return [self unsavedChanges][key] != nil;
+        return ([self unsavedChanges][key] != nil);
     }
 }
 
@@ -2200,12 +2200,12 @@ - (void)removeObjectForKey:(NSString *)key {
 - (void)revert {
     @synchronized (self.lock) {
         if (self.dirty) {
-            NSMutableSet *persistentKeys = [NSMutableSet setWithArray:[self._state.serverData allKeys]];
+            NSMutableSet *persistentKeys = [NSMutableSet setWithArray:self._state.serverData.allKeys];
 
             PFOperationSet *unsavedChanges = [self unsavedChanges];
             for (PFOperationSet *operationSet in operationSetQueue) {
                 if (operationSet != unsavedChanges) {
-                    [persistentKeys addObjectsFromArray:[operationSet.keyEnumerator allObjects]];
+                    [persistentKeys addObjectsFromArray:operationSet.keyEnumerator.allObjects];
                 }
             }
 
@@ -2301,7 +2301,7 @@ - (void)setValue:(id)value forUndefinedKey:(NSString *)key {
 
 - (NSArray *)allKeys {
     @synchronized (lock) {
-        return [_estimatedData allKeys];
+        return _estimatedData.allKeys;
     }
 }
 
@@ -2321,7 +2321,7 @@ - (NSString *)description {
 - (NSString *)_recursiveDescription {
     @synchronized (lock) {
         return [NSString stringWithFormat:@"%@ %@",
-                [self _flatDescription], [_estimatedData.dictionaryRepresentation description]];
+                [self _flatDescription], _estimatedData.dictionaryRepresentation.description];
     }
 }
 
@@ -2435,13 +2435,13 @@ + (BOOL)resolveInstanceMethod:(SEL)sel {
     }
 
     // Convert the method signature *back* into a objc type string (sidenote, why isn't this a built in?).
-    NSMutableString *typeString = [NSMutableString stringWithFormat:@"%s", [signature methodReturnType]];
-    for (NSUInteger argumentIndex = 0; argumentIndex < [signature numberOfArguments]; argumentIndex++) {
+    NSMutableString *typeString = [NSMutableString stringWithFormat:@"%s", signature.methodReturnType];
+    for (NSUInteger argumentIndex = 0; argumentIndex < signature.numberOfArguments; argumentIndex++) {
         [typeString appendFormat:@"%s", [signature getArgumentTypeAtIndex:argumentIndex]];
     }
 
     // TODO: (richardross) Support stret return here (will need to introspect the method signature to do so).
-    class_addMethod(self, sel, _objc_msgForward, [typeString UTF8String]);
+    class_addMethod(self, sel, _objc_msgForward, typeString.UTF8String);
 
     return YES;
 }