Moved location of fix to make it available for all user flows

Author: gnongsie

Client/ApiClient.cs

@@ -38,8 +38,21 @@ public class RestClientFactory
         {
             private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();
 
-            public static RestClient GetRestClient(RestClientOptions clientOptions)
+            public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)
             {
+                if (configuration.MerchantConfigDictionaryObj != null)
+                {
+                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
+
+                    ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
+                    ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
+                }
+                else
+                {
+                    ServicePointManager.DefaultConnectionLimit = int.Parse(Constants.DefaultMaxConnectionPoolSize);
+                    ServicePointManager.MaxServicePointIdleTime = int.Parse(Constants.DefaultKeepAliveTime);
+                }
+
                 int hash = GetHashOfRestClientOptions(clientOptions);
 
                 if (!_restClientInstances.TryGetValue(hash, out Lazy<RestClient> lazyClient))
@@ -120,19 +133,6 @@ public ApiClient(Configuration config = null)
             {
                 logger = LogManager.GetCurrentClassLogger();
             }
-
-            if (Configuration.MerchantConfigDictionaryObj != null)
-            {
-                var merchantConfig = new MerchantConfig(Configuration.MerchantConfigDictionaryObj);
-
-                ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
-                ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
-            }
-            else
-            {
-                ServicePointManager.DefaultConnectionLimit = int.Parse(Constants.DefaultMaxConnectionPoolSize);
-                ServicePointManager.MaxServicePointIdleTime = int.Parse(Constants.DefaultKeepAliveTime);
-            }
         }
 
         /// <summary>
@@ -348,7 +348,7 @@ public object CallApi(
 
             // RestClient.ClearHandlers();
 
-            var actualRestClient = RestClientFactory.GetRestClient(newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
 
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
@@ -508,7 +508,7 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(
 
             var newRestClientOptions = GetRestClientOptions(Configuration);
 
-            var actualRestClient = RestClientFactory.GetRestClient(newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
 
             InterceptRequest(request);
             var response = await actualRestClient.ExecuteAsync(request);

generator/cybersource-csharp-template/ApiClient.mustache

@@ -39,8 +39,21 @@ namespace {{packageName}}.Client
         {
             private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();
 
-            public static RestClient GetRestClient(RestClientOptions clientOptions)
+            public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)
             {
+                if (configuration.MerchantConfigDictionaryObj != null)
+                {
+                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
+
+                    ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
+                    ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
+                }
+                else
+                {
+                    ServicePointManager.DefaultConnectionLimit = int.Parse(Constants.DefaultMaxConnectionPoolSize);
+                    ServicePointManager.MaxServicePointIdleTime = int.Parse(Constants.DefaultKeepAliveTime);
+                }
+
                 int hash = GetHashOfRestClientOptions(clientOptions);
 
                 if (!_restClientInstances.TryGetValue(hash, out Lazy<RestClient> lazyClient))
@@ -124,19 +137,6 @@ namespace {{packageName}}.Client
             {
                 logger = LogManager.GetCurrentClassLogger();
             }
-
-            if (Configuration.MerchantConfigDictionaryObj != null)
-            {
-                var merchantConfig = new MerchantConfig(Configuration.MerchantConfigDictionaryObj);
-
-                ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
-                ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
-            }
-            else
-            {
-                ServicePointManager.DefaultConnectionLimit = int.Parse(Constants.DefaultMaxConnectionPoolSize);
-                ServicePointManager.MaxServicePointIdleTime = int.Parse(Constants.DefaultKeepAliveTime);
-            }
         }
 
         /// <summary>
@@ -387,7 +387,7 @@ namespace {{packageName}}.Client
 
             // RestClient.ClearHandlers();
 
-            var actualRestClient = RestClientFactory.GetRestClient(newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
 
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
@@ -559,7 +559,7 @@ namespace {{packageName}}.Client
 
             var newRestClientOptions = GetRestClientOptions(Configuration);
 
-            var actualRestClient = RestClientFactory.GetRestClient(newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
 
             InterceptRequest(request);
             var response = await actualRestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);