Modifications for rewrite of RestClient

gnongsie · gnongsie · commit 74b19dbd413c · 2025-08-15T20:10:53.000+05:30
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Client/ApiClient.cs b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Client/ApiClient.cs
@@ -39,15 +39,13 @@ public class RestClientFactory
         {
             private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();
 
-            public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)
+            public static RestClient GetRestClient(MerchantConfig merchantConfig, RestClientOptions clientOptions)
             {
                 int MaxServicePointIdleTime;
                 int DefaultConnectionLimit;
 
-                if (configuration.MerchantConfigDictionaryObj != null)
+                if (merchantConfig != null)
                 {
-                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
-
                     DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
                     MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
                 }
@@ -64,6 +62,7 @@ public static RestClient GetRestClient(Configuration configuration, RestClientOp
                 };
 
                 var httpClient = new HttpClient(handler);
+                httpClient.Timeout = TimeSpan.FromMilliseconds(int.Parse(merchantConfig.TimeOut));
 
                 int hash = GetHashOfRestClientOptions(clientOptions);
 
@@ -356,11 +355,13 @@ public object CallApi(
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
 
-            var newRestClientOptions = GetRestClientOptions(Configuration);
+            MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);
+
+            var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));
 
             // RestClient.ClearHandlers();
 
-            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);
 
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
@@ -403,18 +404,16 @@ public object CallApi(
             return response;
         }
 
-        private RestClientOptions GetRestClientOptions(Configuration configuration)
+        private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)
         {
             RestClientOptions clientOptions = new RestClientOptions();
 
-            clientOptions.UserAgent = configuration.UserAgent;
-            clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);
+            clientOptions.UserAgent = userAgent;
+            clientOptions.Timeout = timeout;
 
-            var merchantConfig = configuration.MerchantConfigDictionaryObj != null
-                ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)
-                : new MerchantConfig();
+            IWebProxy webProxy = null;
 
-            if (configuration.Proxy == null && merchantConfig.UseProxy != null)
+            if (merchantConfig.UseProxy != null)
             {
                 if (bool.Parse(merchantConfig.UseProxy))
                 {
@@ -427,14 +426,14 @@ private RestClientOptions GetRestClientOptions(Configuration configuration)
                             proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);
                         }
 
-                        configuration.AddWebProxy(proxy);
+                        webProxy = proxy;
                     }
                 }
             }
 
-            if (configuration.Proxy != null)
+            if (webProxy != null)
             {
-                clientOptions.Proxy = configuration.Proxy;
+                clientOptions.Proxy = webProxy;
             }
 
             if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))
@@ -518,9 +517,11 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(
 
             logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");
 
-            var newRestClientOptions = GetRestClientOptions(Configuration);
+            MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);
+
+            var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));
 
-            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);
 
             InterceptRequest(request);
             var response = await actualRestClient.ExecuteAsync(request);
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Client/Configuration.cs b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Client/Configuration.cs
@@ -86,6 +86,15 @@ public Configuration(ApiClient apiClient = null,
                         }
                     }
                 }
+
+                if (merchConfigDictObj.ContainsKey("timeout"))
+                {
+                    Timeout = int.Parse(merchConfigDictObj["timeout"]);
+                }
+                else
+                {
+                    Timeout = timeout;
+                }
             }
 
             if (defaultHeader != null)
@@ -97,7 +106,6 @@ public Configuration(ApiClient apiClient = null,
 
             TempFolderPath = tempFolderPath;
             DateTimeFormat = dateTimeFormat;
-            Timeout = timeout;
             MerchantConfigDictionaryObj = merchConfigDictObj;
             MapToControlMLEonAPI = mapToControlMLEonAPI;
 
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache
@@ -40,15 +40,13 @@ namespace {{packageName}}.Client
         {
             private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();
 
-            public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)
+            public static RestClient GetRestClient(MerchantConfig merchantConfig, RestClientOptions clientOptions)
             {
                 int MaxServicePointIdleTime;
                 int DefaultConnectionLimit;
 
-                if (configuration.MerchantConfigDictionaryObj != null)
+                if (merchantConfig != null)
                 {
-                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
-
                     DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
                     MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
                 }
@@ -65,6 +63,7 @@ namespace {{packageName}}.Client
                 };
 
                 var httpClient = new HttpClient(handler);
+                httpClient.Timeout = TimeSpan.FromMilliseconds(int.Parse(merchantConfig.TimeOut));
 
                 int hash = GetHashOfRestClientOptions(clientOptions);
 
@@ -398,11 +397,13 @@ namespace {{packageName}}.Client
                 path, method, queryParams, postBody, headerParams, formParams, fileParams,
                 pathParams, contentType);
 
