Skip to content

Commit e52a9fd

Browse files
Add missing ConfigureAwaits for csharp-netcore generator (#13664)
1 parent dbc6c82 commit e52a9fd

File tree

10 files changed

+40
-40
lines changed

10 files changed

+40
-40
lines changed

modules/openapi-generator/src/main/resources/csharp-netcore/auth/OAuthAuthenticator.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace {{packageName}}.Client.Auth
6363
/// <returns>An authentication parameter.</returns>
6464
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
6565
{
66-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
66+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
6767
return new HeaderParameter(KnownHeaders.Authorization, token);
6868
}
6969

@@ -80,7 +80,7 @@ namespace {{packageName}}.Client.Auth
8080
.AddParameter("grant_type", _grantType)
8181
.AddParameter("client_id", _clientId)
8282
.AddParameter("client_secret", _clientSecret);
83-
var response = await client.PostAsync<TokenResponse>(request);
83+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
8484
return $"{response.TokenType} {response.AccessToken}";
8585
}
8686
}

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ namespace {{packageName}}.Client
7979

8080
public async Task<T> Deserialize<T>(HttpResponseMessage response)
8181
{
82-
var result = (T) await Deserialize(response, typeof(T));
82+
var result = (T) await Deserialize(response, typeof(T)).ConfigureAwait(false);
8383
return result;
8484
}
8585

@@ -95,17 +95,17 @@ namespace {{packageName}}.Client
9595
9696
if (type == typeof(byte[])) // return byte array
9797
{
98-
return await response.Content.ReadAsByteArrayAsync();
98+
return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
9999
}
100100
else if (type == typeof(FileParameter))
101101
{
102-
return new FileParameter(await response.Content.ReadAsStreamAsync());
102+
return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
103103
}
104104

