Default Event Dispatcher In case of null (#196)

Author: fayyazarshad

OptimizelySDK.Tests/EventTests/BatchEventProcessorTest.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using OptimizelySDK.Config;
 using OptimizelySDK.Entity;
+using OptimizelySDK.ErrorHandler;
 using OptimizelySDK.Event;
 using OptimizelySDK.Event.Dispatcher;
 using OptimizelySDK.Event.Entity;
@@ -23,7 +24,7 @@ class BatchEventProcessorTest
         public const int MAX_BATCH_SIZE = 10;
         public const int MAX_DURATION_MS = 1000;
         public const int TIMEOUT_INTERVAL_MS = 5000;
-
+        
         private ProjectConfig Config;
         private Mock<ILogger> LoggerMock;
         private BlockingCollection<object> eventQueue;
@@ -136,6 +137,29 @@ public void TestFlush()
             Assert.AreEqual(0, EventProcessor.EventQueue.Count);
         }
 
+        [Test]
+        public void TestDefaultEventDispatcherIfNotProvided()
+        {
+            SetEventProcessor(null);
+
+            Assert.True(EventProcessor.EventDispatcher is DefaultEventDispatcher);
+        }
+
+        [Test]
+        public void TestNoOpLoggerIfNotProvided()
+        {
+            EventProcessor = new BatchEventProcessor.Builder().Build();
+
+            Assert.True(EventProcessor.Logger is OptimizelySDK.Logger.NoOpLogger);
+        }
+
+        [Test]
+        public void TestNoOpErrorHandlerIfNotProvided()
+        {
+            EventProcessor = new BatchEventProcessor.Builder().Build();
+            Assert.True(EventProcessor.ErrorHandler is NoOpErrorHandler);
+        }
+
         [Test]
         public void TestFlushOnMismatchRevision()
         {

OptimizelySDK.Tests/UtilsTests/PrivateObject.cs

@@ -41,6 +41,11 @@ public void SetFieldOrProperty(string propertyName, object value)
                 Type.DefaultBinder, createdInstance, new object[] { value });
         }
 
+        public Type GetFieldOrProperyType(string propertyName)
+        {
+            return instanceType.GetField(propertyName, BindingFlags.NonPublic | BindingFlags.Instance).FieldType;
+        }
+
         public object Invoke(string name, params object[] args)
         {
             return instanceType.InvokeMember(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.NonPublic,

OptimizelySDK/Event/BatchEventProcessor.cs

@@ -57,13 +57,13 @@ public class BatchEventProcessor: EventProcessor, IDisposable
         public bool IsStarted { get; private set; }
         private Thread Executer;
 
-        protected ILogger Logger { get; set; }
-        protected IErrorHandler ErrorHandler { get; set; }
+        public ILogger Logger { get; protected set; }
+        public IErrorHandler ErrorHandler { get; protected set; }
         public NotificationCenter NotificationCenter { get; set; }
 
         private readonly object mutex = new object();
 
-        private IEventDispatcher EventDispatcher;
+        public IEventDispatcher EventDispatcher { get; private set; }
         public BlockingCollection<object> EventQueue { get; private set; } 
         private List<UserEvent> CurrentBatch = new List<UserEvent>();
         private long FlushingIntervalDeadline;
@@ -345,12 +345,11 @@ public BatchEventProcessor Build()
             public BatchEventProcessor Build(bool start)
             {
                 var batchEventProcessor = new BatchEventProcessor();
-                batchEventProcessor.Logger = Logger;
-                batchEventProcessor.ErrorHandler = ErrorHandler;
-                batchEventProcessor.EventDispatcher = EventDispatcher;
+                batchEventProcessor.Logger = Logger ?? new NoOpLogger();
+                batchEventProcessor.ErrorHandler = ErrorHandler ?? new NoOpErrorHandler(Logger);
+                batchEventProcessor.EventDispatcher = EventDispatcher ?? new DefaultEventDispatcher(Logger);
                 batchEventProcessor.EventQueue = EventQueue;
-                batchEventProcessor.NotificationCenter = NotificationCenter;
-
+                batchEventProcessor.NotificationCenter = NotificationCenter;                
                 batchEventProcessor.BatchSize = BatchSize < 1 ? BatchEventProcessor.DEFAULT_BATCH_SIZE : BatchSize;
                 batchEventProcessor.FlushInterval = FlushInterval <= TimeSpan.FromSeconds(0) ? BatchEventProcessor.DEFAULT_FLUSH_INTERVAL : FlushInterval;
                 batchEventProcessor.TimeoutInterval = TimeoutInterval <= TimeSpan.FromSeconds(0) ? BatchEventProcessor.DEFAULT_TIMEOUT_INTERVAL : TimeoutInterval;

OptimizelySDK/OptimizelyFactory.cs

@@ -31,6 +31,7 @@ public static class OptimizelyFactory
     {
         private static int MaxEventBatchSize;
         private static TimeSpan MaxEventFlushInterval;
+        private static ILogger OptimizelyLogger;
 
 #if !NETSTANDARD1_6 && !NET35
         public static void SetBatchSize(int batchSize)
@@ -42,17 +43,20 @@ public static void SetFlushInterval(TimeSpan flushInterval)
         {
             MaxEventFlushInterval = flushInterval;
         }
-#endif
-
 
+        public static void SetLogger(ILogger logger)
+        {
+            OptimizelyLogger = logger;
+        }
+#endif
         public static Optimizely NewDefaultInstance(string sdkKey)
         {
             return NewDefaultInstance(sdkKey, null);
         }
 
         public static Optimizely NewDefaultInstance(string sdkKey, string fallback)
         {
-            var logger = new DefaultLogger();
+            var logger = OptimizelyLogger ?? new DefaultLogger();
             var errorHandler = new DefaultErrorHandler();
             var eventDispatcher = new DefaultEventDispatcher(logger);
             var builder = new HttpProjectConfigManager.Builder();
@@ -76,6 +80,7 @@ public static Optimizely NewDefaultInstance(ProjectConfigManager configManager,
 
 #if !NETSTANDARD1_6 && !NET35
             eventProcessor = new BatchEventProcessor.Builder()
+                .WithLogger(logger)
                 .WithMaxBatchSize(MaxEventBatchSize)
                 .WithFlushInterval(MaxEventFlushInterval)
                 .WithEventDispatcher(eventDispatcher)