-            var newRestClientOptions = GetRestClientOptions(Configuration);
+            MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);
+
+            var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));
 
             // RestClient.ClearHandlers();
 
-            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);
 
             // Logging Request Headers
             var headerPrintOutput = new StringBuilder();
@@ -456,18 +457,16 @@ namespace {{packageName}}.Client
             return response;
         }
 
-        private RestClientOptions GetRestClientOptions(Configuration configuration)
+        private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)
         {
             RestClientOptions clientOptions = new RestClientOptions();
 
-            clientOptions.UserAgent = configuration.UserAgent;
-            clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);
+            clientOptions.UserAgent = userAgent;
+            clientOptions.Timeout = timeout;
 
-            var merchantConfig = configuration.MerchantConfigDictionaryObj != null
-                ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)
-                : new MerchantConfig();
+            IWebProxy webProxy = null;
 
-            if (configuration.Proxy == null && merchantConfig.UseProxy != null)
+            if (merchantConfig.UseProxy != null)
             {
                 if (bool.Parse(merchantConfig.UseProxy))
                 {
@@ -480,14 +479,14 @@ namespace {{packageName}}.Client
                             proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);
                         }
 
-                        configuration.AddWebProxy(proxy);
+                        webProxy = proxy;
                     }
                 }
             }
 
-            if (configuration.Proxy != null)
+            if (webProxy != null)
             {
-                clientOptions.Proxy = configuration.Proxy;
+                clientOptions.Proxy = webProxy;
             }
 
             if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))
@@ -572,9 +571,11 @@ namespace {{packageName}}.Client
 
             logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");
 
-            var newRestClientOptions = GetRestClientOptions(Configuration);
+            MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);
+
+            var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));
 
-            var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);
+            var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);
 
             InterceptRequest(request);
             var response = await actualRestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/Configuration.mustache b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/Configuration.mustache
@@ -77,6 +77,15 @@ namespace {{packageName}}.Client
                         }
                     }
                 }
+
+                if (merchConfigDictObj.ContainsKey("timeout"))
+                {
+                    Timeout = int.Parse(merchConfigDictObj["timeout"]);
+                }
+                else
+                {
+                    Timeout = timeout;
+                }
             }
 
             if (defaultHeader != null)

Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,13 @@ public class RestClientFactory`
`39`	`39`	`{`
`40`	`40`	`private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();`
`41`	`41`
`42`		`- public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)`
	`42`	`+ public static RestClient GetRestClient(MerchantConfig merchantConfig, RestClientOptions clientOptions)`
`43`	`43`	`{`
`44`	`44`	`int MaxServicePointIdleTime;`
`45`	`45`	`int DefaultConnectionLimit;`
`46`	`46`
`47`		`- if (configuration.MerchantConfigDictionaryObj != null)`
	`47`	`+ if (merchantConfig != null)`
`48`	`48`	`{`
`49`		`- var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);`
`50`		`-`
`51`	`49`	`DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);`
`52`	`50`	`MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);`
`53`	`51`	`}`
`@@ -64,6 +62,7 @@ public static RestClient GetRestClient(Configuration configuration, RestClientOp`
`64`	`62`	`};`
`65`	`63`
`66`	`64`	`var httpClient = new HttpClient(handler);`
	`65`	`+ httpClient.Timeout = TimeSpan.FromMilliseconds(int.Parse(merchantConfig.TimeOut));`
`67`	`66`
`68`	`67`	`int hash = GetHashOfRestClientOptions(clientOptions);`
`69`	`68`
`@@ -356,11 +355,13 @@ public object CallApi(`
`356`	`355`	`path, method, queryParams, postBody, headerParams, formParams, fileParams,`
`357`	`356`	`pathParams, contentType);`
`358`	`357`
`359`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`358`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`359`	`+`
	`360`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`360`	`361`
`361`	`362`	`// RestClient.ClearHandlers();`
`362`	`363`
`363`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`364`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`364`	`365`
`365`	`366`	`// Logging Request Headers`
`366`	`367`	`var headerPrintOutput = new StringBuilder();`
`@@ -403,18 +404,16 @@ public object CallApi(`
`403`	`404`	`return response;`
`404`	`405`	`}`
`405`	`406`
`406`		`- private RestClientOptions GetRestClientOptions(Configuration configuration)`
	`407`	`+ private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)`
