Skip to content

Commit 2e8a197

Browse files
Merge pull request #71 from jtsai-osa/main
Add ConfigureAwait(false) to await calls
2 parents c1ae10a + d92c6aa commit 2e8a197

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

src/NetCoreForce.Client/ForceClient.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public ForceClient(string instanceUrl, string apiVersion, string accessToken, Ht
8888
private async Task Login(string clientId, string clientSecret, string username, string password, string tokenRequestEndpoint, string apiVersion = null, HttpClient httpClient = null)
8989
{
9090
AuthenticationClient authClient = new AuthenticationClient(apiVersion, httpClient);
91-
await authClient.UsernamePasswordAsync(clientId, clientSecret, username, password, tokenRequestEndpoint);
91+
await authClient.UsernamePasswordAsync(clientId, clientSecret, username, password, tokenRequestEndpoint).ConfigureAwait(false);
9292

9393
Initialize(authClient.AccessInfo.InstanceUrl, authClient.ApiVersion, authClient.AccessInfo.AccessToken, httpClient, authClient.AccessInfo);
9494
}
@@ -163,7 +163,7 @@ public async Task<List<T>> Query<T>(string queryString, bool queryAll = false)
163163
queryUri = new Uri(new Uri(InstanceUrl), nextRecordsUrl);
164164
}
165165

166-
QueryResult<T> qr = await client.HttpGetAsync<QueryResult<T>>(queryUri, headers);
166+
QueryResult<T> qr = await client.HttpGetAsync<QueryResult<T>>(queryUri, headers).ConfigureAwait(false);
167167