105105
// TODO: ? if (type.IsAssignableFrom(typeof(Stream)))
106106
if (type == typeof(Stream))
107107
{
108-
var bytes = await response.Content.ReadAsByteArrayAsync();
108+
var bytes = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
109109
if (headers != null)
110110
{
111111
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
@@ -129,18 +129,18 @@ namespace {{packageName}}.Client
129129

130130
if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
131131
{
132-
return DateTime.Parse(await response.Content.ReadAsStringAsync(), null, System.Globalization.DateTimeStyles.RoundtripKind);
132+
return DateTime.Parse(await response.Content.ReadAsStringAsync().ConfigureAwait(false), null, System.Globalization.DateTimeStyles.RoundtripKind);
133133
}
134134

135135
if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type
136136
{
137-
return Convert.ChangeType(await response.Content.ReadAsStringAsync(), type);
137+
return Convert.ChangeType(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type);
138138
}
139139

140140
// at this point, it must be a model (json)
141141
try
142142
{
143-
return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync(), type, _serializerSettings);
143+
return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type, _serializerSettings);
144144
}
145145
catch (Exception e)
146146
{
@@ -401,7 +401,7 @@ namespace {{packageName}}.Client
401401
private async Task<ApiResponse<T>> ToApiResponse<T>(HttpResponseMessage response, object responseData, Uri uri)
402402
{
403403
T result = (T) responseData;
404-
string rawContent = await response.Content.ReadAsStringAsync();
404+
string rawContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
405405
406406
var transformed = new ApiResponse<T>(response.StatusCode, new Multimap<string, string>({{#caseInsensitiveResponseHeaders}}StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), result, rawContent)
407407
{
@@ -514,10 +514,10 @@ namespace {{packageName}}.Client
514514

515515
if (!response.IsSuccessStatusCode)
516516
{
517-
return await ToApiResponse<T>(response, default(T), req.RequestUri);
517+
return await ToApiResponse<T>(response, default(T), req.RequestUri).ConfigureAwait(false);
518518
}
519519

520-
object responseData = await deserializer.Deserialize<T>(response);
520+
object responseData = await deserializer.Deserialize<T>(response).ConfigureAwait(false);
521521

522522
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
523523
if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -526,12 +526,12 @@ namespace {{packageName}}.Client
526526
}
527527
else if (typeof(T).Name == "Stream") // for binary response
528528
{
529-
responseData = (T) (object) await response.Content.ReadAsStreamAsync();
529+
responseData = (T) (object) await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
530530
}
531531

532532
InterceptResponse(req, response);
533533

534-
return await ToApiResponse<T>(response, responseData, req.RequestUri);
534+
return await ToApiResponse<T>(response, responseData, req.RequestUri).ConfigureAwait(false);
535535
}
536536
catch (OperationCanceledException original)
537537
{

samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public string Serialize(object obj)
8282

8383
public async Task<T> Deserialize<T>(HttpResponseMessage response)
8484
{
85-
var result = (T) await Deserialize(response, typeof(T));
85+
var result = (T) await Deserialize(response, typeof(T)).ConfigureAwait(false);
8686
return result;
8787
}
8888

@@ -98,17 +98,17 @@ internal async Task<object> Deserialize(HttpResponseMessage response, Type type)
9898

9999
if (type == typeof(byte[])) // return byte array
100100
{
101-
return await response.Content.ReadAsByteArrayAsync();
101+
return await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
102102
}
103103
else if (type == typeof(FileParameter))
104104
{
105-
return new FileParameter(await response.Content.ReadAsStreamAsync());
105+
return new FileParameter(await response.Content.ReadAsStreamAsync().ConfigureAwait(false));
106106
}
107107

108108
// TODO: ? if (type.IsAssignableFrom(typeof(Stream)))
109109
if (type == typeof(Stream))
110110
{
111-
var bytes = await response.Content.ReadAsByteArrayAsync();
111+
var bytes = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
112112
if (headers != null)
113113
{
114114
var filePath = string.IsNullOrEmpty(_configuration.TempFolderPath)
@@ -132,18 +132,18 @@ internal async Task<object> Deserialize(HttpResponseMessage response, Type type)
132132

133133
if (type.Name.StartsWith("System.Nullable`1[[System.DateTime")) // return a datetime object
134134
{
135-
return DateTime.Parse(await response.Content.ReadAsStringAsync(), null, System.Globalization.DateTimeStyles.RoundtripKind);
135+
return DateTime.Parse(await response.Content.ReadAsStringAsync().ConfigureAwait(false), null, System.Globalization.DateTimeStyles.RoundtripKind);
136136
}
137137

138138
if (type == typeof(string) || type.Name.StartsWith("System.Nullable")) // return primitive type
139139
{
140-
return Convert.ChangeType(await response.Content.ReadAsStringAsync(), type);
140+
return Convert.ChangeType(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type);
141141
}
142142

143143
// at this point, it must be a model (json)
144144
try
145145
{
146-
return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync(), type, _serializerSettings);
146+
return JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), type, _serializerSettings);
147147
}
148148
catch (Exception e)
149149
{
@@ -402,7 +402,7 @@ private HttpRequestMessage NewRequest(
402402
private async Task<ApiResponse<T>> ToApiResponse<T>(HttpResponseMessage response, object responseData, Uri uri)
403403
{
404404
T result = (T) responseData;
405-
string rawContent = await response.Content.ReadAsStringAsync();
405+
string rawContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
406406

407407
var transformed = new ApiResponse<T>(response.StatusCode, new Multimap<string, string>(), result, rawContent)
408408
{
@@ -511,10 +511,10 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
511511

512512
if (!response.IsSuccessStatusCode)
513513
{
514-
return await ToApiResponse<T>(response, default(T), req.RequestUri);
514+
return await ToApiResponse<T>(response, default(T), req.RequestUri).ConfigureAwait(false);
515515
}
516516

517-
object responseData = await deserializer.Deserialize<T>(response);
517+
object responseData = await deserializer.Deserialize<T>(response).ConfigureAwait(false);
518518

519519
// if the response type is oneOf/anyOf, call FromJSON to deserialize the data
520520
if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
@@ -523,12 +523,12 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
523523
}
524524
else if (typeof(T).Name == "Stream") // for binary response
525525
{
526-
responseData = (T) (object) await response.Content.ReadAsStreamAsync();
526+
responseData = (T) (object) await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
527527
}
528528

529529
InterceptResponse(req, response);
530530

531-
return await ToApiResponse<T>(response, responseData, req.RequestUri);
531+
return await ToApiResponse<T>(response, responseData, req.RequestUri).ConfigureAwait(false);
532532
}
533533
catch (OperationCanceledException original)
534534
{

samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/src/Org.OpenAPITools/Client/Auth/OAuthAuthenticator.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public OAuthAuthenticator(
7171
/// <returns>An authentication parameter.</returns>
7272
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken)
7373
{
74-
var token = string.IsNullOrEmpty(Token) ? await GetToken() : Token;
74+
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
7575
return new HeaderParameter(KnownHeaders.Authorization, token);
7676
}
7777

@@ -88,7 +88,7 @@ async Task<string> GetToken()
8888
.AddParameter("grant_type", _grantType)
8989
.AddParameter("client_id", _clientId)
9090
.AddParameter("client_secret", _clientSecret);
91-
var response = await client.PostAsync<TokenResponse>(request);
91+
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
9292
return $"{response.TokenType} {response.AccessToken}";
9393
}
9494
}

0 commit comments

Comments
 (0)