Modifications for rewrite of RestClient

gnongsie · gnongsie · commit b405d267bd56 · 2025-08-15T20:24:05.000+05:30
diff --git a/Client/ApiClient.cs b/Client/ApiClient.cs
@@ -38,12 +38,10 @@ 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)
             {
-                if (configuration.MerchantConfigDictionaryObj != null)
+                if (merchantConfig != null)
                 {
-                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
-
                     ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
                     ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
                 }
@@ -344,11 +342,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();
@@ -391,18 +391,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();
-
-            if (configuration.Proxy == null && merchantConfig.UseProxy != null)
+            IWebProxy webProxy = null;
+            
+            if (merchantConfig.UseProxy != null)
             {
                 if (bool.Parse(merchantConfig.UseProxy))
                 {
@@ -415,14 +413,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))
@@ -506,9 +504,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/Client/Configuration.cs b/Client/Configuration.cs
@@ -85,6 +85,15 @@ public Configuration(ApiClient apiClient = null,
                         }
                     }
                 }
+
+                if (merchConfigDictObj.ContainsKey("timeout"))
+                {
+                    Timeout = int.Parse(merchConfigDictObj["timeout"]);
+                }
+                else
+                {
+                    Timeout = timeout;
+                }
             }
 
             if (defaultHeader != null)
@@ -96,7 +105,6 @@ public Configuration(ApiClient apiClient = null,
 
             TempFolderPath = tempFolderPath;
             DateTimeFormat = dateTimeFormat;
-            Timeout = timeout;
             MerchantConfigDictionaryObj = merchConfigDictObj;
             MapToControlMLEonAPI = mapToControlMLEonAPI;
 
diff --git a/generator/cybersource-csharp-template/ApiClient.mustache b/generator/cybersource-csharp-template/ApiClient.mustache
@@ -39,12 +39,10 @@ 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)
             {
-                if (configuration.MerchantConfigDictionaryObj != null)
+                if (merchantConfig != null)
                 {
-                    var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);
-
                     ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);
                     ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);
                 }
@@ -383,11 +381,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();
@@ -441,18 +441,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))
                 {
@@ -465,14 +463,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))
@@ -557,9 +555,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/generator/cybersource-csharp-template/Configuration.mustache b/generator/cybersource-csharp-template/Configuration.mustache
@@ -76,6 +76,15 @@ namespace {{packageName}}.Client
                         }
                     }
                 }