168168
#if DEBUG
169169
Debug.WriteLine(string.Format("Got query resuts, {0} totalSize, {1} in this batch, final batch: {2}",
@@ -209,7 +209,7 @@ public async Task<List<T>> Query<T>(string queryString, bool queryAll = false)
209209
/// <returns>result object</returns>
210210
public async Task<T> QuerySingle<T>(string queryString, bool queryAll = false)
211211
{
212-
List<T> results = await Query<T>(queryString, queryAll);
212+
List<T> results = await Query<T>(queryString, queryAll).ConfigureAwait(false);
213213

214214
if (results != null && results.Count > 1)
215215
{
@@ -255,7 +255,7 @@ public async IAsyncEnumerable<T> QueryAsync<T>(string queryString, bool queryAll
255255

256256
while (hasMoreRecords)
257257
{
258-
var qr = await jsonClient.HttpGetAsync<QueryResult<T>>(nextRecordsUri, headers);
258+
var qr = await jsonClient.HttpGetAsync<QueryResult<T>>(nextRecordsUri, headers).ConfigureAwait(false);
259259

260260
#if DEBUG
261261
Debug.WriteLine($"Got query resuts, {qr.TotalSize} totalSize, {qr.Records.Count} in this batch, final batch: {qr.Done}");
@@ -301,7 +301,7 @@ public async Task<int> CountQuery(string queryString, bool queryAll = false)
301301

302302
var jsonClient = new JsonClient(AccessToken, SharedHttpClient);
303303
var uri = UriFormatter.Query(InstanceUrl, ApiVersion, queryString);
304-
var qr = await jsonClient.HttpGetAsync<QueryResult<object>>(uri, headers);
304+
var qr = await jsonClient.HttpGetAsync<QueryResult<object>>(uri, headers).ConfigureAwait(false);
305305

306306
return qr.TotalSize;
307307
}
@@ -321,7 +321,7 @@ public async Task<SearchResult<T>> Search<T>(string searchString)
321321

322322
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
323323

324-
SearchResult<T> searchResult = await client.HttpGetAsync<SearchResult<T>>(uri, headers);
324+
SearchResult<T> searchResult = await client.HttpGetAsync<SearchResult<T>>(uri, headers).ConfigureAwait(false);
325325

326326
return searchResult;
327327
}
@@ -346,7 +346,7 @@ public async Task<SearchResult<SObjectGeneric>> Search(string searchString)
346346

347347
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
348348

349-
SearchResult<SObjectGeneric> searchResult = await client.HttpGetAsync<SearchResult<SObjectGeneric>>(uri, headers);
349+
SearchResult<SObjectGeneric> searchResult = await client.HttpGetAsync<SearchResult<SObjectGeneric>>(uri, headers).ConfigureAwait(false);
350350

351351
return searchResult;
352352
}
@@ -370,7 +370,7 @@ public async Task<T> GetObjectById<T>(string sObjectTypeName, string objectId, L
370370

371371
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
372372

373-
return await client.HttpGetAsync<T>(uri, headers);
373+
return await client.HttpGetAsync<T>(uri, headers).ConfigureAwait(false);
374374
}
375375

376376
/// <summary>
@@ -406,7 +406,7 @@ public async Task<CreateResponse> CreateRecord<T>(
406406

407407
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
408408

409-
return await client.HttpPostAsync<CreateResponse>(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls);
409+
return await client.HttpPostAsync<CreateResponse>(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false);
410410
}
411411

412412
/// <summary>
@@ -478,7 +478,7 @@ public async Task<SObjectTreeResponse> CreateMultiple(
478478

479479
SObjectTreeRequest treeRequest = new SObjectTreeRequest(sObjects);
480480

481-
return await client.HttpPostAsync<SObjectTreeResponse>(treeRequest, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls);
481+
return await client.HttpPostAsync<SObjectTreeResponse>(treeRequest, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false);
482482
}
483483

484484
/// <summary>
@@ -517,7 +517,7 @@ public async Task UpdateRecord<T>(
517517

518518
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
519519

520-
await client.HttpPatchAsync<object>(sObject, uri, headers, ignoreNulls: ignoreNulls, fieldsToNull: fieldsToNull);
520+
await client.HttpPatchAsync<object>(sObject, uri, headers, ignoreNulls: ignoreNulls, fieldsToNull: fieldsToNull).ConfigureAwait(false);
521521

522522
return;
523523
}
@@ -575,7 +575,7 @@ public async Task<List<UpsertResponse>> UpdateRecords(
575575

576576
UpsertRequest upsertRequest = new UpsertRequest(sObjects, allOrNone);
577577

578-
return await client.HttpPatchAsync<List<UpsertResponse>>(upsertRequest, uri, headers, includeSObjectId: true, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls);
578+
return await client.HttpPatchAsync<List<UpsertResponse>>(upsertRequest, uri, headers, includeSObjectId: true, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false);
579579

580580
}
581581

@@ -616,7 +616,7 @@ public async Task<UpsertResponse> InsertOrUpdateRecord<T>(
616616

617617
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
618618

619-
return await client.HttpPatchAsync<UpsertResponse>(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls);
619+
return await client.HttpPatchAsync<UpsertResponse>(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false);
620620
}
621621

622622
/// <summary>
@@ -633,7 +633,7 @@ public async Task DeleteRecord(string sObjectTypeName, string objectId)
633633

634634
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
635635

636-
await client.HttpDeleteAsync<object>(uri, headers);
636+
await client.HttpDeleteAsync<object>(uri, headers).ConfigureAwait(false);
637637

638638
return;
639639
}
@@ -762,13 +762,13 @@ public async Task<Stream> BlobRetrieveStream(string blobUrl)
762762
string objectId = match.Groups[2].Value;
763763
string blobField = match.Groups[3].Value;
764764

765-
return await BlobRetrieveStream(sObjectTypeName, objectId, blobField);
765+
return await BlobRetrieveStream(sObjectTypeName, objectId, blobField).ConfigureAwait(false);
766766
}
767767

768768
public async Task<Stream> BlobRetrieveStream(string sObjectTypeName, string objectId, string blobField)
769769
{
770-
HttpResponseMessage response = await BlobRetrieveResponse(sObjectTypeName, objectId, blobField);
771-
return await response.Content.ReadAsStreamAsync();
770+
HttpResponseMessage response = await BlobRetrieveResponse(sObjectTypeName, objectId, blobField).ConfigureAwait(false);
771+
return await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
772772
}
773773

774774
// public async Task<byte[]> BlobRetrieveBytes(string blobUrl)
@@ -840,7 +840,7 @@ public async Task<OrganizationLimits> GetOrganizationLimits()
840840

841841
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
842842

843-
return await client.HttpGetAsync<OrganizationLimits>(uri);
843+
return await client.HttpGetAsync<OrganizationLimits>(uri).ConfigureAwait(false);
844844
}
845845

846846
/// <summary>
@@ -851,7 +851,7 @@ public async Task<OrganizationLimits> GetOrganizationLimits()
851851
/// <returns>List of SalesforceVersion objects</returns>
852852
public async Task<List<SalesforceVersion>> GetAvailableRestApiVersions(string currentInstanceUrl = null)
853853
{
854-
return await GetAvailableRestApiVersions(currentInstanceUrl, true);
854+
return await GetAvailableRestApiVersions(currentInstanceUrl, true).ConfigureAwait(false);
855855
}
856856

