Version 2 of the AWS Mobile SDK for iOS 2.0.11.

Author: Yosuke Matsuda

AWSCore/MobileAnalytics/AWSMobileAnalytics.m

@@ -102,18 +102,18 @@ - (AWSMobileAnalytics *)initWithAppId:(NSString *)appId
         _deliveryClient = [AWSMobileAnalyticsDefaultDeliveryClient deliveryClientWithContext:_mobileAnalyticsContext
                                                                              withWanDelivery:options.allowWANDelivery];
 
-        _eventClient = [AWSMobileAnalyticsDefaultEventClient eventClientWithContext:_mobileAnalyticsContext
-                                                                 withDeliveryClient:_deliveryClient
-                                                              allowsEventCollection:options.allowEventCollection];
+        _eventClient = [[AWSMobileAnalyticsDefaultEventClient alloc] initWithContext:_mobileAnalyticsContext
+                                                                  withDeliveryClient:_deliveryClient
+                                                               allowsEventCollection:options.allowEventCollection];
 
         id<AWSMobileAnalyticsInterceptor> reqTimingInterceptor = [[AWSMobileAnalyticsRequestTimingInterceptor alloc] initWithConnectivity:[_mobileAnalyticsContext.system connectivity]
                                                                                                                           withEventClient:(id<AWSMobileAnalyticsInternalEventClient>)_eventClient];
         [_mobileAnalyticsContext.httpClient addInterceptor:reqTimingInterceptor];
 
         // Session Client