+
+                if (merchConfigDictObj.ContainsKey("timeout"))
+                {
+                    Timeout = int.Parse(merchConfigDictObj["timeout"]);
+                }
+                else
+                {
+                    Timeout = {{#netStandard}}TimeSpan.FromMilliseconds({{/netStandard}}timeout{{#netStandard}}){{/netStandard}};
+                }
             }
 
             if (defaultHeader != null)
@@ -87,7 +96,6 @@ namespace {{packageName}}.Client
 
             TempFolderPath = tempFolderPath;
             DateTimeFormat = dateTimeFormat;
-            Timeout = {{#netStandard}}TimeSpan.FromMilliseconds({{/netStandard}}timeout{{#netStandard}}){{/netStandard}};
             MerchantConfigDictionaryObj = merchConfigDictObj;
             MapToControlMLEonAPI = mapToControlMLEonAPI;
 

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,10 @@ public class RestClientFactory`
`38`	`38`	`{`
`39`	`39`	`private static readonly ConcurrentDictionary<int, Lazy<RestClient>> _restClientInstances = new ConcurrentDictionary<int, Lazy<RestClient>>();`
`40`	`40`
`41`		`- public static RestClient GetRestClient(Configuration configuration, RestClientOptions clientOptions)`
	`41`	`+ public static RestClient GetRestClient(MerchantConfig merchantConfig, RestClientOptions clientOptions)`
`42`	`42`	`{`
`43`		`- if (configuration.MerchantConfigDictionaryObj != null)`
	`43`	`+ if (merchantConfig != null)`
`44`	`44`	`{`
`45`		`- var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);`
`46`		`-`
`47`	`45`	`ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);`
`48`	`46`	`ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);`
`49`	`47`	`}`
`@@ -344,11 +342,13 @@ public object CallApi(`
`344`	`342`	`path, method, queryParams, postBody, headerParams, formParams, fileParams,`
`345`	`343`	`pathParams, contentType);`
`346`	`344`
`347`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`345`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`346`	`+`
	`347`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`348`	`348`
`349`	`349`	`// RestClient.ClearHandlers();`
`350`	`350`
`351`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`351`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`352`	`352`
`353`	`353`	`// Logging Request Headers`
`354`	`354`	`var headerPrintOutput = new StringBuilder();`
`@@ -391,18 +391,16 @@ public object CallApi(`
`391`	`391`	`return response;`
`392`	`392`	`}`
`393`	`393`
`394`		`- private RestClientOptions GetRestClientOptions(Configuration configuration)`
	`394`	`+ private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)`
`395`	`395`	`{`
`396`	`396`	`RestClientOptions clientOptions = new RestClientOptions();`
`397`	`397`
`398`		`- clientOptions.UserAgent = configuration.UserAgent;`
`399`		`- clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);`
	`398`	`+ clientOptions.UserAgent = userAgent;`
	`399`	`+ clientOptions.Timeout = timeout;`
`400`	`400`
`401`		`- var merchantConfig = configuration.MerchantConfigDictionaryObj != null`
`402`		`- ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)`
`403`		`- : new MerchantConfig();`
`404`		`-`
`405`		`- if (configuration.Proxy == null && merchantConfig.UseProxy != null)`
	`401`	`+ IWebProxy webProxy = null;`
	`402`	`+`
	`403`	`+ if (merchantConfig.UseProxy != null)`
`406`	`404`	`{`
`407`	`405`	`if (bool.Parse(merchantConfig.UseProxy))`
`408`	`406`	`{`
`@@ -415,14 +413,14 @@ private RestClientOptions GetRestClientOptions(Configuration configuration)`
`415`	`413`	`proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);`
`416`	`414`	`}`
`417`	`415`
`418`		`- configuration.AddWebProxy(proxy);`
	`416`	`+ webProxy = proxy;`
`419`	`417`	`}`
`420`	`418`	`}`
`421`	`419`	`}`
`422`	`420`
`423`		`- if (configuration.Proxy != null)`
	`421`	`+ if (webProxy != null)`
`424`	`422`	`{`
`425`		`- clientOptions.Proxy = configuration.Proxy;`
	`423`	`+ clientOptions.Proxy = webProxy;`
`426`	`424`	`}`
`427`	`425`
`428`	`426`	`if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))`
`@@ -506,9 +504,11 @@ public async System.Threading.Tasks.Task<object> CallApiAsync(`
`506`	`504`
`507`	`505`	`logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");`
`508`	`506`
`509`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`507`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`508`	`+`
	`509`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`510`	`510`
`511`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`511`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`512`	`512`
`513`	`513`	`InterceptRequest(request);`
`514`	`514`	`var response = await actualRestClient.ExecuteAsync(request);`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,15 @@ public Configuration(ApiClient apiClient = null,`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ if (merchConfigDictObj.ContainsKey("timeout"))`
	`90`	`+ {`
	`91`	`+ Timeout = int.Parse(merchConfigDictObj["timeout"]);`
	`92`	`+ }`
	`93`	`+ else`
	`94`	`+ {`
	`95`	`+ Timeout = timeout;`
	`96`	`+ }`
`88`	`97`	`}`
`89`	`98`
`90`	`99`	`if (defaultHeader != null)`
`@@ -96,7 +105,6 @@ public Configuration(ApiClient apiClient = null,`
`96`	`105`
`97`	`106`	`TempFolderPath = tempFolderPath;`
`98`	`107`	`DateTimeFormat = dateTimeFormat;`
`99`		`- Timeout = timeout;`
`100`	`108`	`MerchantConfigDictionaryObj = merchConfigDictObj;`
`101`	`109`	`MapToControlMLEonAPI = mapToControlMLEonAPI;`
`102`	`110`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,10 @@ namespace {{packageName}}.Client`
`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`		`- if (configuration.MerchantConfigDictionaryObj != null)`
	`44`	`+ if (merchantConfig != null)`
`45`	`45`	`{`
`46`		`- var merchantConfig = new MerchantConfig(configuration.MerchantConfigDictionaryObj);`
`47`		`-`
`48`	`46`	`ServicePointManager.DefaultConnectionLimit = int.Parse(merchantConfig.MaxConnectionPoolSize);`
`49`	`47`	`ServicePointManager.MaxServicePointIdleTime = int.Parse(merchantConfig.KeepAliveTime);`
`50`	`48`	`}`
`@@ -383,11 +381,13 @@ namespace {{packageName}}.Client`
`383`	`381`	`path, method, queryParams, postBody, headerParams, formParams, fileParams,`
`384`	`382`	`pathParams, contentType);`
`385`	`383`
`386`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`384`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`385`	`+`
	`386`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`387`	`387`
`388`	`388`	`// RestClient.ClearHandlers();`
`389`	`389`
`390`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`390`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`391`	`391`
`392`	`392`	`// Logging Request Headers`
`393`	`393`	`var headerPrintOutput = new StringBuilder();`
`@@ -441,18 +441,16 @@ namespace {{packageName}}.Client`
`441`	`441`	`return response;`
`442`	`442`	`}`
`443`	`443`
`444`		`- private RestClientOptions GetRestClientOptions(Configuration configuration)`
	`444`	`+ private RestClientOptions GetRestClientOptions(MerchantConfig merchantConfig, string userAgent, TimeSpan timeout)`
`445`	`445`	`{`
`446`	`446`	`RestClientOptions clientOptions = new RestClientOptions();`
`447`	`447`
`448`		`- clientOptions.UserAgent = configuration.UserAgent;`
`449`		`- clientOptions.Timeout = TimeSpan.FromMilliseconds(configuration.Timeout);`
	`448`	`+ clientOptions.UserAgent = userAgent;`
	`449`	`+ clientOptions.Timeout = timeout;`
`450`	`450`
`451`		`- var merchantConfig = configuration.MerchantConfigDictionaryObj != null`
`452`		`- ? new MerchantConfig(configuration.MerchantConfigDictionaryObj)`
`453`		`- : new MerchantConfig();`
	`451`	`+ IWebProxy webProxy = null;`
`454`	`452`
`455`		`- if (configuration.Proxy == null && merchantConfig.UseProxy != null)`
	`453`	`+ if (merchantConfig.UseProxy != null)`
`456`	`454`	`{`
`457`	`455`	`if (bool.Parse(merchantConfig.UseProxy))`
`458`	`456`	`{`
`@@ -465,14 +463,14 @@ namespace {{packageName}}.Client`
`465`	`463`	`proxy.Credentials = new NetworkCredential(merchantConfig.ProxyUsername, merchantConfig.ProxyPassword);`
`466`	`464`	`}`
`467`	`465`
`468`		`- configuration.AddWebProxy(proxy);`
	`466`	`+ webProxy = proxy;`
`469`	`467`	`}`
`470`	`468`	`}`
`471`	`469`	`}`
`472`	`470`
`473`		`- if (configuration.Proxy != null)`
	`471`	`+ if (webProxy != null)`
`474`	`472`	`{`
`475`		`- clientOptions.Proxy = configuration.Proxy;`
	`473`	`+ clientOptions.Proxy = webProxy;`
`476`	`474`	`}`
`477`	`475`
`478`	`476`	`if (Equals(bool.Parse(merchantConfig.EnableClientCert), true))`
`@@ -557,9 +555,11 @@ namespace {{packageName}}.Client`
`557`	`555`
`558`	`556`	`logger.Debug($"HTTP Request Headers :\n{logUtility.MaskSensitiveData(headerPrintOutput.ToString())}");`
`559`	`557`
`560`		`- var newRestClientOptions = GetRestClientOptions(Configuration);`
	`558`	`+ MerchantConfig merchantConfig = new MerchantConfig(merchantConfigDictionary: Configuration.MerchantConfigDictionaryObj, mapToControlMLEonAPI: Configuration.MapToControlMLEonAPI);`
	`559`	`+`
	`560`	`+ var newRestClientOptions = GetRestClientOptions(merchantConfig, Configuration.UserAgent, TimeSpan.FromMilliseconds(Configuration.Timeout));`
`561`	`561`
`562`		`- var actualRestClient = RestClientFactory.GetRestClient(Configuration, newRestClientOptions);`
	`562`	`+ var actualRestClient = RestClientFactory.GetRestClient(merchantConfig, newRestClientOptions);`
`563`	`563`
`564`	`564`	`InterceptRequest(request);`
`565`	`565`	`var response = await actualRestClient.Execute{{^netStandard}}Async{{/netStandard}}(request);`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,15 @@ namespace {{packageName}}.Client`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ if (merchConfigDictObj.ContainsKey("timeout"))`
	`81`	`+ {`
	`82`	`+ Timeout = int.Parse(merchConfigDictObj["timeout"]);`
	`83`	`+ }`
	`84`	`+ else`
	`85`	`+ {`
	`86`	`+ Timeout = {{#netStandard}}TimeSpan.FromMilliseconds({{/netStandard}}timeout{{#netStandard}}){{/netStandard}};`
	`87`	`+ }`
`79`	`88`	`}`
`80`	`89`
`81`	`90`	`if (defaultHeader != null)`
`@@ -87,7 +96,6 @@ namespace {{packageName}}.Client`
`87`	`96`
`88`	`97`	`TempFolderPath = tempFolderPath;`
`89`	`98`	`DateTimeFormat = dateTimeFormat;`
`90`		`- Timeout = {{#netStandard}}TimeSpan.FromMilliseconds({{/netStandard}}timeout{{#netStandard}}){{/netStandard}};`
`91`	`99`	`MerchantConfigDictionaryObj = merchConfigDictObj;`
`92`	`100`	`MapToControlMLEonAPI = mapToControlMLEonAPI;`
`93`	`101`