Skip to content

Commit d6c4634

Browse files
authored
[csharp] Add missing ConfigureAwait(false) for csharp generator (#21244)
* [csharp] ApiClient.mustache: Apply ConfigureAwait(false) consistently * [csharp] Update samples to include 59936f2
1 parent bb811db commit d6c4634

File tree

14 files changed

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

14 files changed

+42
-42
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ namespace {{packageName}}.Client
493493
{
494494
InterceptRequest(request);
495495
496-
RestResponse<T> response = await getResponse(client);
496+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
497497
498498
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
499499
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -562,7 +562,7 @@ namespace {{packageName}}.Client
562562
{
563563
if (policyResult.Outcome == OutcomeType.Successful)
564564
{
565-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
565+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
566566
}
567567
else
568568
{
@@ -621,7 +621,7 @@ namespace {{packageName}}.Client
621621
{
622622
var policy = RetryConfiguration.AsyncRetryPolicy;
623623
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
624-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
624+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
625625
}
626626
else
627627
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
476476
{
477477
InterceptRequest(request);
478478

479-
RestResponse<T> response = await getResponse(client);
479+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
480480

481481
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
482482
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -545,7 +545,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
545545
{
546546
if (policyResult.Outcome == OutcomeType.Successful)
547547
{
548-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
548+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
549549
}
550550
else
551551
{
@@ -602,7 +602,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
602602
{
603603
var policy = RetryConfiguration.AsyncRetryPolicy;
604604
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
605-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
605+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
606606
}
607607
else
608608
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
476476
{
477477
InterceptRequest(request);
478478

479-
RestResponse<T> response = await getResponse(client);
479+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
480480

481481
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
482482
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -545,7 +545,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
545545
{
546546
if (policyResult.Outcome == OutcomeType.Successful)
547547
{
548-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
548+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
549549
}
550550
else
551551
{
@@ -602,7 +602,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
602602
{
603603
var policy = RetryConfiguration.AsyncRetryPolicy;
604604
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
605-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
605+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
606606
}
607607
else
608608
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
492492
{
493493
InterceptRequest(request);
494494

495-
RestResponse<T> response = await getResponse(client);
495+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
496496

497497
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
498498
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
561561
{
562562
if (policyResult.Outcome == OutcomeType.Successful)
563563
{
564-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
564+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
565565
}
566566
else
567567
{
@@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
618618
{
619619
var policy = RetryConfiguration.AsyncRetryPolicy;
620620
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
621-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
621+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
622622
}
623623
else
624624
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
492492
{
493493
InterceptRequest(request);
494494

495-
RestResponse<T> response = await getResponse(client);
495+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
496496

497497
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
498498
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
561561
{
562562
if (policyResult.Outcome == OutcomeType.Successful)
563563
{
564-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
564+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
565565
}
566566
else
567567
{
@@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
618618
{
619619
var policy = RetryConfiguration.AsyncRetryPolicy;
620620
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
621-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
621+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
622622
}
623623
else
624624
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
492492
{
493493
InterceptRequest(request);
494494

495-
RestResponse<T> response = await getResponse(client);
495+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
496496

497497
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
498498
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -561,7 +561,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
561561
{
562562
if (policyResult.Outcome == OutcomeType.Successful)
563563
{
564-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
564+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
565565
}
566566
else
567567
{
@@ -618,7 +618,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
618618
{
619619
var policy = RetryConfiguration.AsyncRetryPolicy;
620620
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
621-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
621+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
622622
}
623623
else
624624
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
491491
{
492492
InterceptRequest(request);
493493

494-
RestResponse<T> response = await getResponse(client);
494+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
495495

496496
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
497497
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
560560
{
561561
if (policyResult.Outcome == OutcomeType.Successful)
562562
{
563-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
563+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
564564
}
565565
else
566566
{
@@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
617617
{
618618
var policy = RetryConfiguration.AsyncRetryPolicy;
619619
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
620-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
620+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
621621
}
622622
else
623623
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
475475
{
476476
InterceptRequest(request);
477477

478-
RestResponse<T> response = await getResponse(client);
478+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
479479

480480
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
481481
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -544,7 +544,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
544544
{
545545
if (policyResult.Outcome == OutcomeType.Successful)
546546
{
547-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
547+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
548548
}
549549
else
550550
{
@@ -601,7 +601,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
601601
{
602602
var policy = RetryConfiguration.AsyncRetryPolicy;
603603
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
604-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
604+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
605605
}
606606
else
607607
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
491491
{
492492
InterceptRequest(request);
493493

494-
RestResponse<T> response = await getResponse(client);
494+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
495495

496496
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
497497
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
560560
{
561561
if (policyResult.Outcome == OutcomeType.Successful)
562562
{
563-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
563+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
564564
}
565565
else
566566
{
@@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
617617
{
618618
var policy = RetryConfiguration.AsyncRetryPolicy;
619619
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
620-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
620+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
621621
}
622622
else
623623
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
475475
{
476476
InterceptRequest(request);
477477

478-
RestResponse<T> response = await getResponse(client);
478+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
479479

480480
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
481481
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -544,7 +544,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
544544
{
545545
if (policyResult.Outcome == OutcomeType.Successful)
546546
{
547-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
547+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
548548
}
549549
else
550550
{
@@ -601,7 +601,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
601601
{
602602
var policy = RetryConfiguration.AsyncRetryPolicy;
603603
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
604-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
604+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
605605
}
606606
else
607607
{

samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
491491
{
492492
InterceptRequest(request);
493493

494-
RestResponse<T> response = await getResponse(client);
494+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
495495

496496
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
497497
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
560560
{
561561
if (policyResult.Outcome == OutcomeType.Successful)
562562
{
563-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
563+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
564564
}
565565
else
566566
{
@@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
617617
{
618618
var policy = RetryConfiguration.AsyncRetryPolicy;
619619
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
620-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
620+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
621621
}
622622
else
623623
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
491491
{
492492
InterceptRequest(request);
493493

494-
RestResponse<T> response = await getResponse(client);
494+
RestResponse<T> response = await getResponse(client).ConfigureAwait(false);
495495

496496
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
497497
if (typeof(AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -560,7 +560,7 @@ private async Task<RestResponse<T>> DeserializeRestResponseFromPolicyAsync<T>(Re
560560
{
561561
if (policyResult.Outcome == OutcomeType.Successful)
562562
{
563-
return await client.Deserialize<T>(policyResult.Result, cancellationToken);
563+
return await client.Deserialize<T>(policyResult.Result, cancellationToken).ConfigureAwait(false);
564564
}
565565
else
566566
{
@@ -617,7 +617,7 @@ private Task<ApiResponse<T>> ExecAsync<T>(RestRequest request, RequestOptions op
617617
{
618618
var policy = RetryConfiguration.AsyncRetryPolicy;
619619
var policyResult = await policy.ExecuteAndCaptureAsync((ct) => client.ExecuteAsync(request, ct), cancellationToken).ConfigureAwait(false);
620-
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken);
620+
return await DeserializeRestResponseFromPolicyAsync<T>(client, request, policyResult, cancellationToken).ConfigureAwait(false);
621621
}
622622
else
623623
{

0 commit comments

Comments
 (0)