857857
private async Task<List<SalesforceVersion>> GetAvailableRestApiVersions(string currentInstanceUrl = null, bool deserializeResponse = true)
@@ -875,7 +875,7 @@ private async Task<List<SalesforceVersion>> GetAvailableRestApiVersions(string c
875875

876876
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
877877

878-
return await client.HttpGetAsync<List<SalesforceVersion>>(uri: uri, deserializeResponse: deserializeResponse);
878+
return await client.HttpGetAsync<List<SalesforceVersion>>(uri: uri, deserializeResponse: deserializeResponse).ConfigureAwait(false);
879879
}
880880

881881
/// <summary>
@@ -888,7 +888,7 @@ public async Task<UserInfo> GetUserInfo(string identityUrl)
888888
{
889889
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
890890

891-
return await client.HttpGetAsync<UserInfo>(new Uri(identityUrl));
891+
return await client.HttpGetAsync<UserInfo>(new Uri(identityUrl)).ConfigureAwait(false);
892892
}
893893

894894
/// <summary>
@@ -904,7 +904,7 @@ public async Task<SObjectBasicInfo> GetObjectBasicInfo(string objectTypeName)
904904

905905
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
906906

907-
return await client.HttpGetAsync<SObjectBasicInfo>(uri, headers);
907+
return await client.HttpGetAsync<SObjectBasicInfo>(uri, headers).ConfigureAwait(false);
908908
}
909909

910910
/// <summary>
@@ -919,7 +919,7 @@ public async Task<SObjectDescribeFull> GetObjectDescribe(string objectTypeName)
919919

920920
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
921921

922-
return await client.HttpGetAsync<SObjectDescribeFull>(uri);
922+
return await client.HttpGetAsync<SObjectDescribeFull>(uri).ConfigureAwait(false);
923923
}
924924

925925
/// <summary>
@@ -933,7 +933,7 @@ public async Task<DescribeGlobal> DescribeGlobal()
933933

934934
JsonClient client = new JsonClient(AccessToken, SharedHttpClient);
935935

936-
return await client.HttpGetAsync<DescribeGlobal>(uri);
936+
return await client.HttpGetAsync<DescribeGlobal>(uri).ConfigureAwait(false);
937937
}
938938

939939
#endregion

src/NetCoreForce.Client/JsonClient.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public JsonClient(string accessToken, HttpClient httpClient = null)
7474
public async Task<T> HttpGetAsync<T>(Uri uri, Dictionary<string, string> customHeaders = null, bool deserializeResponse = true)
7575
{
7676
//TODO: can this handle T = string?
77-
return await HttpAsync<T>(uri, HttpMethod.Get, null, customHeaders, deserializeResponse);
77+
return await HttpAsync<T>(uri, HttpMethod.Get, null, customHeaders, deserializeResponse).ConfigureAwait(false);
7878
}
7979

8080
/// <summary>
@@ -106,7 +106,7 @@ public async Task<T> HttpPostAsync<T>(
106106
request.Method = HttpMethod.Post;
107107
request.Content = content;
108108

109-
return await GetResponse<T>(request, customHeaders, deserializeResponse);
109+
return await GetResponse<T>(request, customHeaders, deserializeResponse).ConfigureAwait(false);
110110
}
111111

112112
/// <summary>
@@ -148,7 +148,7 @@ public async Task<T> HttpPatchAsync<T>(
148148

149149
var content = new StringContent(json, Encoding.UTF8, JsonMimeType);
150150

151-
return await HttpAsync<T>(uri, new HttpMethod("PATCH"), content, customHeaders, deserializeResponse);
151+
return await HttpAsync<T>(uri, new HttpMethod("PATCH"), content, customHeaders, deserializeResponse).ConfigureAwait(false);
152152
}
153153

154154
/// <summary>
@@ -166,7 +166,7 @@ public async Task<T> HttpDeleteAsync<T>(Uri uri, Dictionary<string, string> cust
166166
request.RequestUri = uri;
167167
request.Method = HttpMethod.Delete;
168168

169-
return await GetResponse<T>(request, customHeaders, deserializeResponse);
169+
return await GetResponse<T>(request, customHeaders, deserializeResponse).ConfigureAwait(false);
170170
}
171171

172172
private async Task<T> HttpAsync<T>(Uri uri, HttpMethod httpMethod, HttpContent content = null, Dictionary<string, string> customHeaders = null, bool deserializeResponse = true)
@@ -180,7 +180,7 @@ private async Task<T> HttpAsync<T>(Uri uri, HttpMethod httpMethod, HttpContent c
180180
request.Content = content;
181181
}
182182

183-
return await GetResponse<T>(request, customHeaders, deserializeResponse);
183+
return await GetResponse<T>(request, customHeaders, deserializeResponse).ConfigureAwait(false);
184184
}
185185

186186
/// <summary>

0 commit comments

Comments
 (0)