diff --git a/src/Trakx.Circle.ApiClient.Tests/Trakx.Circle.ApiClient.Tests.csproj b/src/Trakx.Circle.ApiClient.Tests/Trakx.Circle.ApiClient.Tests.csproj index b54a5f5..bfcafdb 100644 --- a/src/Trakx.Circle.ApiClient.Tests/Trakx.Circle.ApiClient.Tests.csproj +++ b/src/Trakx.Circle.ApiClient.Tests/Trakx.Circle.ApiClient.Tests.csproj @@ -7,7 +7,10 @@ - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -15,10 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Trakx.Circle.ApiClient/AuthorisedClient.cs b/src/Trakx.Circle.ApiClient/AuthorisedClient.cs index 8ea4705..8815fa3 100644 --- a/src/Trakx.Circle.ApiClient/AuthorisedClient.cs +++ b/src/Trakx.Circle.ApiClient/AuthorisedClient.cs @@ -2,25 +2,9 @@ namespace Trakx.Circle.ApiClient; -internal abstract class AuthorisedClient +internal abstract class AuthorisedClient(ClientConfigurator configurator) { - private readonly ICredentialsProvider _credentialProvider; - private readonly IHttpClientFactory _httpClientFactory; - private readonly string _httpClientName; - - protected AuthorisedClient(ClientConfigurator configurator) - { - _credentialProvider = configurator.CredentialsProvider; - _httpClientFactory = configurator.HttpClientFactory; - _httpClientName = GetType().FullName!; - } - - protected async Task CreateHttpClientAsync(CancellationToken cancellationToken) - { - await Task.CompletedTask; - var httpClient = _httpClientFactory.CreateClient(_httpClientName); - return httpClient; - } + private readonly ICredentialsProvider _credentialProvider = configurator.CredentialsProvider; protected async Task CreateHttpRequestMessageAsync(CancellationToken cancellationToken) { diff --git a/src/Trakx.Circle.ApiClient/CircleApiClientInterfaces.cs b/src/Trakx.Circle.ApiClient/CircleApiClientInterfaces.cs index bc0adbb..c1f07da 100644 --- a/src/Trakx.Circle.ApiClient/CircleApiClientInterfaces.cs +++ b/src/Trakx.Circle.ApiClient/CircleApiClientInterfaces.cs @@ -5697,11 +5697,11 @@ public enum Destination2Type } -#pragma warning restore 108 -#pragma warning restore 114 -#pragma warning restore 472 -#pragma warning restore 612 -#pragma warning restore 649 +#pragma warning restore 108 +#pragma warning restore 114 +#pragma warning restore 472 +#pragma warning restore 612 +#pragma warning restore 649 #pragma warning restore 1573 #pragma warning restore 1591 #pragma warning restore 8073 diff --git a/src/Trakx.Circle.ApiClient/CircleApiClients.cs b/src/Trakx.Circle.ApiClient/CircleApiClients.cs index a81abf8..e5a33e7 100644 --- a/src/Trakx.Circle.ApiClient/CircleApiClients.cs +++ b/src/Trakx.Circle.ApiClient/CircleApiClients.cs @@ -33,13 +33,15 @@ namespace Trakx.Circle.ApiClient [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleAccountsClient : AuthorisedClient, ICircleAccountsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleAccountsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleAccountsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -71,8 +73,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetBalancesAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -81,7 +83,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/balances" urlBuilder_.Append("v1/businessAccount/balances"); @@ -163,21 +165,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -239,7 +241,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -251,13 +253,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -282,13 +284,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CirclePaymentsClient : AuthorisedClient, ICirclePaymentsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CirclePaymentsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CirclePaymentsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -348,8 +352,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetPaymentsAsync(System.Guid? settlementId = null, System.Collections.Generic.List type = null, System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, Status? status = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -358,7 +362,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/payments" urlBuilder_.Append("v1/payments"); urlBuilder_.Append('?'); @@ -368,7 +372,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() } if (type != null) { - foreach (var item_ in type) { urlBuilder_.Append(System.Uri.EscapeDataString("type")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); } + foreach (var item_ in type) { urlBuilder_.Append(System.Uri.EscapeDataString("type")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(item_, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); } } if (from != null) { @@ -466,8 +470,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreatePaymentAsync(CardPaymentCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -480,7 +484,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/payments" urlBuilder_.Append("v1/payments"); @@ -578,8 +582,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -588,7 +592,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/payments/{id}" urlBuilder_.Append("v1/payments/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -684,8 +688,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -698,7 +702,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/payments/{id}/cancel" urlBuilder_.Append("v1/payments/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -793,8 +797,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -807,7 +811,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/payments/{id}/refund" urlBuilder_.Append("v1/payments/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -896,8 +900,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateWirePaymentAsync(MockWirePaymentRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -910,7 +914,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/mocks/payments/wire" urlBuilder_.Append("v1/mocks/payments/wire"); @@ -997,8 +1001,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateWalletAsync(WalletCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1011,7 +1015,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets" urlBuilder_.Append("v1/wallets"); @@ -1106,8 +1110,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetWalletsAsync(System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1116,7 +1120,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets" urlBuilder_.Append("v1/wallets"); urlBuilder_.Append('?'); @@ -1216,8 +1220,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1226,7 +1230,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets/{id}" urlBuilder_.Append("v1/wallets/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -1308,8 +1312,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1322,7 +1326,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets/{id}/addresses" urlBuilder_.Append("v1/wallets/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -1453,8 +1457,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1463,7 +1467,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets/{id}/addresses" urlBuilder_.Append("v1/wallets/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -1579,21 +1583,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -1655,7 +1659,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -1667,13 +1671,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -1698,13 +1702,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleCardsClient : AuthorisedClient, ICircleCardsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleCardsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleCardsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -1733,8 +1739,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateCardAsync(CardCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1747,7 +1753,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/cards" urlBuilder_.Append("v1/cards"); @@ -1857,8 +1863,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetCardsAsync(string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1867,7 +1873,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/cards" urlBuilder_.Append("v1/cards"); urlBuilder_.Append('?'); @@ -1959,8 +1965,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -1969,7 +1975,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/cards/{id}" urlBuilder_.Append("v1/cards/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -2058,8 +2064,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2072,7 +2078,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/cards/{id}" urlBuilder_.Append("v1/cards/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -2145,21 +2151,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -2221,7 +2227,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -2233,13 +2239,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -2264,13 +2270,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleBankAccountsClient : AuthorisedClient, ICircleBankAccountsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleBankAccountsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleBankAccountsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -2299,8 +2307,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateWireBankAccountAsync(WireCreationRequest_iban body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2313,7 +2321,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/banks/wires" urlBuilder_.Append("v1/banks/wires"); @@ -2411,8 +2419,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2421,7 +2429,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/banks/wires/{id}" urlBuilder_.Append("v1/banks/wires/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -2510,8 +2518,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2520,7 +2528,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/banks/wires/{id}/instructions" urlBuilder_.Append("v1/banks/wires/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -2609,8 +2617,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateACHBankAccountAsync(ACHCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2623,7 +2631,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/banks/ach" urlBuilder_.Append("v1/banks/ach"); @@ -2714,8 +2722,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2724,7 +2732,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/banks/ach/{id}" urlBuilder_.Append("v1/banks/ach/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -2812,8 +2820,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateAchAccountAsync(MockAchAccountCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -2826,7 +2834,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/mocks/ach/accounts" urlBuilder_.Append("v1/mocks/ach/accounts"); @@ -2918,21 +2926,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -2994,7 +3002,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -3006,13 +3014,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -3037,13 +3045,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleSettlementsClient : AuthorisedClient, ICircleSettlementsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleSettlementsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleSettlementsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -3100,8 +3110,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetSettlementsAsync(System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -3110,7 +3120,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/settlements" urlBuilder_.Append("v1/settlements"); urlBuilder_.Append('?'); @@ -3210,8 +3220,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -3220,7 +3230,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/settlements/{id}" urlBuilder_.Append("v1/settlements/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -3313,21 +3323,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -3389,7 +3399,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -3401,13 +3411,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -3432,13 +3442,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleChargebacksClient : AuthorisedClient, ICircleChargebacksClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleChargebacksClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleChargebacksClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -3498,8 +3510,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetChargebacksAsync(System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -3508,7 +3520,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/chargebacks" urlBuilder_.Append("v1/chargebacks"); urlBuilder_.Append('?'); @@ -3618,8 +3630,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -3628,7 +3640,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/chargebacks/{id}" urlBuilder_.Append("v1/chargebacks/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -3716,8 +3728,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateMockChargebackAsync(MockChargebackCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -3730,7 +3742,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/mocks/cards/chargebacks" urlBuilder_.Append("v1/mocks/cards/chargebacks"); @@ -3842,21 +3854,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -3918,7 +3930,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -3930,13 +3942,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -3961,13 +3973,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleReversalsClient : AuthorisedClient, ICircleReversalsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleReversalsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleReversalsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -4027,8 +4041,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetReversalsAsync(System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4037,7 +4051,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/reversals" urlBuilder_.Append("v1/reversals"); urlBuilder_.Append('?'); @@ -4151,21 +4165,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -4227,7 +4241,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -4239,13 +4253,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -4270,13 +4284,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleBusinessAccountClient : AuthorisedClient, ICircleBusinessAccountClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleBusinessAccountClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleBusinessAccountClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -4308,8 +4324,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetSignetBanksAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4318,7 +4334,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/signet" urlBuilder_.Append("v1/businessAccount/banks/signet"); @@ -4405,8 +4421,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateSignetBankAsync(SignetBankCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4419,7 +4435,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/signet" urlBuilder_.Append("v1/businessAccount/banks/signet"); @@ -4530,8 +4546,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4540,7 +4556,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/signet/{id}" urlBuilder_.Append("v1/businessAccount/banks/signet/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -4638,8 +4654,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateSilverGateBankAsync(SilverGateSenBankRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4652,7 +4668,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/sen" urlBuilder_.Append("v1/businessAccount/banks/sen"); @@ -4759,8 +4775,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> GetSilverGateBanksAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4769,7 +4785,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/sen" urlBuilder_.Append("v1/businessAccount/banks/sen"); @@ -4856,8 +4872,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateSilverGateMockTransferAsync(SilverGateSenBankTransferRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4870,7 +4886,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/mocks/payments/sen" urlBuilder_.Append("v1/mocks/payments/sen"); @@ -4981,8 +4997,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -4991,7 +5007,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/businessAccount/banks/sen/{id}/instructions" urlBuilder_.Append("v1/businessAccount/banks/sen/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -5095,21 +5111,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -5171,7 +5187,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -5183,13 +5199,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -5214,13 +5230,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleWalletsClient : AuthorisedClient, ICircleWalletsClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleWalletsClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleWalletsClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -5256,8 +5274,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (walletId == null) throw new System.ArgumentNullException("walletId"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -5270,7 +5288,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets/{walletId}/addresses" urlBuilder_.Append("v1/wallets/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(walletId, System.Globalization.CultureInfo.InvariantCulture))); @@ -5401,8 +5419,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (walletId == null) throw new System.ArgumentNullException("walletId"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -5411,7 +5429,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/wallets/{walletId}/addresses" urlBuilder_.Append("v1/wallets/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(walletId, System.Globalization.CultureInfo.InvariantCulture))); @@ -5527,21 +5545,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -5603,7 +5621,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -5615,13 +5633,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -5646,13 +5664,15 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.6.3.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))")] internal partial class CircleTransfersClient : AuthorisedClient, ICircleTransfersClient { + private System.Net.Http.HttpClient _httpClient; private static System.Lazy _settings = new System.Lazy(CreateSerializerSettings, true); private Newtonsoft.Json.JsonSerializerSettings _instanceSettings; -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. - public CircleTransfersClient(ClientConfigurator configuration) : base(configuration) -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. + public CircleTransfersClient(ClientConfigurator configuration, System.Net.Http.HttpClient httpClient) : base(configuration) + #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. { + _httpClient = httpClient; Initialize(); } @@ -5684,8 +5704,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task> CreateTransferAsync(TransferCreationRequest body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -5698,7 +5718,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/transfers" urlBuilder_.Append("v1/transfers"); @@ -5796,8 +5816,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() /// A server side error occurred. public virtual async System.Threading.Tasks.Task>> SearchTransfersAsync(string walletId = null, string sourceWalletId = null, string destinationWalletId = null, System.DateTimeOffset? from = null, System.DateTimeOffset? to = null, string pageBefore = null, string pageAfter = null, int? pageSize = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -5806,7 +5826,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/transfers" urlBuilder_.Append("v1/transfers"); urlBuilder_.Append('?'); @@ -5918,8 +5938,8 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() if (id == null) throw new System.ArgumentNullException("id"); - var client_ = await CreateHttpClientAsync(cancellationToken).ConfigureAwait(false); - var disposeClient_ = true; + var client_ = _httpClient; + var disposeClient_ = false; try { using (var request_ = await CreateHttpRequestMessageAsync(cancellationToken).ConfigureAwait(false)) @@ -5928,7 +5948,7 @@ private static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); var urlBuilder_ = new System.Text.StringBuilder(); - + // Operation Path: "v1/transfers/{id}" urlBuilder_.Append("v1/transfers/"); urlBuilder_.Append(System.Uri.EscapeDataString(ConvertToString(id, System.Globalization.CultureInfo.InvariantCulture))); @@ -6001,21 +6021,21 @@ public ObjectResponseResult(T responseObject, string responseText) [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStringAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStringAsync(cancellationToken); -#else + #else return content.ReadAsStringAsync(); -#endif + #endif } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] private static System.Threading.Tasks.Task ReadAsStreamAsync(System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { -#if NET5_0_OR_GREATER + #if NET5_0_OR_GREATER return content.ReadAsStreamAsync(cancellationToken); -#else + #else return content.ReadAsStreamAsync(); -#endif + #endif } public bool ReadResponseAsString { get; set; } @@ -6077,7 +6097,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu var field_ = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name); if (field_ != null) { - var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) + var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field_, typeof(System.Runtime.Serialization.EnumMemberAttribute)) as System.Runtime.Serialization.EnumMemberAttribute; if (attribute != null) { @@ -6089,13 +6109,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu return converted == null ? string.Empty : converted; } } - else if (value is bool) + else if (value is bool) { return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant(); } else if (value is byte[]) { - return System.Convert.ToBase64String((byte[])value); + return System.Convert.ToBase64String((byte[]) value); } else if (value is string[]) { @@ -6119,12 +6139,11 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu } -#pragma warning restore 108 -#pragma warning restore CS0618 -#pragma warning restore 114 -#pragma warning restore 472 -#pragma warning restore 612 -#pragma warning restore 649 +#pragma warning restore 108 +#pragma warning restore 114 +#pragma warning restore 472 +#pragma warning restore 612 +#pragma warning restore 649 #pragma warning restore 1573 #pragma warning restore 1591 #pragma warning restore 8073 diff --git a/src/Trakx.Circle.ApiClient/Trakx.Circle.ApiClient.csproj b/src/Trakx.Circle.ApiClient/Trakx.Circle.ApiClient.csproj index bf4affe..20f07c4 100644 --- a/src/Trakx.Circle.ApiClient/Trakx.Circle.ApiClient.csproj +++ b/src/Trakx.Circle.ApiClient/Trakx.Circle.ApiClient.csproj @@ -12,8 +12,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Trakx.Circle.ApiClient/nswag.json b/src/Trakx.Circle.ApiClient/nswag.json index 87dbbfc..0e888ac 100644 --- a/src/Trakx.Circle.ApiClient/nswag.json +++ b/src/Trakx.Circle.ApiClient/nswag.json @@ -14,13 +14,13 @@ "generateClientClasses": true, "generateClientInterfaces": true, "clientBaseInterface": "ICircleApiClientBase", - "injectHttpClient": false, + "injectHttpClient": true, "disposeHttpClient": true, "protectedMethods": [], "generateExceptionClasses": false, "exceptionClass": "ApiException", "wrapDtoExceptions": true, - "useHttpClientCreationMethod": true, + "useHttpClientCreationMethod": false, "httpClientType": "System.Net.Http.HttpClient", "useHttpRequestMessageCreationMethod": true, "useBaseUrl": false,