chore: 3.2.x cherry pick for release (#182)

msohailhussain · Michael Ng · commit 2d4795f2f2b9 · 2019-07-22T15:08:19.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,8 @@ July 22nd, 2019
 * Added support for automatic datafile management via `HttpProjectConfigManager` for framework 4.0 or above:
   * The [`HttpProjectConfigManager`](https://github.com/optimizely/csharp-sdk/blob/master/OptimizelySDK/Config/HttpProjectConfigManager.cs) is an implementation of the abstract
       [`PollingProjectConfigManager`](https://github.com/optimizely/csharp-sdk/blob/master/OptimizelySDK/Config/PollingProjectConfigManager.cs) class.
-    - Users must first build the `HttpProjectConfigManager` with an SDK key and then and provide that instance to the `Optimizely`.
-    - An initial datafile can be provided to the `HttpProjectConfigManager` to bootstrap before making http requests for the hosted datafile.
+    - Users must first build the `HttpProjectConfigManager` with an SDK key and then and provide that instance to the `Optimizely` instance.
+    - An initial datafile can be provided to the `HttpProjectConfigManager` to bootstrap before making HTTP requests for the hosted datafile.
     - Requests for the datafile are made in a separate thread and are scheduled with fixed delay.
     - Configuration updates can be subscribed to via the NotificationCenter built with the `HttpProjectConfigManager`.
     - `Optimizely` instance must be disposed after the use or `HttpProjectConfigManager` must be disposed after the use to release resources.
diff --git a/OptimizelySDK.DemoApp/Controllers/DemoController.cs b/OptimizelySDK.DemoApp/Controllers/DemoController.cs
@@ -44,7 +44,7 @@ public class DemoController : Controller
             new Visitor { Id = 5, Name = "Randall", Age = 29 },
         };
 
-        private static Config ConfigRepo = new Config();
+        private static Models.Config ConfigRepo = new Models.Config();
         private static Optimizely Optimizely = null;
         private static InMemoryHandler InMemoryHandler = new InMemoryHandler();
         private static Logger.ILogger Logger = new MultiLogger(new[] { new Logger.DefaultLogger(), (Logger.ILogger)InMemoryHandler, new Log4NetLogger() });
@@ -76,7 +76,7 @@ public ActionResult Config()
         }
 
         [HttpPost]
-        public ActionResult Config(Config config)
+        public ActionResult Config(Models.Config config)
         {
             ConfigRepo = config;
             string url = string.Format("https://cdn.optimizely.com/json/{0}.json", config.ProjectId);
diff --git a/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj b/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET35;NET40</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/OptimizelySDK.Tests/ConfigTest/HttpProjectConfigManagerTest.cs b/OptimizelySDK.Tests/ConfigTest/HttpProjectConfigManagerTest.cs
@@ -190,7 +190,7 @@ public void TestDefaultBlockingTimeoutWhileProvidingZero()
                 .WithStartByDefault(true)
                 .Build(true);
             
-            LoggerMock.Verify(l => l.Log(LogLevel.INFO, $"Blocking timeout is not valid, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Blocking timeout is not valid, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
         }
 
         [Test]
@@ -205,7 +205,7 @@ public void TestDefaultPeriodWhileProvidingZero()
                 .WithStartByDefault(true)
                 .Build(true);
 
-            LoggerMock.Verify(l => l.Log(LogLevel.INFO, $"Period is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
         }
 
         [Test]
@@ -220,7 +220,44 @@ public void TestDefaultPeriodWhileProvidingNegative()
                 .WithStartByDefault(true)
                 .Build(true);
 
-            LoggerMock.Verify(l => l.Log(LogLevel.INFO, $"Period is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));            
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));            
+        }
+
+        [Test]
+        public void TestDefaultPeriodWhileNotProvidingValue()
+        {
+            var httpManager = new HttpProjectConfigManager.Builder()
+                .WithSdkKey("QBw9gFM8oTn7ogY9ANCC1z")
+                .WithDatafile(TestData.Datafile)
+                .WithLogger(LoggerMock.Object)                
+                .Build(true);
+
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No polling interval provided, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
+        }
+
+        [Test]
+        public void TestDefaultBlockingTimeoutWhileNotProvidingValue()
+        {
+            var httpManager = new HttpProjectConfigManager.Builder()
+                .WithSdkKey("QBw9gFM8oTn7ogY9ANCC1z")
+                .WithDatafile(TestData.Datafile)
+                .WithLogger(LoggerMock.Object)                
+                .Build(true);
+
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No Blocking timeout provided, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
+        }
+
+        [Test]
+        public void TestDefaultValuesWhenNotProvided()
+        {
+            var httpManager = new HttpProjectConfigManager.Builder()
+                .WithSdkKey("QBw9gFM8oTn7ogY9ANCC1z")
+                .WithDatafile(TestData.Datafile)
+                .WithLogger(LoggerMock.Object)
+                .Build(true);
+
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No polling interval provided, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
+            LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No Blocking timeout provided, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
         }
 
         #endregion
diff --git a/OptimizelySDK/Config/HttpProjectConfigManager.cs b/OptimizelySDK/Config/HttpProjectConfigManager.cs
@@ -78,7 +78,7 @@ private string GetRemoteDatafileResponse()
 
             return content.Result;  
         }
-#elif NET40        
+#elif NET40      
         private string GetRemoteDatafileResponse()
         {
             var request = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(Url);
@@ -87,8 +87,7 @@ private string GetRemoteDatafileResponse()
             if (!string.IsNullOrEmpty(LastModifiedSince))
                 request.Headers.Add("If-Modified-Since", LastModifiedSince);
             var result = (System.Net.HttpWebResponse)request.GetResponse();
-
-            // TODO: Need to revise this code.
+            
             if (result.StatusCode != System.Net.HttpStatusCode.OK) {
                 Logger.Log(LogLevel.ERROR, "Unexpected response from event endpoint, status: " + result.StatusCode);
             }
@@ -138,8 +137,14 @@ public class Builder
             private bool StartByDefault;
             private NotificationCenter NotificationCenter;
 
+
+            private bool IsBlockingTimeoutProvided = false;
+            private bool IsPollingIntervalProvided = false;
+
             public Builder WithBlockingTimeoutPeriod(TimeSpan blockingTimeoutSpan)
             {
+                IsBlockingTimeoutProvided = true;
+
                 BlockingTimeoutSpan = blockingTimeoutSpan;
 
                 return this;
@@ -166,7 +171,9 @@ public Builder WithUrl(string url)
             }
 
             public Builder WithPollingInterval(TimeSpan period)
-            {                
+            {
+                IsPollingIntervalProvided = true;
+
                 Period = period;
 
                 return this;
@@ -249,15 +256,19 @@ public HttpProjectConfigManager Build(bool defer)
                     Url = string.Format(Format, SdkKey);
                 }
 
-                if (Period.TotalMilliseconds <= 0 || Period.TotalMilliseconds > MAX_MILLISECONDS_LIMIT) {
-                    Logger.Log(LogLevel.INFO, $"Period is not valid for periodic calls, using default period {DEFAULT_PERIOD.TotalMilliseconds}ms");
+                if (IsPollingIntervalProvided && (Period.TotalMilliseconds <= 0 || Period.TotalMilliseconds > MAX_MILLISECONDS_LIMIT)) {
+                    Logger.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {DEFAULT_PERIOD.TotalMilliseconds}ms");
                     Period = DEFAULT_PERIOD;
+                } else {
+                    Logger.Log(LogLevel.DEBUG, $"No polling interval provided, using default period {DEFAULT_PERIOD.TotalMilliseconds}ms");
                 }
                     
 
-                if (BlockingTimeoutSpan.TotalMilliseconds <= 0 || BlockingTimeoutSpan.TotalMilliseconds > MAX_MILLISECONDS_LIMIT) {
-                    Logger.Log(LogLevel.INFO, $"Blocking timeout is not valid, using default blocking timeout {DEFAULT_BLOCKINGOUT_PERIOD.TotalMilliseconds}ms");
+                if (IsBlockingTimeoutProvided && (BlockingTimeoutSpan.TotalMilliseconds <= 0 || BlockingTimeoutSpan.TotalMilliseconds > MAX_MILLISECONDS_LIMIT)) {
+                    Logger.Log(LogLevel.DEBUG, $"Blocking timeout is not valid, using default blocking timeout {DEFAULT_BLOCKINGOUT_PERIOD.TotalMilliseconds}ms");
                     BlockingTimeoutSpan = DEFAULT_BLOCKINGOUT_PERIOD;
+                } else {
+                    Logger.Log(LogLevel.DEBUG, $"No Blocking timeout provided, using default blocking timeout {DEFAULT_BLOCKINGOUT_PERIOD.TotalMilliseconds}ms");
                 }
                     
 
