Merge pull request #689 from ParsePlatform/nlutsenko.modernize

Use property accessors via dot-syntax where possible instead of method invocations.

Author: nlutsenko

Parse/Internal/Analytics/Utilities/PFAnalyticsUtilities.m

@@ -17,14 +17,15 @@ + (NSString *)md5DigestFromPushPayload:(id)payload {
     if (!payload || payload == [NSNull null]) {
         payload = @"";
     } else if ([payload isKindOfClass:[NSDictionary class]]) {
-        NSDictionary *dict = payload;
-        NSArray *keys = [[dict allKeys] sortedArrayUsingSelector:@selector(compare:)];
-        NSMutableArray *components = [NSMutableArray arrayWithCapacity:[dict count] * 2];
+        NSDictionary *dictionary = payload;
+        NSArray *keys = [dictionary.allKeys sortedArrayUsingSelector:@selector(compare:)];
+
+        NSMutableArray *components = [NSMutableArray arrayWithCapacity:dictionary.count * 2];
         [keys enumerateObjectsUsingBlock:^(id key, NSUInteger idx, BOOL *stop) {
             [components addObject:key];
 
             // alert[@"loc-args"] can be an NSArray
-            id value = dict[key];
+            id value = dictionary[key];
             if ([value isKindOfClass:[NSArray class]]) {
                 value = [value componentsJoinedByString:@""];
             }

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

@@ -101,7 +101,7 @@ + (instancetype)constructorWithDataSource:(id<PFInstallationIdentifierStoreProvi
 
         //TODO (nlutsenko): Check for error here.
         NSNumber *fileSize = [PFInternalUtils fileSizeOfFileAtPath:contentFilePath error:nil];
-        [request setValue:[fileSize stringValue] forHTTPHeaderField:PFHTTPRequestHeaderNameContentLength];
+        [request setValue:fileSize.stringValue forHTTPHeaderField:PFHTTPRequestHeaderNameContentLength];
 
         return request;
     }];

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

@@ -239,7 +239,7 @@ - (BFTask *)_performCommandRunningBlock:(nonnull id (^)())block
             return task;
         }
 
-        if ([[task.error userInfo][@"temporary"] boolValue] && attempts > 1) {
+        if ([task.error.userInfo[@"temporary"] boolValue] && attempts > 1) {
             PFLogError(PFLoggingTagCommon,
                        @"Network connection failed. Making attempt %lu after sleeping for %f seconds.",
                        (unsigned long)(_retryAttempts - attempts + 1), (double)delay);

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

@@ -104,7 +104,7 @@ - (void)_openDataOutputStream {
 }
 
 - (void)_writeDataOutputStreamData:(NSData *)data {
-    NSInteger length = [data length];
+    NSInteger length = data.length;
     while (YES) {
         NSInteger bytesWritten = 0;
         if ([self.dataOutputStream hasSpaceAvailable]) {

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

@@ -55,7 +55,7 @@ - (void)_taskDidFinish {
         errorDictionary[NSUnderlyingErrorKey] = self.error;
         errorDictionary[@"temporary"] = @(self.response.statusCode >= 500 || self.response.statusCode < 400);
 
-        NSString *description = [self.error localizedDescription] ?: [self.error localizedFailureReason];
+        NSString *description = self.error.localizedDescription ?: self.error.localizedFailureReason;
         if (description) {
             errorDictionary[@"error"] = description;
         }

Parse/Internal/Commands/PFRESTCommand.m

@@ -149,8 +149,8 @@ - (void)maybeChangeServerOperation {
         if (objectId) {
             self.localId = nil;
 
-            NSArray *components = [self.httpPath pathComponents];
-            if ([components count] == 2) {
+            NSArray *components = self.httpPath.pathComponents;
+            if (components.count == 2) {
                 self.httpPath = [NSString pathWithComponents:[components arrayByAddingObject:objectId]];
             }
 

Parse/Internal/Commands/PFRESTObjectBatchCommand.m

@@ -20,13 +20,13 @@ @implementation PFRESTObjectBatchCommand
 + (nonnull instancetype)batchCommandWithCommands:(nonnull NSArray PF_GENERIC(PFRESTCommand *)*)commands
                                     sessionToken:(nullable NSString *)sessionToken
                                        serverURL:(nonnull NSURL *)serverURL {
-    PFParameterAssert([commands count] <= PFRESTObjectBatchCommandSubcommandsLimit,
+    PFParameterAssert(commands.count <= PFRESTObjectBatchCommandSubcommandsLimit,
                       @"Max of %d commands are allowed in a single batch command",
                       (int)PFRESTObjectBatchCommandSubcommandsLimit);
 
-    NSMutableArray *requests = [NSMutableArray arrayWithCapacity:[commands count]];
+    NSMutableArray *requests = [NSMutableArray arrayWithCapacity:commands.count];
     for (PFRESTCommand *command in commands) {
-        NSURL *commandURL = [PFURLConstructor URLFromAbsoluteString:[serverURL absoluteString]
+        NSURL *commandURL = [PFURLConstructor URLFromAbsoluteString:serverURL.absoluteString
                                                                path:command.httpPath
                                                               query:nil];
         NSMutableDictionary *requestDictionary = [@{ @"method" : command.httpMethod,

Parse/Internal/Commands/PFRESTPushCommand.m

@@ -28,12 +28,12 @@ + (instancetype)sendPushCommandWithPushState:(PFPushState *)state
         parameters[@"where"] = queryParameters[@"where"];
     } else {
         if (state.channels) {
-            parameters[@"channels"] = [state.channels allObjects];
+            parameters[@"channels"] = state.channels.allObjects;
         }
     }
 
     // If there are no conditions set, then push to everyone by specifying empty query conditions.
-    if ([parameters count] == 0) {
+    if (parameters.count == 0) {
         parameters[@"where"] = @{};
     }
 

Parse/Internal/Commands/PFRESTQueryCommand.m

@@ -103,15 +103,15 @@ + (NSDictionary *)findCommandParametersWithOrder:(NSString *)order
                                   tracingEnabled:(BOOL)trace {
     NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
 
-    if ([order length]) {
+    if (order.length) {
         parameters[@"order"] = order;
     }
     if (selectedKeys) {
         NSArray *sortDescriptors = @[ [NSSortDescriptor sortDescriptorWithKey:@"self" ascending:YES selector:@selector(compare:)] ];
         NSArray *keysArray = [selectedKeys sortedArrayUsingDescriptors:sortDescriptors];
         parameters[@"keys"] = [keysArray componentsJoinedByString:@","];
     }
-    if ([includedKeys count] > 0) {
+    if (includedKeys.count > 0) {
         NSArray *sortDescriptors = @[ [NSSortDescriptor sortDescriptorWithKey:@"self" ascending:YES selector:@selector(compare:)] ];
         NSArray *keysArray = [includedKeys sortedArrayUsingDescriptors:sortDescriptors];
         parameters[@"include"] = [keysArray componentsJoinedByString:@","];
@@ -130,7 +130,7 @@ + (NSDictionary *)findCommandParametersWithOrder:(NSString *)order
         parameters[key] = obj;
     }];
 
-    if ([conditions count] > 0) {
+    if (conditions.count > 0) {
         NSMutableDictionary *whereData = [[NSMutableDictionary alloc] init];
         [conditions enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
             if ([key isEqualToString:@"$or"]) {
@@ -154,7 +154,7 @@ + (NSDictionary *)findCommandParametersWithOrder:(NSString *)order
                                                                     tracingEnabled:NO];
 
                     queryDict = queryDict[@"where"];
-                    if ([queryDict count] > 0) {
+                    if (queryDict.count > 0) {
                         [newArray addObject:queryDict];
                     } else {
                         [newArray addObject:@{}];

Parse/Internal/FieldOperation/PFFieldOperation.m

@@ -238,7 +238,7 @@ - (instancetype)initWithObjects:(NSArray *)array {
     self = [super init];
     if (!self) return nil;
 
-    _objects = [[NSSet setWithArray:array] allObjects];
+    _objects = [NSSet setWithArray:array].allObjects;
 
     return self;
 }
@@ -294,7 +294,7 @@ - (id)applyToValue:(id)oldValue forKey:(NSString *)key {
                 if (index == NSNotFound) {
                     [newValue addObject:objectToAdd];
                 } else {
-                    [newValue replaceObjectAtIndex:index withObject:objectToAdd];
+                    newValue[index] = objectToAdd;
                 }
             } else if (![newValue containsObject:objectToAdd]) {
                 [newValue addObject:objectToAdd];
@@ -372,7 +372,7 @@ - (id)applyToValue:(id)oldValue forKey:(NSString *)key {
                     return ([obj isKindOfClass:[PFObject class]] &&
                             [[obj objectId] isEqualToString:[objectToRemove objectId]]);
                 }];
-                if ([indexes count] != 0) {
+                if (indexes.count != 0) {
                     [newValue removeObjectsAtIndexes:indexes];
                 }
             }
@@ -405,7 +405,7 @@ - (instancetype)init {
 + (instancetype)addRelationToObjects:(NSArray *)targets {
     PFRelationOperation *op = [[self alloc] init];
     if (targets.count > 0) {
-        op.targetClass = [[targets firstObject] parseClassName];
+        op.targetClass = [targets.firstObject parseClassName];
     }
 
     for (PFObject *target in targets) {