-        _sessionClient = [AWSMobileAnalyticsDefaultSessionClient sessionClientWithEventClient:(id<AWSMobileAnalyticsInternalEventClient>)_eventClient
-                                                                           withDeliveryClient:_deliveryClient
-                                                                                  withContext:_mobileAnalyticsContext];
+        _sessionClient = [[AWSMobileAnalyticsDefaultSessionClient alloc] initWithEventClient:(id<AWSMobileAnalyticsInternalEventClient>)_eventClient
+                                                                          withDeliveryClient:_deliveryClient
+                                                                                 withContext:_mobileAnalyticsContext];
 
         // let the user do any final initialization
         if(completionBlock) {

AWSCore/MobileAnalytics/core/configuration/AWSMobileAnalyticsHttpCachingConfiguration.m

@@ -339,7 +339,7 @@ -(void) refresh
                                   withApplicationKey:(NSString*)appId
                                         withUniqueId:(NSString*)uniqueId
 {
-    id<AWSMobileAnalyticsRequest> configRequest = [client newRequest];
+    id<AWSMobileAnalyticsRequest> configRequest = [client freshRequest];
     NSString* url = [NSString stringWithFormat:CONFIG_URL_FORMAT, host, appId];
     [configRequest setUrl:[NSURL URLWithString:url]];
     [configRequest setMethod:GET];

AWSCore/MobileAnalytics/core/http/AWSMobileAnalyticsDefaultHttpClient.m

@@ -23,139 +23,144 @@
 #import "AWSLogging.h"
 #import "AWSMobileAnalyticsERS.h"
 
-NSString *const AWSMobileAnalyticsDefaultRunLoopMode = @"com.amazonaws.mobile-analytics.AWSMobileAnalyticsDefaultRunLoopMode";
+@interface AWSMobileAnalyticsDefaultHttpClient()
+
+@property (nonatomic, strong) NSMutableArray *interceptors;
+
+@end
 
 @implementation AWSMobileAnalyticsDefaultHttpClient
 
-+(AWSMobileAnalyticsDefaultHttpClient *) httpClient
-{
++ (AWSMobileAnalyticsDefaultHttpClient *)httpClient {
     return [[AWSMobileAnalyticsDefaultHttpClient alloc] init];
 }
 
--(id) init
-{
-    if(self = [super init])
-    {
-        self->_interceptors = [NSMutableArray array];
+- (id)init {
+    if(self = [super init]) {
+        _interceptors = [NSMutableArray array];
     }
     return self;
 }
 
--(void) addInterceptor: (id<AWSMobileAnalyticsInterceptor>) theInterceptor
-{
-    if(theInterceptor == nil)
-    {
+- (void)addInterceptor:(id<AWSMobileAnalyticsInterceptor>)theInterceptor {
+    if(theInterceptor == nil) {
         return;
     }
-    
-    [self->_interceptors addObject:theInterceptor];
+
+    [self.interceptors addObject:theInterceptor];
 }
 
--(id<AWSMobileAnalyticsRequest>) newRequest
-{
+- (id<AWSMobileAnalyticsRequest>)freshRequest {
     return [[AWSMobileAnalyticsDefaultRequest alloc] init];
 }
 
--(id<AWSMobileAnalyticsResponse>) execute:(id<AWSMobileAnalyticsRequest>) theRequest withRetries:(int) theRetries withTimeout:(NSTimeInterval) theTimeout
-{
-    return [self execute:theRequest withRetries:theRetries withTimeout:theTimeout withRetryHandler:nil];
+- (id<AWSMobileAnalyticsResponse>)execute:(id<AWSMobileAnalyticsRequest>)request
+                              withRetries:(int)retries
+                              withTimeout:(NSTimeInterval)timeout {
+    return [self execute:request
+             withRetries:retries
+             withTimeout:timeout
+        withRetryHandler:nil];
 }
 
--(id<AWSMobileAnalyticsResponse>) execute:(id<AWSMobileAnalyticsRequest>) theRequest withRetries:(int) theRetries withTimeout:(NSTimeInterval) theTimeout withRetryHandler:(RetryHandler) theRetryHandler
-{
+- (id<AWSMobileAnalyticsResponse>)execute:(id<AWSMobileAnalyticsRequest>)theRequest
+                              withRetries:(int)theRetries
+                              withTimeout:(NSTimeInterval)theTimeout
+                         withRetryHandler:(RetryHandler)theRetryHandler {
     __block AWSMobileAnalyticsDefaultResponse *response = [[AWSMobileAnalyticsDefaultResponse alloc] init];
-    if(theRequest == nil)
-    {
+    if(theRequest == nil) {
         response.originatingRequest = theRequest;
         response.code = 0;
         response.message = @"Nil request";
         return response;
     }
-    
+
     //Apply the interceptors to the built request
-    for(id<AWSMobileAnalyticsInterceptor> interceptor in self->_interceptors)
-    {
+    for(id<AWSMobileAnalyticsInterceptor> interceptor in self.interceptors) {
         [interceptor before:theRequest];
     }
-    
+
     AWSMobileAnalyticsERS *ers = self.ers;
-    if (ers == nil) {
-        AWSLogError( @"AWSMobileAnalyticsERS is nil! ");
+    if (ers == nil){
+        AWSLogError( @"AWSMobileAnalyticsERS is nil.");
     }
-    
+
     AWSMobileAnalyticsERSPutEventsInput *putEventInput = [AWSMobileAnalyticsERSPutEventsInput new];
-    
+
     //the client-Context-id in the header  should be moved to Client-Context
     NSString *clientContextString = [[theRequest headers] objectForKey:AWSMobileAnalyticsClientContextHeader];
     NSMutableDictionary *clientContextDic = [[NSJSONSerialization JSONObjectWithData: [clientContextString dataUsingEncoding:NSUTF8StringEncoding]
                                                                              options:kNilOptions
                                                                                error:NULL] mutableCopy];
-    if (clientContextDic && [clientContextDic isKindOfClass:[NSDictionary class]] && [[theRequest headers] objectForKey:INSTANCE_ID_HEADER_KEY]) {
+    if (clientContextDic
+        && [clientContextDic isKindOfClass:[NSDictionary class]]
+        && [[theRequest headers] objectForKey:INSTANCE_ID_HEADER_KEY]) {
         NSMutableDictionary *mutableClientDic = [clientContextDic[@"client"] mutableCopy];
         [mutableClientDic setObject:[[theRequest headers] objectForKey:INSTANCE_ID_HEADER_KEY] forKey:@"client_id"];
         [clientContextDic setObject:mutableClientDic forKey:@"client"];
     }
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:clientContextDic options:kNilOptions error:NULL];
+
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:clientContextDic
+                                                       options:kNilOptions
+                                                         error:NULL];
     if (jsonData) {
-        putEventInput.clientContext = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+        putEventInput.clientContext = [[NSString alloc] initWithData:jsonData
+                                                            encoding:NSUTF8StringEncoding];
     }
-    
-    
+
     //adapt the body
     if ([theRequest postBody]) {
         NSData *unzippedBody = [[theRequest postBody] gunzippedData];
         NSArray *sourceEventsArray = [NSJSONSerialization JSONObjectWithData:unzippedBody options:kNilOptions error:NULL];
         NSAssert([sourceEventsArray isKindOfClass:[NSArray class]] , @"invalid postBody: postBody should be an array");
-        
+
         NSMutableArray *parsedEventsArray = [NSMutableArray new];
         for (NSDictionary *event in sourceEventsArray) {
-            
+
             AWSMobileAnalyticsERSEvent *serviceEvent = [AWSMobileAnalyticsERSEvent new];
             AWSMobileAnalyticsERSSession *serviceSession = [AWSMobileAnalyticsERSSession new];
-            
+
             //process the attributes
             NSMutableDictionary *mutableAttributesDic = [event[@"attributes"] mutableCopy];
             NSMutableDictionary *mutableMetricsDic = [event[@"metrics"] mutableCopy];
             serviceEvent.version = mutableAttributesDic[@"ver"];
             [mutableAttributesDic removeObjectForKey:@"ver"];
-            
+
             serviceSession.id = mutableAttributesDic[AWSSessionIDAttributeKey];
             [mutableAttributesDic removeObjectForKey:AWSSessionIDAttributeKey];
-            
+
             serviceSession.startTimestamp = mutableAttributesDic[AWSSessionStartTimeAttributeKey];
             [mutableAttributesDic removeObjectForKey:AWSSessionStartTimeAttributeKey];
-            
+
             //move sessionStop time attribute session section
             serviceSession.stopTimestamp = mutableAttributesDic[AWSSessionEndTimeAttributeKey];
             [mutableAttributesDic removeObjectForKey:AWSSessionEndTimeAttributeKey];
-            
+
             //move session duration Time metrics to session section
             serviceSession.duration = mutableMetricsDic[AWSSessionDurationMetricKey];
             [mutableMetricsDic removeObjectForKey:AWSSessionDurationMetricKey];
-            
+
             serviceEvent.session = serviceSession;
             serviceEvent.attributes = mutableAttributesDic;
             serviceEvent.metrics = mutableMetricsDic;
-            
+
             //process others
             serviceEvent.eventType = event[@"event_type"];
-            serviceEvent.timestamp = [[NSDate date] aws_stringValue:AWSDateISO8601DateFormat3];
-        
-            
-            
+            serviceEvent.timestamp = event[@"timestamp"];
+
             [parsedEventsArray addObject:serviceEvent];
         }
         putEventInput.events = parsedEventsArray;
     }
-    
+
     //Attach the request to the response
     id<AWSMobileAnalyticsRequest> request = [[AWSMobileAnalyticsDefaultRequest alloc] init];
     [request setUrl:ers.configuration.URL];
     response.originatingRequest = request;
-    
+
     NSDate* requestStartDate = [NSDate date];
     [[[ers putEvents:putEventInput] continueWithBlock:^id(BFTask *task) {
-        
+
         NSDictionary *resultDictionary = nil;
         if (task.error) {
             response.error = task.error;
@@ -165,124 +170,55 @@ -(void) addInterceptor: (id<AWSMobileAnalyticsInterceptor>) theInterceptor
                 resultDictionary = task.result;
             }
         }
-        
+
         if (resultDictionary) {
             [[resultDictionary objectForKey:@"responseHeaders"] enumerateKeysAndObjectsUsingBlock:^(NSString *headerName, id headerValue, BOOL *stop) {
                 [response addHeader:headerValue withName:headerName];
             }];
             response.responseSize = [resultDictionary[@"responseDataSize"] longValue];
             response.code = [resultDictionary[@"responseStatusCode"] intValue];
         }
-        
+
         response.isFinishedLoading = YES;
-        
+
         // it may be possible for the timer that controls the connectionTimeout
         // to fire at the exact same as this method. To ensure a correct state,
         // reset the connection timeout since we truly did succeed if this method is
         // called. We do not process the connectionTimeout if this method
         // is called before the timer
         response.didConnectionTimeout = NO;
-        
+
         NSTimeInterval elapsedTime = [[NSDate date] timeIntervalSinceDate:requestStartDate];
         response.timeToComplete = elapsedTime;
-        
+
         response.requiredAttempts = 1;
         response.connectionTimeout = theTimeout;
-        
+
         return nil;
-        
-    }] waitUntilFinished ];
 
-    
-//    NSMutableURLRequest *request = [self buildRequest:theRequest withTimeout:theTimeout];
-//    
-//    int attempts = 1;
-//    int maxAttempts = (theRetries > 0) ? theRetries + 1 : 1;
-//    
-//    AWSLogDebug( @"Will attempt the request a maximum of %d times", maxAttempts);
-//    NSTimeInterval totalRequestTime = 0.0;
-//    while (attempts <= maxAttempts) {
-//        
-//        NSDate* requestStartDate = [NSDate date];
-//        AWSLogDebug( @"Attempt %d of %d", attempts, maxAttempts);
-//        
-//        //Attach the request to the response
-//        response.originatingRequest = theRequest;
-//        
-//        NSURLConnection *urlConnection = [[NSURLConnection alloc] initWithRequest:request
-//                                                                         delegate:response
-//                                                                 startImmediately:NO];
-//        //Schedule the urlConnection to run in the currentRunLoop
-//        [urlConnection scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:insightsDefaultRunLoopMode];
-//        
-//        //Start the request execution
-//        [urlConnection start];
-//        
-//        NSTimer *connectionTimeoutTimer = [NSTimer timerWithTimeInterval:theTimeout
-//                                                                  target:response
-//                                                                selector:@selector(processConnectionTimeout)
-//                                                                userInfo:nil
-//                                                                 repeats:NO];
-//        
-//        //Attach a timer to the currentRunLoop to timeout the execution of the request if necessary
-//        [[NSRunLoop currentRunLoop] addTimer:connectionTimeoutTimer forMode:insightsDefaultRunLoopMode];
-//        
-//        //Block while the request has not been completed. Do not block longer
-//        //than the timeout interval since a timer tick will not cause the
-//        //run loop blocking call to wake up
-//        NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:theTimeout];
-//        while (!response.isFinishedLoading) {
-//            [[NSRunLoop currentRunLoop] runMode:insightsDefaultRunLoopMode beforeDate:timeoutDate];
-//        }
-//        
-//        NSTimeInterval elapsedTime = [[NSDate date] timeIntervalSinceDate:requestStartDate];
-//        AWSLogDebug( @"Time of request %f", elapsedTime);
-//        totalRequestTime += elapsedTime;
-//        
-//        if (response.didTimeout) {
-//            // cancel current connection to ensure all resources are freed
-//            [urlConnection cancel];
-//        }
-//        
-//        // always invalidate the timer so that it is removed from the run loop
-//        [connectionTimeoutTimer invalidate];
-//        
-//        if (theRetryHandler != nil && theRetryHandler(response.code)) {
-//            attempts++;
-//        }
-//        else {
-//            break;
-//        }
-//        //If the request is going to be reattempted then create a new response object
-//        response = [[AWSMobileAnalyticsDefaultResponse alloc] init];
-//    }
-//    
-//    response.timeToComplete = totalRequestTime;
-//    response.requiredAttempts = attempts <= maxAttempts ? attempts : maxAttempts;
-//    response.connectionTimeout = theTimeout;
-    
-    for(id<AWSMobileAnalyticsInterceptor> interceptor in self->_interceptors)
-    {
+    }] waitUntilFinished];
+
+    for(id<AWSMobileAnalyticsInterceptor> interceptor in self.interceptors) {
         [interceptor after:response];
     }
-    
+
     return response;
 }
 
--(NSMutableURLRequest *) buildRequest:(id<AWSMobileAnalyticsRequest>) theOriginalRequest withTimeout:(NSTimeInterval) theTimeout
-{
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:theOriginalRequest.url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:theTimeout];
-    if(theOriginalRequest.method == GET)
-    {
+- (NSMutableURLRequest *)buildRequest:(id<AWSMobileAnalyticsRequest>)theOriginalRequest
+                          withTimeout:(NSTimeInterval)theTimeout {
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:theOriginalRequest.url
+                                                                cachePolicy:NSURLRequestReloadIgnoringLocalCacheData
+                                                            timeoutInterval:theTimeout];
+    if(theOriginalRequest.method == GET) {
         [request setHTTPMethod:@"GET"];
-    }
-    else if(theOriginalRequest.method == POST)
-    {
+    } else if(theOriginalRequest.method == POST) {
         [request setHTTPMethod:@"POST"];
     }
 
     [request setHTTPBody:theOriginalRequest.postBody];
     [request setAllHTTPHeaderFields:theOriginalRequest.headers];
+    
     return request;
 }