WIP

Author: Brennan Stehling

AWSS3/AWSS3TransferUtility.m

@@ -290,14 +290,14 @@ - (instancetype)initWithConfiguration:(AWSServiceConfiguration *)serviceConfigur
                                             delegateQueue:nil];
 
         //If not able to create the session, call completion handler with error and return nil.
-        if (!_session ) {
+        if (!_session) {
             NSString* message = [NSString stringWithFormat:@"Failed to create a NSURLSession for [%@]", _sessionIdentifier];
             NSDictionary *userInfo = [NSDictionary dictionaryWithObject:message
                                                                  forKey:@"Message"];
             NSError *error = [NSError errorWithDomain:AWSS3TransferUtilityErrorDomain
                                                  code:AWSS3TransferUtilityErrorClientError
                                              userInfo:userInfo];
-            if (completionHandler ) {
+            if (completionHandler) {
                 completionHandler(error);
             }
             return nil;
@@ -307,7 +307,7 @@ - (instancetype)initWithConfiguration:(AWSServiceConfiguration *)serviceConfigur
         _configuration = [serviceConfiguration copy];
         [_configuration addUserAgentProductToken:AWSS3TransferUtilityUserAgent];
 
-        if (transferUtilityConfiguration  ) {
+        if (transferUtilityConfiguration) {
             _transferUtilityConfiguration = [transferUtilityConfiguration copy];
         }
         else {
@@ -363,15 +363,15 @@ - (void) hydrateFromDB:(NSMutableDictionary *) tempMultiPartMasterTaskDictionary
     NSMutableArray *tasks = [AWSS3TransferUtilityDatabaseHelper getTransferTaskDataFromDB:_sessionIdentifier databaseQueue:_databaseQueue];
 
     //Iterate through the tasks and populate transferRequests and Multipart dictionary.
-    for( NSMutableDictionary *task in tasks ) {
+    for( NSMutableDictionary *task in tasks) {
         NSString *transferType = [task objectForKey:@"transfer_type"];
         int sessionTaskID = [[task objectForKey:@"session_task_id"] intValue];
 
         if ([transferType isEqualToString:@"UPLOAD"]) {
             AWSS3TransferUtilityUploadTask *transferUtilityUploadTask = [self hydrateUploadTask:task sessionIdentifier:self.sessionIdentifier databaseQueue:self.databaseQueue];
 
             //If task is completed, no more processing is required.
-            if (transferUtilityUploadTask.status == AWSS3TransferUtilityTransferStatusCompleted ) {
+            if (transferUtilityUploadTask.status == AWSS3TransferUtilityTransferStatusCompleted) {
                 [self.completedTaskDictionary setObject:transferUtilityUploadTask forKey:transferUtilityUploadTask.transferID];
                 [AWSS3TransferUtilityDatabaseHelper deleteTransferRequestFromDB:transferUtilityUploadTask.transferID databaseQueue:self.databaseQueue];
                 continue;
@@ -384,7 +384,7 @@ - (void) hydrateFromDB:(NSMutableDictionary *) tempMultiPartMasterTaskDictionary
             AWSS3TransferUtilityDownloadTask *transferUtilityDownloadTask = [self hydrateDownloadTask:task sessionIdentifier:self.sessionIdentifier databaseQueue:self.databaseQueue];
 
             //If task is completed, no more processing is required.
-            if (transferUtilityDownloadTask.status == AWSS3TransferUtilityTransferStatusCompleted ) {
+            if (transferUtilityDownloadTask.status == AWSS3TransferUtilityTransferStatusCompleted) {
                 [self.completedTaskDictionary setObject:transferUtilityDownloadTask forKey:transferUtilityDownloadTask.transferID];
                 [AWSS3TransferUtilityDatabaseHelper deleteTransferRequestFromDB:transferUtilityDownloadTask.transferID databaseQueue:self.databaseQueue];
                 continue;
@@ -416,7 +416,7 @@ - (void) hydrateFromDB:(NSMutableDictionary *) tempMultiPartMasterTaskDictionary
 
             //Get the Master MultiPart record from the Dictionary.
             AWSS3TransferUtilityMultiPartUploadTask *multiPartUploadTask = [tempMultiPartMasterTaskDictionary objectForKey:subTask.uploadID];
-            if ( !multiPartUploadTask ) {
+            if ( !multiPartUploadTask) {
                 //Couldn't find the multipart upload master record. Must be an orphan part record. Clean up the DB and continue.
                 [AWSS3TransferUtilityDatabaseHelper deleteTransferRequestFromDB:subTask.transferID databaseQueue:self.databaseQueue];
                 continue;
@@ -441,7 +441,7 @@ - (void) linkTransfersToNSURLSession:(NSMutableDictionary *) tempMultiPartMaster
     [self.session getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
 
         //Loop through all the upload Tasks.
-        for( NSURLSessionUploadTask *task in uploadTasks ) {
+        for( NSURLSessionUploadTask *task in uploadTasks) {
             AWSDDLogDebug(@"Iterating through task Identifier [%lu]", (unsigned long)task.taskIdentifier);
             NSError *taskError = [task error];
 
@@ -495,7 +495,7 @@ - (void) linkTransfersToNSURLSession:(NSMutableDictionary *) tempMultiPartMaster
         }
 
         //Loop through all the Download tasks
-        for( NSURLSessionDownloadTask *task in downloadTasks ) {
+        for( NSURLSessionDownloadTask *task in downloadTasks) {
             id obj = [tempTransferDictionary objectForKey:@(task.taskIdentifier)];
             NSError *taskError = [task error];
 
@@ -594,7 +594,7 @@ - (void)handleUnlinkedTransfers:(NSMutableDictionary *)tempMultiPartMasterTaskDi
         {
             AWSS3TransferUtilityUploadTask *transferUtilityUploadTask = obj;
 
-            if (transferUtilityUploadTask.status == AWSS3TransferUtilityTransferStatusCompleted ) {
+            if (transferUtilityUploadTask.status == AWSS3TransferUtilityTransferStatusCompleted) {
                 [self.completedTaskDictionary setObject:transferUtilityUploadTask forKey:transferUtilityUploadTask.transferID];
 
                 //Delete the transfer record from the DB
@@ -626,7 +626,7 @@ - (void)handleUnlinkedTransfers:(NSMutableDictionary *)tempMultiPartMasterTaskDi
         else if ([obj isKindOfClass:[AWSS3TransferUtilityDownloadTask class]]) {
             AWSS3TransferUtilityDownloadTask *downloadTask = obj;
 
-            if (downloadTask.status == AWSS3TransferUtilityTransferStatusCompleted ) {
+            if (downloadTask.status == AWSS3TransferUtilityTransferStatusCompleted) {
                 [self.completedTaskDictionary setObject:downloadTask forKey:downloadTask.transferID];
                 [AWSS3TransferUtilityDatabaseHelper deleteTransferRequestFromDB:downloadTask.transferID taskIdentifier:[taskIdentifier integerValue] databaseQueue:self.databaseQueue];
                 AWSDDLogDebug(@"Deleted transfer request from DB");
@@ -929,7 +929,7 @@ - (NSURLSessionUploadTask *)getURLSessionUploadTaskWithRequest:(NSURLRequest *)
     return [[self.preSignedURLBuilder getPreSignedURL:getPreSignedURLRequest] continueWithBlock:^id(AWSTask *task) {
         NSURL *presignedURL = task.result;
         NSError *error = task.error;
-        if ( error ) {
+        if (error) {
             AWSDDLogError(@"Error: %@", error);
             return [AWSTask taskWithError:error];
         }
@@ -1173,7 +1173,7 @@ - (void) retryUpload: (AWSS3TransferUtilityUploadTask *) transferUtilityUploadTa
         AWSS3CreateMultipartUploadOutput *output = task.result;
 
         //Check if the uploadId is null to safeguard from crash reported in https://github.com/aws/aws-sdk-ios/issues/1060
-        if (output.uploadId == (id) [NSNull null] || output.uploadId.length == 0 ) {
+        if (output.uploadId == (id) [NSNull null] || output.uploadId.length == 0) {
             AWSDDLogError(@"MultiPartUploadID is null - Failing Transfer");
             NSDictionary *userInfo = [NSDictionary dictionaryWithObject:@"MultiPartUploadID is null - Failing Transfer"
                                                                  forKey:@"Message"];
@@ -1485,7 +1485,7 @@ - (void)completeMultiPartForUploadTask:(AWSS3TransferUtilityMultiPartUploadTask
             transferUtilityMultiPartUploadTask.status = AWSS3TransferUtilityTransferStatusCompleted;
 
             transferUtilityMultiPartUploadTask.progress.completedUnitCount = transferUtilityMultiPartUploadTask.progress.totalUnitCount;
-            if (transferUtilityMultiPartUploadTask.expression.progressBlock ) {
+            if (transferUtilityMultiPartUploadTask.expression.progressBlock) {
                 transferUtilityMultiPartUploadTask.expression.progressBlock(transferUtilityMultiPartUploadTask, transferUtilityMultiPartUploadTask.progress);
             }
         }
@@ -2125,7 +2125,7 @@ - (void)URLSession:(NSURLSession *)session
             }
 
             //Mark status as completed if there is no error.
-            if (! uploadTask.error ) {
+            if (!uploadTask.error) {
                 uploadTask.status = AWSS3TransferUtilityTransferStatusCompleted;
                 //Set progress to 100% and call the progress block
                 uploadTask.progress.completedUnitCount = uploadTask.progress.totalUnitCount;
@@ -2222,7 +2222,7 @@ - (void)URLSession:(NSURLSession *)session
             downloadTask.error = error;
         }
 
-        if (!downloadTask.error ) {
+        if (!downloadTask.error) {
             downloadTask.status = AWSS3TransferUtilityTransferStatusCompleted;
         }
         else {
@@ -2354,7 +2354,7 @@ - (void)URLSession:(NSURLSession *)session
             totalSentSoFar += aSubTask.totalBytesSent;
         }
 
-        if (transferUtilityMultiPartUploadTask.progress.completedUnitCount != totalSentSoFar ) {
+        if (transferUtilityMultiPartUploadTask.progress.completedUnitCount != totalSentSoFar) {
             transferUtilityMultiPartUploadTask.progress.totalUnitCount = [transferUtilityMultiPartUploadTask.contentLength longLongValue];
             transferUtilityMultiPartUploadTask.progress.completedUnitCount = totalSentSoFar;