loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix: memory leak with restclient (#13961) (#16365)

Browse Source
This commit is contained in:
clement-brodu 2023-08-21 14:26:37 +02:00 committed by GitHub
parent 656d2c2263
commit 1a458d3e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1761 additions and 1739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache vendored
View File

@ -454,16 +454,16 @@ namespace {{packageName}}.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
{{#hasOAuthMethods}} {{#hasOAuthMethods}}
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -551,6 +551,7 @@ namespace {{packageName}}.Client
} }
return result; return result;
} }
}
{{#supportsAsync}} {{#supportsAsync}}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
@ -566,16 +567,16 @@ namespace {{packageName}}.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
{{#hasOAuthMethods}} {{#hasOAuthMethods}}
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -656,6 +657,7 @@ namespace {{packageName}}.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

14
samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -455,9 +455,9 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -536,6 +536,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -550,9 +551,9 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -620,6 +621,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

14
samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -453,9 +453,9 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -534,6 +534,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -548,9 +549,9 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -618,6 +619,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

14
samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -454,9 +454,9 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -535,6 +535,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -549,9 +550,9 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
InterceptRequest(request); InterceptRequest(request);
RestResponse<T> response; RestResponse<T> response;
@ -619,6 +620,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -454,15 +454,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -549,6 +549,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -563,15 +564,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -647,6 +648,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -455,15 +455,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -550,6 +550,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -564,15 +565,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -648,6 +649,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClient-net48/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -455,15 +455,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -550,6 +550,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -564,15 +565,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -648,6 +649,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -455,15 +455,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -550,6 +550,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -564,15 +565,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -648,6 +649,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -454,15 +454,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -549,6 +549,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -563,15 +564,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -647,6 +648,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -455,15 +455,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -550,6 +550,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -564,15 +565,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -648,6 +649,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>

18
samples/client/petstore/csharp/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/ApiClient.cs
View File

@ -454,15 +454,15 @@ namespace Org.OpenAPITools.Client
RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback RemoteCertificateValidationCallback = configuration.RemoteCertificateValidationCallback
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -549,6 +549,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) private async Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions options, IReadableConfiguration configuration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{ {
@ -563,15 +564,15 @@ namespace Org.OpenAPITools.Client
UseDefaultCredentials = configuration.UseDefaultCredentials UseDefaultCredentials = configuration.UseDefaultCredentials
}; };
RestClient client = new RestClient(clientOptions, using (RestClient client = new RestClient(clientOptions,
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))); configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(SerializerSettings, configuration))))
{
if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) && if (!string.IsNullOrEmpty(configuration.OAuthTokenUrl) &&
!string.IsNullOrEmpty(configuration.OAuthClientId) && !string.IsNullOrEmpty(configuration.OAuthClientId) &&
!string.IsNullOrEmpty(configuration.OAuthClientSecret) && !string.IsNullOrEmpty(configuration.OAuthClientSecret) &&
configuration.OAuthFlow != null) configuration.OAuthFlow != null)
{ {
client = client.UseAuthenticator(new OAuthAuthenticator( client.UseAuthenticator(new OAuthAuthenticator(
configuration.OAuthTokenUrl, configuration.OAuthTokenUrl,
configuration.OAuthClientId, configuration.OAuthClientId,
configuration.OAuthClientSecret, configuration.OAuthClientSecret,
@ -647,6 +648,7 @@ namespace Org.OpenAPITools.Client
} }
return result; return result;
} }
}
#region IAsynchronousClient #region IAsynchronousClient
/// <summary> /// <summary>