Merge pull request #552 from ParsePlatform/nlutsneko.modern.literal

nlutsenko · nlutsenko · commit 5d92277cdecc · 2015-11-12T18:50:23.000-08:00
Use ObjC literals for Dictionaries/Arrays.
diff --git a/Parse/Internal/ACL/State/PFACLState.m b/Parse/Internal/ACL/State/PFACLState.m
@@ -32,7 +32,7 @@ - (instancetype)init {
     self = [super init];
     if (!self) return nil;
 
-    _permissions = [NSDictionary dictionary];
+    _permissions = @{};
     _shared = NO;
 
     return self;
diff --git a/Parse/Internal/Analytics/Utilities/PFAnalyticsUtilities.m b/Parse/Internal/Analytics/Utilities/PFAnalyticsUtilities.m
@@ -24,7 +24,7 @@ + (NSString *)md5DigestFromPushPayload:(id)payload {
             [components addObject:key];
 
             // alert[@"loc-args"] can be an NSArray
-            id value = [dict objectForKey:key];
+            id value = dict[key];
             if ([value isKindOfClass:[NSArray class]]) {
                 value = [value componentsJoinedByString:@""];
             }
diff --git a/Parse/Internal/Commands/PFRESTQueryCommand.m b/Parse/Internal/Commands/PFRESTQueryCommand.m
@@ -157,7 +157,7 @@ + (NSDictionary *)findCommandParametersWithOrder:(NSString *)order
                     if ([queryDict count] > 0) {
                         [newArray addObject:queryDict];
                     } else {
-                        [newArray addObject:[NSDictionary dictionary]];
+                        [newArray addObject:@{}];
                     }
                 }
                 whereData[key] = newArray;
diff --git a/Parse/Internal/FieldOperation/PFFieldOperation.m b/Parse/Internal/FieldOperation/PFFieldOperation.m
@@ -420,7 +420,7 @@ + (instancetype)addRelationToObjects:(NSArray *)targets {
 + (instancetype)removeRelationToObjects:(NSArray *)targets {
     PFRelationOperation *operation = [[self alloc] init];
     if (targets.count > 0) {
-        operation.targetClass = [[targets objectAtIndex:0] parseClassName];
+        operation.targetClass = [targets[0] parseClassName];
     }
 
     for (PFObject *target in targets) {
diff --git a/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m b/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m
@@ -181,7 +181,7 @@ - (BFTask *)fetchObjectLocallyAsync:(PFObject *)object database:(PFSQLiteDatabas
                 NSString *query = [NSString stringWithFormat:@"SELECT %@ FROM %@ WHERE %@ = ?;",
                                    PFOfflineStoreKeyOfJSON, PFOfflineStoreTableOfObjects, PFOfflineStoreKeyOfUUID];
                 return [database executeQueryAsync:query
-                              withArgumentsInArray:[NSArray arrayWithObjects:uuid, nil]];
+                              withArgumentsInArray:@[ uuid ]];
             }] continueWithSuccessBlock:^id(BFTask *task) {
                 PFSQLiteDatabaseResult *result = task.result;
                 if (![result next]) {
diff --git a/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m b/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m
@@ -154,7 +154,7 @@ - (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId {
     // If there's an objectId in memory, make sure it matches the one in the
     // file. This is in case the id was retained on disk *after* it was resolved.
     if (!entry.objectId) {
-        NSString *objectId = [_inMemoryCache objectForKey:localId];
+        NSString *objectId = _inMemoryCache[localId];
         if (objectId) {
             entry.objectId = objectId;
             if (entry.referenceCount > 0) {
@@ -250,7 +250,7 @@ - (void)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId {
  */
 - (NSString *)objectIdForLocalId:(NSString *)localId {
     @synchronized (_lock) {
-        NSString *objectId = [_inMemoryCache objectForKey:localId];
+        NSString *objectId = _inMemoryCache[localId];
         if (objectId) {
             return objectId;
         }
diff --git a/Parse/Internal/PFErrorUtilities.m b/Parse/Internal/PFErrorUtilities.m
@@ -29,9 +29,9 @@ + (NSError *)errorFromResult:(NSDictionary *)result {
 }
 
 + (NSError *)errorFromResult:(NSDictionary *)result shouldLog:(BOOL)shouldLog {
-    NSInteger errorCode = [[result objectForKey:@"code"] integerValue];
+    NSInteger errorCode = [result[@"code"] integerValue];
 
-    NSString *errorExplanation = [result objectForKey:@"error"];
+    NSString *errorExplanation = result[@"error"];
 
     if (shouldLog) {
         PFLogError(PFLoggingTagCommon,
diff --git a/Parse/Internal/PFInternalUtils.m b/Parse/Internal/PFInternalUtils.m
@@ -168,7 +168,7 @@ + (void)appendDictionary:(NSDictionary *)dictionary toString:(NSMutableString *)
     for (NSString *key in keys) {
         [string appendFormat:@"%@:", key];
 
-        id value = [dictionary objectForKey:key];
+        id value = dictionary[key];
         [self appendObject:value toString:string];
 
         [string appendString:@","];
diff --git a/Parse/Internal/Purchase/PaymentTransactionObserver/PFPaymentTransactionObserver.m b/Parse/Internal/Purchase/PaymentTransactionObserver/PFPaymentTransactionObserver.m
@@ -68,7 +68,7 @@ - (void)completeTransaction:(SKPaymentTransaction *)transaction fromPaymentQueue
     }
 
     @synchronized(runOnceLockObj) {
-        void(^runOnceBlock)(NSError *) = (void(^)(NSError *))[self.runOnceBlocks objectForKey:productIdentifier];
+        void(^runOnceBlock)(NSError *) = (void(^)(NSError *))self.runOnceBlocks[productIdentifier];
         if (runOnceBlock) {
             runOnceBlock(transaction.error);
             [self.runOnceBlocks removeObjectForKey:productIdentifier];
diff --git a/Parse/Internal/Query/Utilities/PFQueryUtilities.m b/Parse/Internal/Query/Utilities/PFQueryUtilities.m
@@ -68,7 +68,7 @@ + (NSPredicate *)_negatePredicate:(NSPredicate *)predicate {
                  compoundBlock:^NSPredicate *(NSCompoundPredicate *compound) {
                      switch (compound.compoundPredicateType) {
                          case NSNotPredicateType: {
-                             return [compound.subpredicates objectAtIndex:0];
+                             return compound.subpredicates[0];
                          }
                          case NSAndPredicateType: {
                              NSMutableArray *newSubpredicates =
@@ -176,7 +176,7 @@ + (NSPredicate *)removeNegation:(NSPredicate *)predicate {
                      // If this is a NOT predicate, return the negation of the subpredicate.
                      // Otherwise, just pass it on.
                      if (compound.compoundPredicateType == NSNotPredicateType) {
-                         return [self _negatePredicate:[newSubpredicates objectAtIndex:0]];
+                         return [self _negatePredicate:newSubpredicates[0]];
                      } else {
                          return [[NSCompoundPredicate alloc] initWithType:compound.compoundPredicateType
                                                             subpredicates:newSubpredicates];
diff --git a/Parse/PFObject.m b/Parse/PFObject.m
@@ -1163,7 +1163,7 @@ - (void)performOperation:(PFFieldOperation *)operation forKey:(NSString *)key {
     @synchronized (lock) {
         [_estimatedData applyFieldOperation:operation forKey:key];
 
-        PFFieldOperation *oldOperation = [[self unsavedChanges] objectForKey:key];
+        PFFieldOperation *oldOperation = [self unsavedChanges][key];
         PFFieldOperation *newOperation = [operation mergeWithPrevious:oldOperation];
         [[self unsavedChanges] setObject:newOperation forKey:key];
         [_availableKeys addObject:key];
@@ -1969,7 +1969,7 @@ - (BOOL)isDirty {
 
 - (BOOL)isDirtyForKey:(NSString *)key {
     @synchronized (lock) {
-        return !![[self unsavedChanges] objectForKey:key];
+        return [self unsavedChanges][key] != nil;
     }
 }
 
@@ -2190,7 +2190,7 @@ - (id)objectForKeyedSubscript:(NSString *)key {
 
 - (void)removeObjectForKey:(NSString *)key {
     @synchronized (lock) {
-        if ([self objectForKey:key]) {
+        if (self[key]) {
             PFDeleteOperation *operation = [[PFDeleteOperation alloc] init];
             [self performOperation:operation forKey:key];
         }
diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m
@@ -63,7 +63,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         // In that case, we skip tracking here to avoid double counting the app-open.
         BOOL preBackgroundPush = ![application respondsToSelector:@selector(backgroundRefreshStatus)];
         BOOL oldPushHandlerOnly = ![self respondsToSelector:@selector(application:didReceiveRemoteNotification:fetchCompletionHandler:)];
-        BOOL noPushPayload = ![launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+        BOOL noPushPayload = !launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
         if (preBackgroundPush || oldPushHandlerOnly || noPushPayload) {
             [PFAnalytics trackAppOpenedWithLaunchOptions:launchOptions];
         }
diff --git a/Tests/Unit/KeychainStoreTests.m b/Tests/Unit/KeychainStoreTests.m
@@ -75,9 +75,9 @@ - (void)testSetGetComplexObject {
     NSArray *retrievedComplexObject = self.testStore[@"complexObject"];
     XCTAssertTrue([retrievedComplexObject isKindOfClass:[NSArray class]], @"Complex object should properly retrieve");
 
-    for (NSUInteger i = 0; i < [retrievedComplexObject count]; i++) {
-        id object = [complexObject objectAtIndex:i];
-        id retrievedObject = [retrievedComplexObject objectAtIndex:i];
+    for (NSUInteger i = 0; i < retrievedComplexObject.count; i++) {
+        id object = complexObject[i];
+        id retrievedObject = retrievedComplexObject[i];
 
         XCTAssertTrue([object isEqual:retrievedObject],
                      @"Keychain store should properly retrieve objects of class - %@", [object class]);
diff --git a/Tests/Unit/ObjectLocalIdStoreTests.m b/Tests/Unit/ObjectLocalIdStoreTests.m
@@ -142,7 +142,7 @@ - (void)testLongSerialization {
 
     NSDictionary *parsed = [PFJSONSerialization JSONObjectFromString:json];
     object = [[PFDecoder objectDecoder] decodeObject:parsed];
-    long long actual = [[object objectForKey:@"hugeNumber"] longLongValue];
+    long long actual = [object[@"hugeNumber"] longLongValue];
     XCTAssertEqual(expected, actual, @"The number should be parsed correctly.");
 }
 
diff --git a/Tests/Unit/ObjectSubclassPropertiesTests.m b/Tests/Unit/ObjectSubclassPropertiesTests.m
@@ -86,12 +86,12 @@ + (NSString *)parseClassName {
 
 - (NSString *)stringWithNativeAccessor {
     usedNativeAccessor = YES;
-    return [self objectForKey:@"stringWithNativeAccessor"];
+    return self[@"stringWithNativeAccessor"];
 }
 
 - (void)setStringWithNativeMutator:(NSString *)aString {
     usedNativeMutator = YES;
-    [self setObject:aString forKey:@"stringWithNativeMutator"];
+    self[@"stringWithNativeMutator"] = aString;
 }
 @end
 
@@ -130,7 +130,7 @@ - (void)testDynamicObjectProperties {
 
     NSString *idValue = @"foo";
     object.idProperty = idValue;
-    XCTAssertEqualObjects(@"foo", [object objectForKey:@"idProperty"]);
+    XCTAssertEqualObjects(@"foo", object[@"idProperty"]);
     XCTAssertEqualObjects(@"foo", object.idProperty);
     XCTAssertEqual(idValue, object.idProperty, @"Should use retain semantics");
 }
@@ -151,38 +151,38 @@ - (void)testBoxedIntegerProperties {
 
     // Boxed primitives
     object.shortProperty = 1;
-    XCTAssertEqualObjects(@1, [object objectForKey:@"shortProperty"]);
+    XCTAssertEqualObjects(@1, object[@"shortProperty"]);
     XCTAssertEqual((short)1, object.shortProperty);
 
     object.ushortProperty = 2;
-    XCTAssertEqualObjects(@2, [object objectForKey:@"ushortProperty"]);
+    XCTAssertEqualObjects(@2, object[@"ushortProperty"]);
     XCTAssertEqual((unsigned short)2, object.ushortProperty);
 
     object.intProperty = 3;
-    XCTAssertEqualObjects(@3, [object objectForKey:@"intProperty"]);
+    XCTAssertEqualObjects(@3, object[@"intProperty"]);
     XCTAssertEqual((int)3, object.intProperty);
 
     object.uintProperty = 4;
-    XCTAssertEqualObjects(@4, [object objectForKey:@"uintProperty"]);
+    XCTAssertEqualObjects(@4, object[@"uintProperty"]);
     XCTAssertEqual((unsigned int)4, object.uintProperty);
 
     object.longProperty = 5;
-    XCTAssertEqualObjects(@5, [object objectForKey:@"longProperty"]);
+    XCTAssertEqualObjects(@5, object[@"longProperty"]);
     XCTAssertEqual((long)5, object.longProperty);
 
     object.ulongProperty = 6;
-    XCTAssertEqualObjects(@6, [object objectForKey:@"ulongProperty"]);
+    XCTAssertEqualObjects(@6, object[@"ulongProperty"]);
     XCTAssertEqual((unsigned long)6, object.ulongProperty);
 }
 
 - (void)testBoxedFloatingPointProperties {
     PFTestObject *object = [[PFTestObject alloc] initWithClassName:@"Test"];
     object.floatProperty = 1.5;
-    XCTAssertEqualObjects(@1.5f, [object objectForKey:@"floatProperty"]);
+    XCTAssertEqualObjects(@1.5f, object[@"floatProperty"]);
     XCTAssertEqual(1.5f, object.floatProperty);
 
     object.doubleProperty = 1.75;
-    XCTAssertEqualObjects(@1.75, [object objectForKey:@"doubleProperty"]);
+    XCTAssertEqualObjects(@1.75, object[@"doubleProperty"]);
     XCTAssertEqual(1.75, object.doubleProperty);
 }
 
@@ -191,7 +191,7 @@ - (void)testBoxedBooleanProperties {
 
     object.boolProperty = YES;
     XCTAssertTrue(object.boolProperty);
-    XCTAssertEqualObjects(@YES, [object objectForKey:@"boolProperty"]);
+    XCTAssertEqualObjects(@YES, object[@"boolProperty"]);
     object.boolProperty = NO;
 
     // HOORAY! Boxing makes if statements work like most users expect they would
@@ -203,15 +203,15 @@ - (void)testShortNameProperties {
 
     object.x = 1;
     XCTAssertEqual(object.x, 1);
-    XCTAssertEqualObjects(@1, [object objectForKey:@"x"]);
+    XCTAssertEqualObjects(@1, object[@"x"]);
 }
 
 - (void)testPascalCaseProperties {
     PFTestObject *object = [[PFTestObject alloc] initWithClassName:@"Test"];
 
     object.PascalCaseProperty = 1;
     XCTAssertEqual(object.PascalCaseProperty, 1);
-    XCTAssertEqualObjects(@1, [object objectForKey:@"PascalCaseProperty"]);
+    XCTAssertEqualObjects(@1, object[@"PascalCaseProperty"]);
 }
 
 - (void)testIvarObjectProperties {
@@ -223,7 +223,7 @@ - (void)testIvarObjectProperties {
     object.ivarId = @"World!";
     XCTAssertEqualObjects(@"World!", object->ivarId);
 
-    XCTAssertNil([object objectForKey:@"ivarId"]);
+    XCTAssertNil(object[@"ivarId"]);
 }
 
 - (void)testIvarPrimitiveProperties {
@@ -235,7 +235,7 @@ - (void)testIvarPrimitiveProperties {
     object.ivarInt = 6;
     XCTAssertEqual(6, object->ivarInt);
 
-    XCTAssertNil([object objectForKey:@"ivarInt"]);
+    XCTAssertNil(object[@"ivarInt"]);
 
     // Test something that's not a bus width
     object->ivarShort = 42;
@@ -247,7 +247,7 @@ - (void)testIvarPrimitiveProperties {
     XCTAssertEqual((unsigned short)0xBABE, object->ivarShort);
 #pragma clang diagnostic pop
 
-    XCTAssertNil([object objectForKey:@"ivarShort"]);
+    XCTAssertNil(object[@"ivarShort"]);
 }
 
 - (void)testCXXBoolProperties {
diff --git a/Tests/Unit/SQLiteDatabaseTest.m b/Tests/Unit/SQLiteDatabaseTest.m

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ + (NSString *)md5DigestFromPushPayload:(id)payload {`
`24`	`24`	`[components addObject:key];`
`25`	`25`
`26`	`26`	`// alert[@"loc-args"] can be an NSArray`
`27`		`- id value = [dict objectForKey:key];`
	`27`	`+ id value = dict[key];`
`28`	`28`	`if ([value isKindOfClass:[NSArray class]]) {`
`29`	`29`	`value = [value componentsJoinedByString:@""];`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ + (NSDictionary )findCommandParametersWithOrder:(NSString )order`
`157`	`157`	`if ([queryDict count] > 0) {`
`158`	`158`	`[newArray addObject:queryDict];`
`159`	`159`	`} else {`
`160`		`- [newArray addObject:[NSDictionary dictionary]];`
	`160`	`+ [newArray addObject:@{}];`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`whereData[key] = newArray;`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ + (instancetype)addRelationToObjects:(NSArray *)targets {`
`420`	`420`	`+ (instancetype)removeRelationToObjects:(NSArray *)targets {`
`421`	`421`	`PFRelationOperation *operation = [[self alloc] init];`
`422`	`422`	`if (targets.count > 0) {`
`423`		`- operation.targetClass = [[targets objectAtIndex:0] parseClassName];`
	`423`	`+ operation.targetClass = [targets[0] parseClassName];`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`for (PFObject *target in targets) {`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ + (NSError )errorFromResult:(NSDictionary )result {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`+ (NSError )errorFromResult:(NSDictionary )result shouldLog:(BOOL)shouldLog {`
`32`		`- NSInteger errorCode = [[result objectForKey:@"code"] integerValue];`
	`32`	`+ NSInteger errorCode = [result[@"code"] integerValue];`
`33`	`33`
`34`		`- NSString *errorExplanation = [result objectForKey:@"error"];`
	`34`	`+ NSString *errorExplanation = result[@"error"];`
`35`	`35`
`36`	`36`	`if (shouldLog) {`
`37`	`37`	`PFLogError(PFLoggingTagCommon,`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ - (void)completeTransaction:(SKPaymentTransaction *)transaction fromPaymentQueue`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@synchronized(runOnceLockObj) {`
`71`		`- void(^runOnceBlock)(NSError ) = (void(^)(NSError ))[self.runOnceBlocks objectForKey:productIdentifier];`
	`71`	`+ void(^runOnceBlock)(NSError ) = (void(^)(NSError ))self.runOnceBlocks[productIdentifier];`
`72`	`72`	`if (runOnceBlock) {`
`73`	`73`	`runOnceBlock(transaction.error);`
`74`	`74`	`[self.runOnceBlocks removeObjectForKey:productIdentifier];`