Adding an extra constructor with explicit chrono object to eliminate the confusion in time units. (#643)

Author: MushMal

src/CachingEndpointOnlyCallbackProvider.cpp

@@ -20,9 +20,28 @@ CachingEndpointOnlyCallbackProvider::CachingEndpointOnlyCallbackProvider(
         const std::string &user_agent_name,
         const std::string &custom_user_agent,
         const std::string &cert_path,
-        uint64_t cache_update_period) :
-            cache_update_period_(cache_update_period),
-            DefaultCallbackProvider(
+        std::chrono::duration<uint64_t> caching_update_period) : CachingEndpointOnlyCallbackProvider(
+                move(client_callback_provider),
+                move(stream_callback_provider),
+                move(credentials_provider),
+                region,
+                control_plane_uri,
+                user_agent_name,
+                custom_user_agent,
+                cert_path,
+                caching_update_period.count() * HUNDREDS_OF_NANOS_IN_A_SECOND) {
+}
+
+CachingEndpointOnlyCallbackProvider::CachingEndpointOnlyCallbackProvider(
+        unique_ptr <ClientCallbackProvider> client_callback_provider,
+        unique_ptr <StreamCallbackProvider> stream_callback_provider,
+        unique_ptr <CredentialProvider> credentials_provider,
+        const string& region,
+        const string& control_plane_uri,
+        const std::string &user_agent_name,
+        const std::string &custom_user_agent,
+        const std::string &cert_path,
+        uint64_t cache_update_period) : DefaultCallbackProvider(
                 move(client_callback_provider),
                 move(stream_callback_provider),
                 move(credentials_provider),

src/CachingEndpointOnlyCallbackProvider.h

@@ -21,10 +21,19 @@
 
 namespace com { namespace amazonaws { namespace kinesis { namespace video {
 
-const uint64_t DEFAULT_CACHE_UPDATE_PERIOD_IN_SECONDS = 2400;
-
 class CachingEndpointOnlyCallbackProvider : public DefaultCallbackProvider {
 public:
+    explicit CachingEndpointOnlyCallbackProvider(
+            std::unique_ptr <ClientCallbackProvider> client_callback_provider,
+            std::unique_ptr <StreamCallbackProvider> stream_callback_provider,
+            std::unique_ptr <CredentialProvider> credentials_provider,
+            const std::string &region,
+            const std::string &control_plane_uri,
+            const std::string &user_agent_name,
+            const std::string &custom_user_agent,
+            const std::string &cert_path,
+            uint64_t cache_update_period);
+
     explicit CachingEndpointOnlyCallbackProvider(
             std::unique_ptr <ClientCallbackProvider> client_callback_provider,
             std::unique_ptr <StreamCallbackProvider> stream_callback_provider,
@@ -35,14 +44,9 @@ class CachingEndpointOnlyCallbackProvider : public DefaultCallbackProvider {
             const std::string &user_agent_name = "",
             const std::string &custom_user_agent = "",
             const std::string &cert_path = "",
-            uint64_t cache_update_period = DEFAULT_CACHE_UPDATE_PERIOD_IN_SECONDS);
+            std::chrono::duration<uint64_t> caching_update_period = std::chrono::seconds(DEFAULT_ENDPOINT_CACHE_UPDATE_PERIOD / HUNDREDS_OF_NANOS_IN_A_SECOND));
 
     virtual ~CachingEndpointOnlyCallbackProvider();
-
-protected:
-
-    // Cache update period in seconds
-    uint64_t cache_update_period_;
 };
 
 } // namespace video

src/DefaultCallbackProvider.cpp

@@ -323,6 +323,29 @@ VOID DefaultCallbackProvider::logPrintHandler(UINT32 level, PCHAR tag, PCHAR fmt
     va_end(valist);
 }
 
+DefaultCallbackProvider::DefaultCallbackProvider(
+        unique_ptr <ClientCallbackProvider> client_callback_provider,
+        unique_ptr <StreamCallbackProvider> stream_callback_provider,
+        unique_ptr <CredentialProvider> credentials_provider,
+        const string& region,
+        const string& control_plane_uri,
+        const std::string &user_agent_name,
+        const std::string &custom_user_agent,
+        const std::string &cert_path,
+        bool is_caching_endpoint,
+        std::chrono::duration<uint64_t> caching_update_period) : DefaultCallbackProvider (
+                move(client_callback_provider),
+                move(stream_callback_provider),
+                move(credentials_provider),
+                region,
+                control_plane_uri,
+                user_agent_name,
+                custom_user_agent,
+                cert_path,
+                is_caching_endpoint,
+                caching_update_period.count() * HUNDREDS_OF_NANOS_IN_A_SECOND) {
+}
+
 DefaultCallbackProvider::DefaultCallbackProvider(
         unique_ptr <ClientCallbackProvider> client_callback_provider,
         unique_ptr <StreamCallbackProvider> stream_callback_provider,

src/DefaultCallbackProvider.h

@@ -24,6 +24,18 @@ namespace com { namespace amazonaws { namespace kinesis { namespace video {
 class DefaultCallbackProvider : public CallbackProvider {
 public:
     using callback_t = ClientCallbacks;
+    explicit DefaultCallbackProvider(
+            std::unique_ptr <ClientCallbackProvider> client_callback_provider,
+            std::unique_ptr <StreamCallbackProvider> stream_callback_provider,
+            std::unique_ptr <CredentialProvider> credentials_provider,
+            const std::string &region,
+            const std::string &control_plane_uri,
+            const std::string &user_agent_name,
+            const std::string &custom_user_agent,
+            const std::string &cert_path,
+            bool is_caching_endpoint,
+            uint64_t caching_update_period);
+
     explicit DefaultCallbackProvider(
             std::unique_ptr <ClientCallbackProvider> client_callback_provider,
             std::unique_ptr <StreamCallbackProvider> stream_callback_provider,
@@ -34,7 +46,7 @@ class DefaultCallbackProvider : public CallbackProvider {
             const std::string &custom_user_agent = "",
             const std::string &cert_path = "",
             bool is_caching_endpoint = false,
-            uint64_t caching_update_period = DEFAULT_ENDPOINT_CACHE_UPDATE_PERIOD);
+            std::chrono::duration<uint64_t> caching_update_period = std::chrono::seconds(DEFAULT_ENDPOINT_CACHE_UPDATE_PERIOD / HUNDREDS_OF_NANOS_IN_A_SECOND));
 
     virtual ~DefaultCallbackProvider();
 

tst/ProducerTestFixture.h

@@ -328,7 +328,7 @@ class ProducerTestBase : public ::testing::Test {
                         "",
                         "",
                         caCertPath_,
-                        DEFAULT_CACHE_UPDATE_PERIOD_IN_SECONDS));
+                        DEFAULT_ENDPOINT_CACHE_UPDATE_PERIOD));
             } else {
                 defaultCallbackProvider.reset(new DefaultCallbackProvider(
                         move(client_callback_provider_),