`407`	`408`	`{`
`408`	`409`	`RestClientOptions clientOptions = new RestClientOptions();`
`409`	`410`
`410`		`- clientOptions.UserAgent = configuration.UserAgent;`
`411`		`- clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);`
	`411`	`+ clientOptions.UserAgent = userAgent;`
	`412`	`+ clientOptions.Timeout = timeout;`
`412`	`413`
`413`		`- var merchantConfig = configuration.MerchantConfigDictionaryObj != null`
`414`		`- ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)`
`415`		`- : new MerchantConfig();`
	`414`	`+ IWebProxy webProxy = null;`
`416`	`415`
`417`		`- if (configuration.Proxy == null && merchantConfig.UseProxy != null)`
	`416`	`+ if (merchantConfig.UseProxy != null)`
`418`	`417`	`{`
`419`	`418`	`if (bool.Parse(merchantConfig.UseProxy))`
`420`	`419`	`{`
`@@ -427,14 +426,14 @@ private RestClientOptions GetRestClientOptions(Configuration configuration)`
`427`	`426`	`proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);`
`428`	`427`	`}`
`429`	`428`
`430`		`- configuration.AddWebProxy(proxy);`
	`429`	`+ webProxy = proxy;`
`431`	`430`	`}`
`432`	`431`	`}`
`433`	`432`	`}`
`434`	`433`
`435`		`- if (configuration.Proxy != null)`
	`434`	`+ if (webProxy != null)`
`436`	`435`	`{`
`437`		`- clientOptions.Proxy = configuration.Proxy;`
	`436`	`+ clientOptions.Proxy = webProxy;`
`438`	`437`	`}`
`439`	`438`
`440`	`439`	`if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))`
`@@ -518,9 +517,11 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(`
`518`	`517`
`519`	`518`	`logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");`
`520`	`519`
`521`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`520`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`521`	`+`
	`522`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`522`	`523`
`523`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`524`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`524`	`525`
`525`	`526`	`InterceptRequest(request);`
`526`	`527`	`var response = await actualRestClient.ExecuteAsync(request);`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,15 @@ public Configuration(ApiClient apiClient = null,`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
	`89`	`+`
	`90`	`+ if (merchConfigDictObj.ContainsKey("timeout"))`
	`91`	`+ {`
	`92`	`+ Timeout = int.Parse(merchConfigDictObj["timeout"]);`
	`93`	`+ }`
	`94`	`+ else`
	`95`	`+ {`
	`96`	`+ Timeout = timeout;`
	`97`	`+ }`
`89`	`98`	`}`
`90`	`99`
`91`	`100`	`if (defaultHeader != null)`
`@@ -97,7 +106,6 @@ public Configuration(ApiClient apiClient = null,`
`97`	`106`
`98`	`107`	`TempFolderPath = tempFolderPath;`
`99`	`108`	`DateTimeFormat = dateTimeFormat;`
`100`		`- Timeout = timeout;`
`101`	`109`	`MerchantConfigDictionaryObj = merchConfigDictObj;`
`102`	`110`	`MapToControlMLEonAPI = mapToControlMLEonAPI;`
`103`	`111`
Original file line number	Diff line number	Diff line change
`@@ -40,15 +40,13 @@ namespace {{packageName}}.Client`
`40`	`40`	`{`
`41`	`41`	`private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();`
`42`	`42`
`43`		`- public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)`
	`43`	`+ public static RestClient GetRestClient(MerchantConfig merchantConfig, RestClientOptions clientOptions)`
`44`	`44`	`{`
`45`	`45`	`int MaxServicePointIdleTime;`
`46`	`46`	`int DefaultConnectionLimit;`
`47`	`47`
`48`		`- if (configuration.MerchantConfigDictionaryObj != null)`
	`48`	`+ if (merchantConfig != null)`
`49`	`49`	`{`
`50`		`- var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);`
`51`		`-`
`52`	`50`	`DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);`
`53`	`51`	`MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);`
`54`	`52`	`}`
`@@ -65,6 +63,7 @@ namespace {{packageName}}.Client`
`65`	`63`	`};`
`66`	`64`
`67`	`65`	`var httpClient = new HttpClient(handler);`
	`66`	`+ httpClient.Timeout = TimeSpan.FromMilliseconds(int.Parse(merchantConfig.TimeOut));`
`68`	`67`
`69`	`68`	`int hash = GetHashOfRestClientOptions(clientOptions);`
`70`	`69`
`@@ -398,11 +397,13 @@ namespace {{packageName}}.Client`
`398`	`397`	`path, method, queryParams, postBody, headerParams, formParams, fileParams,`
`399`	`398`	`pathParams, contentType);`
`400`	`399`
`401`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`400`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`401`	`+`
	`402`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`402`	`403`
`403`	`404`	`// RestClient.ClearHandlers();`
`404`	`405`
`405`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`406`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`406`	`407`
`407`	`408`	`// Logging Request Headers`
`408`	`409`	`var headerPrintOutput = new StringBuilder();`
`@@ -456,18 +457,16 @@ namespace {{packageName}}.Client`
`456`	`457`	`return response;`
`457`	`458`	`}`
`458`	`459`
`459`		`- private RestClientOptions GetRestClientOptions(Configuration configuration)`
	`460`	`+ private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)`
