Merge branch 'master' into mnoman/gitActionIntegrationTest

Author: yasirfolio3

android/src/main/java/com/optimizely/optimizely_flutter_sdk/OptimizelyFlutterClient.java

@@ -37,7 +37,6 @@
 import com.optimizely.ab.android.sdk.OptimizelyManager;
 import com.optimizely.ab.error.RaiseExceptionErrorHandler;
 import com.optimizely.ab.event.BatchEventProcessor;
-import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.event.EventProcessor;
 import com.optimizely.ab.event.LogEvent;
 import com.optimizely.ab.notification.DecisionNotification;
@@ -74,14 +73,14 @@ protected void initializeOptimizely(@NonNull ArgumentsParser argumentsParser, @N
  }
  // EventDispatcher Default Values
  Integer batchSize = 10;
- Long timeInterval = TimeUnit.MINUTES.toMillis(1L); // Minutes
+ long timeInterval = TimeUnit.MINUTES.toMillis(1L); // Minutes
  Integer maxQueueSize = 10000;
 
  if (argumentsParser.getEventBatchSize() != null) {
  batchSize = argumentsParser.getEventBatchSize();
  }
  if (argumentsParser.getEventTimeInterval() != null) {
- timeInterval = TimeUnit.SECONDS.toMillis(argumentsParser.getEventBatchSize());
+ timeInterval = TimeUnit.SECONDS.toMillis(argumentsParser.getEventTimeInterval());
  }
  if (argumentsParser.getEventMaxQueueSize() != null) {
  maxQueueSize = argumentsParser.getEventMaxQueueSize();
@@ -101,22 +100,24 @@ protected void initializeOptimizely(@NonNull ArgumentsParser argumentsParser, @N
  .build();
 
  // Datafile Download Interval
- long periodicDownloadInterval = 10 * 60; // seconds
+ long datafilePeriodicDownloadInterval = 10 * 60; // seconds
 
- if (argumentsParser.getPeriodicDownloadInterval() != null) {
- periodicDownloadInterval = argumentsParser.getPeriodicDownloadInterval();
+ if (argumentsParser.getDatafilePeriodicDownloadInterval() != null) {
+ datafilePeriodicDownloadInterval = argumentsParser.getDatafilePeriodicDownloadInterval();
  }
  // Delete old user context
  userContextsTracker.remove(sdkKey);
- getOptimizelyClient(sdkKey).close();
+ if (getOptimizelyClient(sdkKey) != null) {
+ getOptimizelyClient(sdkKey).close();
+ }
  optimizelyManagerTracker.remove(sdkKey);
 
  // Creating new instance
  OptimizelyManager optimizelyManager = OptimizelyManager.builder()
  .withEventProcessor(batchProcessor)
  .withEventHandler(eventHandler)
  .withNotificationCenter(notificationCenter)
- .withDatafileDownloadInterval(periodicDownloadInterval, TimeUnit.SECONDS)
+ .withDatafileDownloadInterval(datafilePeriodicDownloadInterval, TimeUnit.SECONDS)
  .withErrorHandler(new RaiseExceptionErrorHandler())
  .withSDKKey(sdkKey)
  .build(context);

android/src/main/java/com/optimizely/optimizely_flutter_sdk/helper_classes/ArgumentsParser.java

@@ -79,15 +79,15 @@ public Integer getEventBatchSize() {
  return (Integer) arguments.get(Constants.RequestParameterKey.EVENT_BATCH_SIZE);
  }
 
- public Long getEventTimeInterval() {
- return (Long) arguments.get(Constants.RequestParameterKey.EVENT_TIME_INTERVAL);
+ public Integer getEventTimeInterval() {
+ return (Integer) arguments.get(Constants.RequestParameterKey.EVENT_TIME_INTERVAL);
  }
 
  public Integer getEventMaxQueueSize() {
  return (Integer) arguments.get(Constants.RequestParameterKey.EVENT_MAX_QUEUE_SIZE);
  }
 
- public Long getPeriodicDownloadInterval() {
- return (Long) arguments.get(Constants.RequestParameterKey.PERIODIC_DOWNLOAD_INTERVAL);
+ public Integer getDatafilePeriodicDownloadInterval() {
+ return (Integer) arguments.get(Constants.RequestParameterKey.DATAFILE_PERIODIC_DOWNLOAD_INTERVAL);
  }
 }

android/src/main/java/com/optimizely/optimizely_flutter_sdk/helper_classes/Constants.java

@@ -51,7 +51,7 @@ public static class RequestParameterKey {
  public static final String EVENT_BATCH_SIZE = "eventBatchSize";
  public static final String EVENT_TIME_INTERVAL = "eventTimeInterval";
  public static final String EVENT_MAX_QUEUE_SIZE = "eventMaxQueueSize";
- public static final String PERIODIC_DOWNLOAD_INTERVAL = "periodicDownloadInterval";
+ public static final String DATAFILE_PERIODIC_DOWNLOAD_INTERVAL = "datafilePeriodicDownloadInterval";
  public static final String EVENT_KEY = "eventKey";
  public static final String EVENT_TAGS = "eventTags";
  public static final String FLAG_KEY = "flagKey";

example/lib/main.dart

@@ -25,7 +25,7 @@ class _MyAppState extends State<MyApp> {
 
  Future<void> runOptimizelySDK() async {
  var flutterSDK = OptimizelyFlutterSdk("X9mZd2WDywaUL9hZXyh9A",
- periodicDownloadInterval: 10 * 60,
+ datafilePeriodicDownloadInterval: 10 * 60,
  eventOptions: const EventOptions(
  batchSize: 1, timeInterval: 60, maxQueueSize: 10000));
  var response = await flutterSDK.initializeClient();

ios/Classes/HelperClasses/Constants.swift

@@ -68,7 +68,7 @@ struct RequestParameterKey {
  static let eventBatchSize = "eventBatchSize"
  static let eventTimeInterval = "eventTimeInterval"
  static let eventMaxQueueSize = "eventMaxQueueSize"
- static let periodicDownloadInterval = "periodicDownloadInterval"
+ static let datafilePeriodicDownloadInterval = "datafilePeriodicDownloadInterval"
 }
 
 struct ResponseKey {

ios/Classes/SwiftOptimizelyFlutterSdkPlugin.swift

@@ -83,10 +83,10 @@ public class SwiftOptimizelyFlutterSdkPlugin: NSObject, FlutterPlugin {
  let eventDispatcher = DefaultEventDispatcher(batchSize: batchSize, backingStore: .file, dataStoreName: "OPTEventQueue", timerInterval: timeInterval, maxQueueSize: maxQueueSize)
 
  // Datafile Download Interval
- var periodicDownloadInterval = 10 * 60 // seconds
+ var datafilePeriodicDownloadInterval = 10 * 60 // seconds
 
- if let _periodicDownloadInterval = parameters[RequestParameterKey.periodicDownloadInterval] as? Int {
- periodicDownloadInterval = _periodicDownloadInterval
+ if let _datafilePeriodicDownloadInterval = parameters[RequestParameterKey.datafilePeriodicDownloadInterval] as? Int {
+ datafilePeriodicDownloadInterval = _datafilePeriodicDownloadInterval
  }
 
  // Delete old user context
@@ -96,7 +96,7 @@ public class SwiftOptimizelyFlutterSdkPlugin: NSObject, FlutterPlugin {
  optimizelyClientsTracker.removeValue(forKey: sdkKey)
 
  // Creating new instance
- let optimizelyInstance = OptimizelyClient(sdkKey:sdkKey, eventDispatcher: eventDispatcher, periodicDownloadInterval: periodicDownloadInterval)
+ let optimizelyInstance = OptimizelyClient(sdkKey:sdkKey, eventDispatcher: eventDispatcher, periodicDownloadInterval: datafilePeriodicDownloadInterval)
 
  optimizelyInstance.start{ [weak self] res in
  switch res {

lib/optimizely_flutter_sdk.dart

@@ -42,25 +42,26 @@ export 'package:optimizely_flutter_sdk/src/data_objects/event_options.dart'
 
 /// The main client class for the Optimizely Flutter SDK.
 ///
-/// To use, create an instance of OptimizelyFlutterSdk class with a valid sdkKey, periodicDownloadInterval (optional), eventOptions (optional) and
+/// To use, create an instance of OptimizelyFlutterSdk class with a valid sdkKey, datafilePeriodicDownloadInterval (optional), eventOptions (optional) and
 /// call initializeClient method.
 /// If successfull, call createUserContext to setup user context.
 /// Once done, all API's should be available.
 class OptimizelyFlutterSdk {
  final String _sdkKey;
- final int _periodicDownloadInterval;
+ final int _datafilePeriodicDownloadInterval;
  final EventOptions _eventOptions;
 
  OptimizelyFlutterSdk(this._sdkKey,
- {periodicDownloadInterval = 10 * 60, // Default time interval in seconds
+ {datafilePeriodicDownloadInterval =
+ 10 * 60, // Default time interval in seconds
  EventOptions eventOptions = const EventOptions()})
- : _periodicDownloadInterval = periodicDownloadInterval,
+ : _datafilePeriodicDownloadInterval = datafilePeriodicDownloadInterval,
  _eventOptions = eventOptions;
 
  /// Starts Optimizely SDK (Synchronous) with provided sdkKey.
  Future<BaseResponse> initializeClient() async {
  return await OptimizelyClientWrapper.initializeClient(
- _sdkKey, _periodicDownloadInterval, _eventOptions);
+ _sdkKey, _datafilePeriodicDownloadInterval, _eventOptions);
  }
 
  /// Returns a snapshot of the current project configuration.

lib/src/optimizely_client_wrapper.dart

@@ -44,11 +44,12 @@ class OptimizelyClientWrapper {
 
  /// Starts Optimizely SDK (Synchronous) with provided sdkKey and options.
  static Future<BaseResponse> initializeClient(String sdkKey,
- int periodicDownloadInterval, EventOptions eventOptions) async {
+ int datafilePeriodicDownloadInterval, EventOptions eventOptions) async {
  _channel.setMethodCallHandler(methodCallHandler);
  Map<String, dynamic> requestDict = {
  Constants.sdkKey: sdkKey,
- Constants.periodicDownloadInterval: periodicDownloadInterval,
+ Constants.datafilePeriodicDownloadInterval:
+ datafilePeriodicDownloadInterval,
  Constants.eventBatchSize: eventOptions.batchSize,
  Constants.eventTimeInterval: eventOptions.timeInterval,
  Constants.eventMaxQueueSize: eventOptions.maxQueueSize,

lib/src/utils/constants.dart

@@ -62,7 +62,8 @@ class Constants {
  static const String eventBatchSize = "eventBatchSize";
  static const String eventTimeInterval = "eventTimeInterval";
  static const String eventMaxQueueSize = "eventMaxQueueSize";
- static const String periodicDownloadInterval = "periodicDownloadInterval";
+ static const String datafilePeriodicDownloadInterval =
+ "datafilePeriodicDownloadInterval";
  static const String trackCallBackListener = "trackCallbackListener";
  static const String decisionCallBackListener = "decisionCallbackListener";
  static const String logEventCallbackListener = "logEventCallbackListener";

test/optimizely_flutter_sdk_test.dart

@@ -31,9 +31,9 @@ void main() {
  const String userId = "uid-351ea8";
  // To check if decide options properly reached the native sdk through channel
  List<String> decideOptions = [];
- // To check if event options and periodicDownloadInterval properly reached the native sdk through channel
+ // To check if event options and datafilePeriodicDownloadInterval properly reached the native sdk through channel
  EventOptions eventOptions = const EventOptions();
- int periodicDownloadInterval = 0;
+ int datafilePeriodicDownloadInterval = 0;
 
  const MethodChannel channel = MethodChannel("optimizely_flutter_sdk");
  dynamic mockOptimizelyConfig;
@@ -64,8 +64,8 @@ void main() {
  batchSize: methodCall.arguments[Constants.eventBatchSize],
  maxQueueSize: methodCall.arguments[Constants.eventMaxQueueSize],
  timeInterval: methodCall.arguments[Constants.eventTimeInterval]);
- periodicDownloadInterval =
- methodCall.arguments[Constants.periodicDownloadInterval];
+ datafilePeriodicDownloadInterval =
+ methodCall.arguments[Constants.datafilePeriodicDownloadInterval];
  return {
  Constants.responseSuccess: true,
  Constants.responseReason: Constants.instanceCreated,
@@ -172,11 +172,12 @@ void main() {
  expect(response.reason, equals(Constants.instanceCreated));
  });
 
- test("with no eventOptions and no periodicDownloadInterval", () async {
+ test("with no eventOptions and no datafilePeriodicDownloadInterval",
+ () async {
  // default values
  const expectedEventOptions =
  EventOptions(batchSize: 10, timeInterval: 60, maxQueueSize: 10000);
- const expectedPeriodicDownloadInterval = 10 * 60;
+ const expectedDatafilePeriodicDownloadInterval = 10 * 60;
  var sdk = OptimizelyFlutterSdk(testSDKKey);
  var response = await sdk.initializeClient();
 
@@ -187,17 +188,18 @@ void main() {
  equals(expectedEventOptions.maxQueueSize));
  expect(eventOptions.timeInterval,
  equals(expectedEventOptions.timeInterval));
- expect(
- periodicDownloadInterval, equals(expectedPeriodicDownloadInterval));
+ expect(datafilePeriodicDownloadInterval,
+ equals(expectedDatafilePeriodicDownloadInterval));
  });
 
- test("with eventOptions and periodicDownloadInterval", () async {
+ test("with eventOptions and datafilePeriodicDownloadInterval", () async {
  const expectedEventOptions =
  EventOptions(batchSize: 20, timeInterval: 30, maxQueueSize: 200);
- const expectedPeriodicDownloadInterval = 40;
+ const expectedDatafilePeriodicDownloadInterval = 40;
  var sdk = OptimizelyFlutterSdk(testSDKKey,
  eventOptions: expectedEventOptions,
- periodicDownloadInterval: expectedPeriodicDownloadInterval);
+ datafilePeriodicDownloadInterval:
+ expectedDatafilePeriodicDownloadInterval);
  var response = await sdk.initializeClient();
 
  expect(response.success, equals(true));
@@ -207,17 +209,19 @@ void main() {
  equals(expectedEventOptions.maxQueueSize));
  expect(eventOptions.timeInterval,
  equals(expectedEventOptions.timeInterval));
- expect(
- periodicDownloadInterval, equals(expectedPeriodicDownloadInterval));
+ expect(datafilePeriodicDownloadInterval,
+ equals(expectedDatafilePeriodicDownloadInterval));
  });
 
- test("with no eventOptions and periodicDownloadInterval", () async {
+ test("with no eventOptions and datafilePeriodicDownloadInterval",
+ () async {
  // default values
  const expectedEventOptions =
  EventOptions(batchSize: 10, timeInterval: 60, maxQueueSize: 10000);
- const expectedPeriodicDownloadInterval = 500;
+ const expectedDatafilePeriodicDownloadInterval = 500;
  var sdk = OptimizelyFlutterSdk(testSDKKey,
- periodicDownloadInterval: expectedPeriodicDownloadInterval);
+ datafilePeriodicDownloadInterval:
+ expectedDatafilePeriodicDownloadInterval);
  var response = await sdk.initializeClient();
 
  expect(response.success, equals(true));
@@ -227,15 +231,16 @@ void main() {
  equals(expectedEventOptions.maxQueueSize));
  expect(eventOptions.timeInterval,
  equals(expectedEventOptions.timeInterval));
- expect(
- periodicDownloadInterval, equals(expectedPeriodicDownloadInterval));
+ expect(datafilePeriodicDownloadInterval,
+ equals(expectedDatafilePeriodicDownloadInterval));
  });
 
- test("with eventOptions and no periodicDownloadInterval", () async {
+ test("with eventOptions and no datafilePeriodicDownloadInterval",
+ () async {
  // default values
  const expectedEventOptions =
  EventOptions(batchSize: 50, timeInterval: 80, maxQueueSize: 20000);
- const expectedPeriodicDownloadInterval = 10 * 60;
+ const expectedDatafilePeriodicDownloadInterval = 10 * 60;
  var sdk = OptimizelyFlutterSdk(testSDKKey,
  eventOptions: expectedEventOptions);
  var response = await sdk.initializeClient();
@@ -247,8 +252,8 @@ void main() {
  equals(expectedEventOptions.maxQueueSize));
  expect(eventOptions.timeInterval,
  equals(expectedEventOptions.timeInterval));
- expect(
- periodicDownloadInterval, equals(expectedPeriodicDownloadInterval));
+ expect(datafilePeriodicDownloadInterval,
+ equals(expectedDatafilePeriodicDownloadInterval));
  });
  });
  group("close()", () {