Implemented event dispatcher and datafile manager default in core with the network service pulled in from the Shared module. Also fixed a broken OptimizelyManager test.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYBuilder.m

@@ -88,7 +88,7 @@ - (NSData *)datafile {
 
 - (id<OPTLYDatafileManager>)datafileManager {
     if (!_datafileManager) {
-        _datafileManager = [[OPTLYDatafileManagerNoOp alloc] init];
+        _datafileManager = [[OPTLYDatafileManagerDefault alloc] init];
     }
     return _datafileManager;
 }
@@ -102,7 +102,7 @@ - (NSData *)datafile {
 
 - (id<OPTLYEventDispatcher>)eventDispatcher {
     if (!_eventDispatcher) {
-        _eventDispatcher = [[OPTLYEventDispatcherBasic alloc] init];
+        _eventDispatcher = [[OPTLYEventDispatcherDefault alloc] init];
     }
     return _eventDispatcher;
 }

OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileManager.h

@@ -40,6 +40,10 @@
 
 @end
 
+@interface OPTLYDatafileManagerDefault : NSObject<OPTLYDatafileManager>
+
+@end
+
 @interface OPTLYDatafileManagerNoOp : NSObject<OPTLYDatafileManager>
 
 @end

OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileManager.m

@@ -15,6 +15,7 @@
  ***************************************************************************/
 
 #import "OPTLYDatafileManager.h"
+#import "OPTLYNetworkService.h"
 
 @implementation OPTLYDatafileManagerUtility
 
@@ -30,6 +31,16 @@ + (BOOL)conformsToOPTLYDatafileManagerProtocol:(Class)instanceClass {
 
 @end
 
+@implementation OPTLYDatafileManagerDefault
+
+- (void)downloadDatafile:(nonnull NSString *)projectId
+       completionHandler:(nullable void (^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))completion {
+    OPTLYNetworkService *networkService = [OPTLYNetworkService new];
+    [networkService downloadProjectConfig:projectId
+                        completionHandler:completion];
+}
+@end
+
 @implementation OPTLYDatafileManagerNoOp
 
 - (void)downloadDatafile:(nonnull NSString *)projectId

OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.h

@@ -47,11 +47,11 @@
 @end
 
 /**
- * OPTLYEventDispatcherBasic is a very simple implementation of the OPTLYEventDispatcher protocol.
+ * OPTLYEventDispatcherDefault is a very simple implementation of the OPTLYEventDispatcher protocol.
  * It dispatches events without any failure mechanisms (e.g., events are not queued up for a loater 
  * retry.
  */
-@interface OPTLYEventDispatcherBasic : NSObject <OPTLYEventDispatcher>
+@interface OPTLYEventDispatcherDefault : NSObject <OPTLYEventDispatcher>
 @end
 
 /**

OptimizelySDKCore/OptimizelySDKCore/OPTLYEventDispatcher.m

@@ -15,9 +15,10 @@
  ***************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import "OPTLYProjectConfig.h"
-#import "OPTLYEventDispatcher.h"
 #import "OPTLYErrorHandler.h"
+#import "OPTLYEventDispatcher.h"
+#import "OPTLYProjectConfig.h"
+#import "OPTLYNetworkService.h"
 
 static NSString * const kEventDispatcherImpressionEventURL   = @"https://logx.optimizely.com/log/decision";
 static NSString * const kEventDispatcherConversionEventURL   = @"https://logx.optimizely.com/log/event";
@@ -42,7 +43,7 @@ + (BOOL)conformsToOPTLYEventDispatcherProtocol:(Class)instanceClass
 
 @end
 
-@implementation OPTLYEventDispatcherBasic
+@implementation OPTLYEventDispatcherDefault
 
 - (void)dispatchImpressionEvent:(nonnull NSDictionary *)params
                        callback:(nullable void(^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))callback {
@@ -59,34 +60,11 @@ - (void)dispatchConversionEvent:(nonnull NSDictionary *)params
 
 - (void)dispatchEvent:(NSDictionary *)params
                 toURL:(NSURL *)url
-    completionHandler:(void(^)(NSData *data, NSURLResponse *response, NSError *error))completion
-{
-    NSURLSession *ephemeralSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration]];
-    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];
-    [request setHTTPMethod:kHTTPRequestMethodPost];
-    
-    NSError *JSONSerializationError = nil;
-    NSData *data = [NSJSONSerialization dataWithJSONObject:params
-                                                   options:kNilOptions
-                                                     error:&JSONSerializationError];
-    
-    [request addValue:kHTTPHeaderFieldValueApplicationJSON forHTTPHeaderField:kHTTPHeaderFieldContentType];
-    
-    if (!JSONSerializationError) {
-        NSURLSessionUploadTask *uploadTask = [ephemeralSession uploadTaskWithRequest:request
-                                                                            fromData:data
-                                                                   completionHandler:^(NSData *data,NSURLResponse *response,NSError *error) {
-                                                                       if (completion) {
-                                                                           completion(data, response, error);
-                                                                       }
-                                                                   }];
-        
-        [uploadTask resume];
-    }
+    completionHandler:(void(^)(NSData *data, NSURLResponse *response, NSError *error))completion {
+    OPTLYNetworkService *networkService = [OPTLYNetworkService new];
+    [networkService dispatchEvent:params toURL:url completionHandler:completion];
 }
 
-
-
 @end
 
 @implementation OPTLYEventDispatcherNoOp

OptimizelySDKCore/OptimizelySDKCore/OPTLYNetworkService.h

@@ -44,4 +44,14 @@ NS_ASSUME_NONNULL_END
                  lastModified:(nonnull NSString *)lastModifiedDate
             completionHandler:(nullable OPTLYHTTPRequestManagerResponse)completion;
 
+/**
+ * Dispatches an event to a url
+ * @param params Dictionary of the event parameter values
+ * @param url The url to dispatch the event
+ * @param completion The completion handler
+ */
+- (void)dispatchEvent:(nonnull NSDictionary *)params
+                toURL:(nonnull NSURL *)url
+    completionHandler:(nullable void(^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))completion;
+
 @end

OptimizelySDKCore/OptimizelySDKCore/OPTLYNetworkService.m

@@ -53,6 +53,18 @@ - (void)downloadProjectConfig:(NSString *)projectId completionHandler:(OPTLYHTTP
    }];
 }
 
+- (void)dispatchEvent:(nonnull NSDictionary *)params
+                toURL:(nonnull NSURL *)url
+    completionHandler:(nullable void(^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))completion
+{
+    OPTLYHTTPRequestManager *requestManager = [[OPTLYHTTPRequestManager alloc] initWithURL:url];
+    [requestManager POSTWithParameters:params completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        if (completion) {
+            completion(data, response, error);
+        }
+    }];
+}
+
 # pragma mark - Helper Methods
 
 - (NSURL *)projectConfigURLPath:(NSURL *)url

OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBuilder.m

@@ -44,7 +44,7 @@ - (id)initWithBlock:(OPTLYManagerBuilderBlock)block {
 
 - (id<OPTLYDatafileManager>)datafileManager {
     if (!_datafileManager) {
-        _datafileManager = [[OPTLYDatafileManagerNoOp alloc] init];
+        _datafileManager = [[OPTLYDatafileManagerDefault alloc] init];
     }
     return _datafileManager;
 }
@@ -58,7 +58,7 @@ - (id)initWithBlock:(OPTLYManagerBuilderBlock)block {
 
 - (id<OPTLYEventDispatcher>)eventDispatcher {
     if (!_eventDispatcher) {
-        _eventDispatcher = [[OPTLYEventDispatcherNoOp alloc] init];
+        _eventDispatcher = [[OPTLYEventDispatcherDefault alloc] init];
     }
     return _eventDispatcher;
 }

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

@@ -122,7 +122,7 @@ - (void)testInitializeClientAsync {
     OPTLYManager *manager = [OPTLYManager initWithBuilderBlock:^(OPTLYManagerBuilder * _Nullable builder) {
         builder.datafile = self.defaultDatafile;
         builder.projectId = kProjectId;
-        builder.datafileManager = [OPTLYDatafileManagerNoOp new];
+        builder.datafileManager = [OPTLYDatafileManagerDefault new];
     }];
 
     // make sure manager is initialized correctly