`460`	`461`	`{`
`461`	`462`	`RestClientOptions clientOptions = new RestClientOptions();`
`462`	`463`
`463`		`- clientOptions.UserAgent = configuration.UserAgent;`
`464`		`- clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);`
	`464`	`+ clientOptions.UserAgent = userAgent;`
	`465`	`+ clientOptions.Timeout = timeout;`
`465`	`466`
`466`		`- var merchantConfig = configuration.MerchantConfigDictionaryObj != null`
`467`		`- ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)`
`468`		`- : new MerchantConfig();`
	`467`	`+ IWebProxy webProxy = null;`
`469`	`468`
`470`		`- if (configuration.Proxy == null && merchantConfig.UseProxy != null)`
	`469`	`+ if (merchantConfig.UseProxy != null)`
`471`	`470`	`{`
`472`	`471`	`if (bool.Parse(merchantConfig.UseProxy))`
`473`	`472`	`{`
`@@ -480,14 +479,14 @@ namespace {{packageName}}.Client`
`480`	`479`	`proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);`
`481`	`480`	`}`
`482`	`481`
`483`		`- configuration.AddWebProxy(proxy);`
	`482`	`+ webProxy = proxy;`
`484`	`483`	`}`
`485`	`484`	`}`
`486`	`485`	`}`
`487`	`486`
`488`		`- if (configuration.Proxy != null)`
	`487`	`+ if (webProxy != null)`
`489`	`488`	`{`
`490`		`- clientOptions.Proxy = configuration.Proxy;`
	`489`	`+ clientOptions.Proxy = webProxy;`
`491`	`490`	`}`
`492`	`491`
`493`	`492`	`if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))`
`@@ -572,9 +571,11 @@ namespace {{packageName}}.Client`
`572`	`571`
`573`	`572`	`logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");`
`574`	`573`
`575`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`574`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`575`	`+`
	`576`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`576`	`577`
`577`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`578`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`578`	`579`
`579`	`580`	`InterceptRequest(request);`
`580`	`581`	`var response = await actualRestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,15 @@ namespace {{packageName}}.Client`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+`
	`81`	`+ if (merchConfigDictObj.ContainsKey("timeout"))`
	`82`	`+ {`
	`83`	`+ Timeout = int.Parse(merchConfigDictObj["timeout"]);`
	`84`	`+ }`
	`85`	`+ else`
	`86`	`+ {`
	`87`	`+ Timeout = timeout;`
	`88`	`+ }`
`80`	`89`	`}`
`81`	`90`
`82`	`91`	`if (defaultHeader != null)`