Merge pull request #252 from steve-sweitzer/master

Support timeout being specified in seconds instead of minutes

Author: svc-developer

src/AvaTaxClient.cs

@@ -83,7 +83,7 @@ public AvaTaxClient(string appName, string appVersion, string machineName, AvaTa
                 _userConfiguration = userConfiguration;
             }
 #if PORTABLE
-            this.httpClient = new HttpClient() { Timeout = TimeSpan.FromMinutes(_userConfiguration.TimeoutInMinutes) };
+            this.httpClient = new HttpClient() { Timeout = _userConfiguration.GetTimeOutTimeSpan() };
 #endif
 
             // Setup the URI
@@ -118,7 +118,7 @@ public AvaTaxClient(string appName, string appVersion, string machineName, Uri c
                 _userConfiguration = userConfiguration;
             }
 #if PORTABLE
-            this.httpClient = new HttpClient() { Timeout = TimeSpan.FromMinutes(_userConfiguration.TimeoutInMinutes) };
+            this.httpClient = new HttpClient() { Timeout = _userConfiguration.GetTimeOutTimeSpan() };
 #endif
             _envUri = customEnvironment;
         }
@@ -145,7 +145,7 @@ public AvaTaxClient(HttpClient httpClient, string appName, string appVersion, st
             }
 
             this.httpClient = httpClient ?? new HttpClient()
-                { Timeout = TimeSpan.FromMinutes(_userConfiguration.TimeoutInMinutes) };
+                { Timeout = _userConfiguration.GetTimeOutTimeSpan() };
 
             // Setup the URI
             switch (environment)
@@ -181,7 +181,7 @@ public AvaTaxClient(HttpClient httpClient, string appName, string appVersion, st
             }
 
             this.httpClient = httpClient ?? new HttpClient()
-                { Timeout = TimeSpan.FromMinutes(_userConfiguration.TimeoutInMinutes) };
+                { Timeout = _userConfiguration.GetTimeOutTimeSpan() };
 
             _envUri = customEnvironment;
         }
@@ -1169,4 +1169,4 @@ private void LogFile_CallCompleted(object sender, EventArgs e)
 
         #endregion
     }
-}
+}

src/UserConfiguration.cs

@@ -6,6 +6,7 @@ namespace Avalara.AvaTax.RestClient
     public class UserConfiguration
     {
         private int _timeOutInMinutes;
+        private int _timeOutInSeconds;
         private int _maxRetryAttempts;
 
         /// <summary>
@@ -20,6 +21,26 @@ public int TimeoutInMinutes
             }
         }
 
+        /// <summary>
+        /// Gets or sets timeout in seconds. If set to a non-zero value, overrides TimeoutInMinutes.
+        /// </summary>
+        public int TimeoutInSeconds
+        {
+            get { return _timeOutInSeconds; }
+            set
+            {
+                _timeOutInSeconds = value <= 0 ? 0 : value;
+            }
+        }
+
+        /// <summary>
+        /// Get <see cref="TimeSpan"/> for the currently set timeout period.
+        /// </summary>
+        public TimeSpan GetTimeOutTimeSpan()
+        {
+            return _timeOutInSeconds > 0 ? TimeSpan.FromSeconds(_timeOutInSeconds) : TimeSpan.FromMinutes(_timeOutInMinutes);
+        }
+
         /// <summary>
         /// Gets or sets Maximum retry attempts
         /// </summary>
@@ -39,6 +60,7 @@ public UserConfiguration()
         {
             this._maxRetryAttempts = 0;
             this._timeOutInMinutes = 20;
+            this._timeOutInSeconds = 0;
         }
     }
-}
+}