Add type to most array, set and dictionarry

Channel/Tests/EDOChannelPoolTest.m

@@ -56,7 +56,7 @@ - (void)testAsyncCreateChannels {
 
   for (int i = 0; i < 10; i++) {
     UInt16 port = i % 2 == 0 ? host1.socketPort.port : host2.socketPort.port;
-    NSMutableSet *set = i % 2 == 0 ? set1 : set2;
+    NSMutableSet<EDOSocketChannel *> *set = i % 2 == 0 ? set1 : set2;
     EDOHostPort *hostPort = [EDOHostPort hostPortWithLocalPort:port];
     id<EDOChannel> socketChannel = [channelPool channelWithPort:hostPort error:nil];
 

Device/Sources/EDODeviceConnector.m

@@ -35,7 +35,7 @@ @interface EDODeviceConnector ()
 /** The detector to detect iOS device attachment/detachment events. */
 @property(nonatomic) EDODeviceDetector *detector;
 /** The connected device info of mappings from device serial strings to auto-assigned device IDs. */
-@property(nonatomic) NSMutableDictionary *deviceInfo;
+@property(nonatomic) NSMutableDictionary<NSString*, NSNumber*>  *deviceInfo;
 @end
 
 @implementation EDODeviceConnector {
@@ -69,7 +69,7 @@ + (EDODeviceConnector *)sharedConnector {
     // Wait for a short time to detect all connected devices when listening just starts.
     sleep(kDeviceDetectTime);
   }
-  __block NSArray *result;
+  __block NSArray<NSString*> *result;
   dispatch_sync(_syncQueue, ^{
     result = [self.deviceInfo.allKeys copy];
   });
@@ -153,7 +153,7 @@ - (void)handleBroadcastPacket:(NSDictionary *)packet {
                                                       userInfo:userInfo];
   } else if ([messageType isEqualToString:kEDOMessageTypeDetachedKey]) {
     NSNumber *deviceID = packet[kEDOMessageDeviceIDKey];
-    NSMutableArray *keysToRemove = [[NSMutableArray alloc] init];
+    NSMutableArray<NSString*> *keysToRemove = [[NSMutableArray alloc] init];
     dispatch_sync(_syncQueue, ^{
       for (NSString *serialNumberString in self.deviceInfo) {
         if ([self.deviceInfo[serialNumberString] isEqualToNumber:deviceID]) {

Device/Tests/EDODeviceConnectorTest.m

@@ -34,7 +34,7 @@
 // Exposes the internal property for test purpose.
 @interface EDODeviceConnector ()
 @property(nonatomic) EDODeviceDetector *detector;
-@property(nonatomic) NSMutableDictionary *deviceInfo;
+@property(nonatomic) NSMutableDictionary<NSString*, NSNumber*> *deviceInfo;
 @end
 
 @interface EDODeviceConnectorTest : XCTestCase

Service/Sources/EDOHostService+Handlers.m

@@ -31,7 +31,7 @@ + (NSDictionary *)handlers {
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     handlers = [[NSMutableDictionary alloc] init];
-    NSArray *requestClasses = @[
+    NSArray<class> *requestClasses = @[
       [EDOClassRequest class],
       [EDOInvocationRequest class],
       [EDOMethodSignatureRequest class],

Service/Sources/EDOInvocationMessage.m

@@ -212,7 +212,7 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
                                           forKey:kEDOInvocationCoderReturnValueKey];
     _exception = [aDecoder decodeObjectOfClass:[EDORemoteException class]
                                         forKey:kEDOInvocationCoderExceptionKey];
-    NSSet *anyClasses =
+    NSSet<Class> *anyClasses =
         [NSSet setWithObjects:[EDOBlockObject class], [NSObject class], [EDOObject class], nil];
     _outValues = [aDecoder decodeObjectOfClasses:anyClasses forKey:kEDOInvocationCoderOutValuesKey];
   }
@@ -515,7 +515,7 @@ - (instancetype)initWithTarget:(EDOPointerType)target
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
   self = [super initWithCoder:aDecoder];
   if (self) {
-    NSSet *anyClasses =
+    NSSet<Class> *anyClasses =
         [NSSet setWithObjects:[EDOBlockObject class], [EDOObject class], [NSObject class], nil];
     _target = [aDecoder decodeInt64ForKey:kEDOInvocationCoderTargetKey];
     _selectorName = [aDecoder decodeObjectOfClass:[NSString class]
@@ -542,4 +542,4 @@ - (NSString *)description {
                                     self.messageID, self.target, self.selectorName];
 }
 
-@end
+@end

Service/Sources/EDOParameter.m

@@ -102,7 +102,7 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
     // EDOParameter can carry any type of object as long as it's serializable, so it whitelists all
     // the types inheriting from NSObject. EDOObject and EDOBlockObject are NSProxy's and need to be
     // whitelisted as well.
-    NSSet *anyClasses =
+    NSSet<Class> *anyClasses =
         [NSSet setWithObjects:[EDOBlockObject class], [EDOObject class], [NSObject class], nil];
     _value = [aDecoder decodeObjectOfClasses:anyClasses forKey:kEDOParameterCoderValueKey];
     _valueObjCType = [aDecoder decodeObjectOfClass:[NSString class]

Service/Tests/FunctionalTests/EDOServiceUIBlockTest.m

@@ -168,7 +168,7 @@ - (void)testBlockResolveToLocalAddress {
 - (void)testBlockByValueAndOutArgument {
   EDOTestDummy *remoteDummy = [EDOClientService rootObjectWithPort:EDOTEST_APP_SERVICE_PORT];
 
-  NSArray *arrayReturn = [remoteDummy returnWithBlockObject:^id(EDOTestDummy *dummy) {
+  NSArray<NSNumber*> *arrayReturn = [remoteDummy returnWithBlockObject:^id(EDOTestDummy *dummy) {
     // Use NSClassFromString to fetch EDOObject to make it private here.
     XCTAssertEqual([dummy class], NSClassFromString(@"EDOObject"));
     XCTAssertEqual(dummy.value, 10);

Service/Tests/FunctionalTests/EDOServiceUITest.m

@@ -401,17 +401,17 @@ - (void)testIsKindOfClassOnlyResolvesInSameProcess {
 - (void)testRemoteObjectCopy {
   [self launchApplicationWithPort:EDOTEST_APP_SERVICE_PORT initValue:5];
   EDOTestDummy *dummy = [EDOClientService rootObjectWithPort:EDOTEST_APP_SERVICE_PORT];
-  NSArray *remoteArray = [dummy returnArray];
-  NSArray *remoteArrayCopy;
+  NSArray<NSNumber*> *remoteArray = [dummy returnArray];
+  NSArra<NSNumber*>y *remoteArrayCopy;
   XCTAssertNoThrow(remoteArrayCopy = [remoteArray copy]);
   XCTAssertEqual(remoteArray, remoteArrayCopy);
 }
 
 - (void)testRemoteObjectMutableCopy {
   [self launchApplicationWithPort:EDOTEST_APP_SERVICE_PORT initValue:5];
   EDOTestDummy *dummy = [EDOClientService rootObjectWithPort:EDOTEST_APP_SERVICE_PORT];
-  NSArray *remoteArray = [dummy returnArray];
-  NSMutableArray *remoteArrayCopy = [remoteArray mutableCopy];
+  NSArray<NSNumber*> *remoteArray = [dummy returnArray];
+  NSMutableArray<NSNumber*> *remoteArrayCopy = [remoteArray mutableCopy];
   XCTAssertNotEqual(remoteArray, remoteArrayCopy);
   XCTAssertEqualObjects(remoteArray, remoteArrayCopy);
   [remoteArrayCopy addObject:@"test"];

Service/Tests/PerfTests/EDOServicePerfTest.m

@@ -194,7 +194,7 @@ - (void)testIteratingReturnByValueResultLotsTimes {
       assertPerformBlockWithWeight:1
                         executions:10
                              block:^(EDOTestDummy *remoteDummy) {
-                               NSArray *result = [[remoteDummy returnByValue] returnLargeArray];
+                               NSArray<NSNumber *>  *result = [[remoteDummy returnByValue] returnLargeArray];
                                for (NSInteger i = 0; i < 1000; i++) {
                                  XCTAssert(((NSNumber *)result[i]).integerValue == i);
                                }
@@ -203,7 +203,7 @@ - (void)testIteratingReturnByValueResultLotsTimes {
       [self assertPerformBlockWithWeight:1000
                               executions:10
                                    block:^(EDOTestDummy *remoteDummy) {
-                                     NSArray *result = [remoteDummy returnLargeArray];
+                                     NSArray<NSNumber *>  *result = [remoteDummy returnLargeArray];
                                      for (NSInteger i = 0; i < 1000; i++) {
                                        XCTAssert(((NSNumber *)result[i]).integerValue == i);
                                      }
@@ -212,7 +212,7 @@ - (void)testIteratingReturnByValueResultLotsTimes {
 }
 
 - (void)testIteratingPassByValueParameterLotsTimes {
-  NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:1000];
+  NSMutableArray<NSNumber *>  *array = [[NSMutableArray alloc] initWithCapacity:1000];
   for (int i = 0; i < 1000; i++) {
     [array addObject:@(i)];
   }

Service/Tests/TestsBundle/EDOTestDummy.h

@@ -123,8 +123,8 @@ typedef EDOTestDummy * (^EDOMultiTypesHandler)(EDOTestDummyStruct, int, id, EDOT
 - (BOOL)returnBoolWithError:(NSError **)errorOrNil;
 - (NSString *)returnClassNameWithObject:(id)object;
 - (NSInteger)returnCountWithArray:(NSArray *)value;
-- (NSInteger)returnSumWithArray:(NSArray *)value;
-- (NSInteger)returnSumWithArrayAndProxyCheck:(NSArray *)value;
+- (NSInteger)returnSumWithArray:(NSArray<NSNumber*> *)value;
+- (NSInteger)returnSumWithArrayAndProxyCheck:(NSArray<NSNumber*> *)value;
 - (int *)returnIntPointer;
 
 /**

Service/Tests/TestsBundle/EDOTestDummy.m

@@ -326,15 +326,15 @@ - (NSInteger)returnCountWithArray:(NSArray *)value {
   return value.count;
 }
 
-- (NSInteger)returnSumWithArray:(NSArray *)value {
+- (NSInteger)returnSumWithArray:(NSArray<NSNumber*> *)value {
   NSInteger result = 0;
   for (NSNumber *number in value) {
     result += number.integerValue;
   }
   return result;
 }
 
-- (NSInteger)returnSumWithArrayAndProxyCheck:(NSArray *)value {
+- (NSInteger)returnSumWithArrayAndProxyCheck:(NSArray<NSNumber*> *)value {
   NSAssert(!value.isProxy,
            @"This method is to test pass-by-value. The parameter should not be a proxy.");
   return [self returnSumWithArray:value];

Service/Tests/UnitTests/EDOServiceTest.m

@@ -693,9 +693,9 @@ - (void)testEDOEqual {
 
 - (void)testEDOAsDictKey {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSSet *returnSet = [dummyOnBackground returnSet];
-  NSArray *returnArray = [dummyOnBackground returnArray];
-  NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
+  NSSet<NSNumber *>  *returnSet = [dummyOnBackground returnSet];
+  NSArray<NSNumber *>  *returnArray = [dummyOnBackground returnArray];
+  NSMutableDictionary<NSString *, NSNumber *>  *dictionary = [[NSMutableDictionary alloc] init];
 
   XCTAssertNil(dictionary[returnSet]);
   XCTAssertNoThrow(dictionary[returnSet] = @1);
@@ -707,8 +707,8 @@ - (void)testEDOAsDictKey {
 
 - (void)testEDOAsCFDictKey {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSSet *returnSet = [dummyOnBackground returnSet];
-  NSArray *returnArray = [dummyOnBackground returnArray];
+  NSSet<NSNumber *> *returnSet = [dummyOnBackground returnSet];
+  NSArray<NSNumber *> *returnArray = [dummyOnBackground returnArray];
   CFMutableDictionaryRef cfDictionary = CFDictionaryCreateMutable(
       NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
@@ -751,8 +751,8 @@ - (void)testFailToEnableNonNSCodingTypetoBeValueType {
 
 - (void)testEDOReturnsAsValueType {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSArray *returnArray = [[dummyOnBackground returnByValue] returnArray];
-  NSArray *localArray = @[ @1, @2, @3, @4 ];
+  NSArray<NSNumber *> *returnArray = [[dummyOnBackground returnByValue] returnArray];
+  NSArray<NSNumber *> *localArray = @[ @1, @2, @3, @4 ];
   XCTAssertEqual([returnArray class], [localArray class]);
   XCTAssertTrue([returnArray isEqualToArray:localArray]);
 }
@@ -771,25 +771,25 @@ - (void)testEDOPassByValue {
 
 - (void)testEDOPassByValueWithRemoteObject {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSArray *array = [dummyOnBackground returnArray];
+  NSArray<NSNumber *> *array = [dummyOnBackground returnArray];
   XCTAssertEqual([dummyOnBackground returnCountWithArray:[array passByValue]], 4);
 }
 
 - (void)testEDOPassByValueNestedWithReturnByValue {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSArray *array = [dummyOnBackground returnArray];
+  NSArray<NSNumber *> *array = [dummyOnBackground returnArray];
   XCTAssertEqual([dummyOnBackground returnCountWithArray:[[array returnByValue] passByValue]], 4);
 }
 
 - (void)testEDOPassByValueNestedWithPassByValue {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSArray *array = [dummyOnBackground returnArray];
+  NSArray<NSNumber *> *array = [dummyOnBackground returnArray];
   XCTAssertEqual([dummyOnBackground returnCountWithArray:[[array passByValue] passByValue]], 4);
 }
 
 - (void)testEDOReturnByValueNestedWithPassByValue {
   EDOTestDummy *dummyOnBackground = self.rootObjectOnBackground;
-  NSArray *array = [dummyOnBackground returnArray];
+  NSArray<NSNumber *> *array = [dummyOnBackground returnArray];
   XCTAssertEqual([dummyOnBackground returnCountWithArray:[[array passByValue] returnByValue]], 4);
 }