Skip to content

Commit b5b760a

Browse files
[csharp] Address obsolete build warnings in ApiClient (#19847)
* Stop using obsolete MaxTimeout * Convert timeout to a timespan, rather than update the configuration object * Use async overload of RestClientExtensions.Deserialize * Update samples * Fix typo * Undo timeout change
1 parent 8849156 commit b5b760a

File tree

12 files changed

+48
-48
lines changed
  • modules/openapi-generator/src/main/resources/csharp
  • samples/client
    • echo_api/csharp-restsharp/src/Org.OpenAPITools/Client
    • others/csharp-complex-files/src/Org.OpenAPITools/Client
    • petstore/csharp/restsharp

12 files changed

+48
-48
lines changed

modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache

+4-4
Original file line numberDiff line numberDiff line change
@@ -550,11 +550,11 @@ namespace {{packageName}}.Client
550550
}
551551
}
552552
553-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
553+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
554554
{
555555
if (policyResult.Outcome == OutcomeType.Successful)
556556
{
557-
return client.Deserialize<T>(policyResult.Result);
557+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
558558
}
559559
else
560560
{
@@ -587,7 +587,7 @@ namespace {{packageName}}.Client
587587
{
588588
var policy = RetryConfiguration.RetryPolicy;
589589
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
590-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
590+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
591591
}
592592
else
593593
{
@@ -613,7 +613,7 @@ namespace {{packageName}}.Client
613613
{
614614
var policy = RetryConfiguration.AsyncRetryPolicy;
615615
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
616-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
616+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
617617
}
618618
else
619619
{

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
533533
}
534534
}
535535

536-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
536+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
537537
{
538538
if (policyResult.Outcome == OutcomeType.Successful)
539539
{
540-
return client.Deserialize<T>(policyResult.Result);
540+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
541541
}
542542
else
543543
{
@@ -570,7 +570,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
570570
{
571571
var policy = RetryConfiguration.RetryPolicy;
572572
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
573-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
573+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
574574
}
575575
else
576576
{
@@ -594,7 +594,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
594594
{
595595
var policy = RetryConfiguration.AsyncRetryPolicy;
596596
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
597-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
597+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
598598
}
599599
else
600600
{

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
533533
}
534534
}
535535

536-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
536+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
537537
{
538538
if (policyResult.Outcome == OutcomeType.Successful)
539539
{
540-
return client.Deserialize<T>(policyResult.Result);
540+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
541541
}
542542
else
543543
{
@@ -570,7 +570,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
570570
{
571571
var policy = RetryConfiguration.RetryPolicy;
572572
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
573-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
573+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
574574
}
575575
else
576576
{
@@ -594,7 +594,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
594594
{
595595
var policy = RetryConfiguration.AsyncRetryPolicy;
596596
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
597-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
597+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
598598
}
599599
else
600600
{

samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
549549
}
550550
}
551551

552-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
552+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
553553
{
554554
if (policyResult.Outcome == OutcomeType.Successful)
555555
{
556-
return client.Deserialize<T>(policyResult.Result);
556+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
557557
}
558558
else
559559
{
@@ -586,7 +586,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
586586
{
587587
var policy = RetryConfiguration.RetryPolicy;
588588
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
589-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
589+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
590590
}
591591
else
592592
{
@@ -610,7 +610,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
610610
{
611611
var policy = RetryConfiguration.AsyncRetryPolicy;
612612
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
613-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
613+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
614614
}
615615
else
616616
{

samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
549549
}
550550
}
551551

552-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
552+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
553553
{
554554
if (policyResult.Outcome == OutcomeType.Successful)
555555
{
556-
return client.Deserialize<T>(policyResult.Result);
556+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
557557
}
558558
else
559559
{
@@ -586,7 +586,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
586586
{
587587
var policy = RetryConfiguration.RetryPolicy;
588588
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
589-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
589+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
590590
}
591591
else
592592
{
@@ -610,7 +610,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
610610
{
611611
var policy = RetryConfiguration.AsyncRetryPolicy;
612612
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
613-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
613+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
614614
}
615615
else
616616
{

samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
549549
}
550550
}
551551

552-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
552+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
553553
{
554554
if (policyResult.Outcome == OutcomeType.Successful)
555555
{
556-
return client.Deserialize<T>(policyResult.Result);
556+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
557557
}
558558
else
559559
{
@@ -586,7 +586,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
586586
{
587587
var policy = RetryConfiguration.RetryPolicy;
588588
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
589-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
589+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
590590
}
591591
else
592592
{
@@ -610,7 +610,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
610610
{
611611
var policy = RetryConfiguration.AsyncRetryPolicy;
612612
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
613-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
613+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
614614
}
615615
else
616616
{

samples/client/petstore/csharp/restsharp/net6/ParameterMappings/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
532532
}
533533
}
534534

535-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
535+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
536536
{
537537
if (policyResult.Outcome == OutcomeType.Successful)
538538
{
539-
return client.Deserialize<T>(policyResult.Result);
539+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
540540
}
541541
else
542542
{
@@ -569,7 +569,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
569569
{
570570
var policy = RetryConfiguration.RetryPolicy;
571571
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
572-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
572+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
573573
}
574574
else
575575
{
@@ -593,7 +593,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
593593
{
594594
var policy = RetryConfiguration.AsyncRetryPolicy;
595595
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
596-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
596+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
597597
}
598598
else
599599
{

samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
548548
}
549549
}
550550

551-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
551+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
552552
{
553553
if (policyResult.Outcome == OutcomeType.Successful)
554554
{
555-
return client.Deserialize<T>(policyResult.Result);
555+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
556556
}
557557
else
558558
{
@@ -585,7 +585,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
585585
{
586586
var policy = RetryConfiguration.RetryPolicy;
587587
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
588-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
588+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
589589
}
590590
else
591591
{
@@ -609,7 +609,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
609609
{
610610
var policy = RetryConfiguration.AsyncRetryPolicy;
611611
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
612-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
612+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
613613
}
614614
else
615615
{

samples/client/petstore/csharp/restsharp/net7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
548548
}
549549
}
550550

551-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
551+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
552552
{
553553
if (policyResult.Outcome == OutcomeType.Successful)
554554
{
555-
return client.Deserialize<T>(policyResult.Result);
555+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
556556
}
557557
else
558558
{
@@ -585,7 +585,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
585585
{
586586
var policy = RetryConfiguration.RetryPolicy;
587587
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
588-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
588+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
589589
}
590590
else
591591
{
@@ -609,7 +609,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
609609
{
610610
var policy = RetryConfiguration.AsyncRetryPolicy;
611611
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
612-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
612+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
613613
}
614614
else
615615
{

samples/client/petstore/csharp/restsharp/net7/UseDateTimeForDate/src/Org.OpenAPITools/Client/ApiClient.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -532,11 +532,11 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
532532
}
533533
}
534534

535-
private RestResponse<T> DeserializeRestResponseFromPolicy<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult)
535+
private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(RestClient client, RestRequest request, PolicyResult<RestResponse> policyResult, CancellationToken cancellationToken = default)
536536
{
537537
if (policyResult.Outcome == OutcomeType.Successful)
538538
{
539-
return client.Deserialize<T>(policyResult.Result);
539+
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
540540
}
541541
else
542542
{
@@ -569,7 +569,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
569569
{
570570
var policy = RetryConfiguration.RetryPolicy;
571571
var policyResult = policy.ExecuteAndCapture(() => client.Execute(request));
572-
return Task.FromResult(DeserializeRestResponseFromPolicy<T>(client, request, policyResult));
572+
return DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult);
573573
}
574574
else
575575
{
@@ -593,7 +593,7 @@ private ApiResponse<T> Exec<T>(RestRequest request, RequestOptions options, IRea
593593
{
594594
var policy = RetryConfiguration.AsyncRetryPolicy;
595595
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
596-
return DeserializeRestResponseFromPolicy<T>(client, request, policyResult);
596+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
597597
}
598598
else
599599
{

0 commit comments

Comments
 (0)