From f763611385c2d7342ea0ff64609ec0d65dec6920 Mon Sep 17 00:00:00 2001 From: "Tsai, John" Date: Wed, 22 May 2024 13:39:03 -0400 Subject: [PATCH] Add ConfigureAwait(false) to await calls --- src/NetCoreForce.Client/ForceClient.cs | 48 +++++++++++++------------- src/NetCoreForce.Client/JsonClient.cs | 10 +++--- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/NetCoreForce.Client/ForceClient.cs b/src/NetCoreForce.Client/ForceClient.cs index ad891cf..c3789a7 100644 --- a/src/NetCoreForce.Client/ForceClient.cs +++ b/src/NetCoreForce.Client/ForceClient.cs @@ -86,7 +86,7 @@ public ForceClient(string instanceUrl, string apiVersion, string accessToken, Ht private async Task Login(string clientId, string clientSecret, string username, string password, string tokenRequestEndpoint, string apiVersion = null, HttpClient httpClient = null) { AuthenticationClient authClient = new AuthenticationClient(apiVersion); - await authClient.UsernamePasswordAsync(clientId, clientSecret, username, password, tokenRequestEndpoint); + await authClient.UsernamePasswordAsync(clientId, clientSecret, username, password, tokenRequestEndpoint).ConfigureAwait(false); Initialize(authClient.AccessInfo.InstanceUrl, authClient.ApiVersion, authClient.AccessInfo.AccessToken, httpClient, authClient.AccessInfo); } @@ -161,7 +161,7 @@ public async Task> Query(string queryString, bool queryAll = false) queryUri = new Uri(new Uri(InstanceUrl), nextRecordsUrl); } - QueryResult qr = await client.HttpGetAsync>(queryUri, headers); + QueryResult qr = await client.HttpGetAsync>(queryUri, headers).ConfigureAwait(false); #if DEBUG Debug.WriteLine(string.Format("Got query resuts, {0} totalSize, {1} in this batch, final batch: {2}", @@ -207,7 +207,7 @@ public async Task> Query(string queryString, bool queryAll = false) /// result object public async Task QuerySingle(string queryString, bool queryAll = false) { - List results = await Query(queryString, queryAll); + List results = await Query(queryString, queryAll).ConfigureAwait(false); if (results != null && results.Count > 1) { @@ -253,7 +253,7 @@ public async IAsyncEnumerable QueryAsync(string queryString, bool queryAll while (hasMoreRecords) { - var qr = await jsonClient.HttpGetAsync>(nextRecordsUri, headers); + var qr = await jsonClient.HttpGetAsync>(nextRecordsUri, headers).ConfigureAwait(false); #if DEBUG Debug.WriteLine($"Got query resuts, {qr.TotalSize} totalSize, {qr.Records.Count} in this batch, final batch: {qr.Done}"); @@ -299,7 +299,7 @@ public async Task CountQuery(string queryString, bool queryAll = false) var jsonClient = new JsonClient(AccessToken, SharedHttpClient); var uri = UriFormatter.Query(InstanceUrl, ApiVersion, queryString); - var qr = await jsonClient.HttpGetAsync>(uri, headers); + var qr = await jsonClient.HttpGetAsync>(uri, headers).ConfigureAwait(false); return qr.TotalSize; } @@ -319,7 +319,7 @@ public async Task> Search(string searchString) JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - SearchResult searchResult = await client.HttpGetAsync>(uri, headers); + SearchResult searchResult = await client.HttpGetAsync>(uri, headers).ConfigureAwait(false); return searchResult; } @@ -344,7 +344,7 @@ public async Task> Search(string searchString) JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - SearchResult searchResult = await client.HttpGetAsync>(uri, headers); + SearchResult searchResult = await client.HttpGetAsync>(uri, headers).ConfigureAwait(false); return searchResult; } @@ -368,7 +368,7 @@ public async Task GetObjectById(string sObjectTypeName, string objectId, L JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(uri, headers); + return await client.HttpGetAsync(uri, headers).ConfigureAwait(false); } /// @@ -404,7 +404,7 @@ public async Task CreateRecord( JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpPostAsync(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls); + return await client.HttpPostAsync(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false); } /// @@ -476,7 +476,7 @@ public async Task CreateMultiple( SObjectTreeRequest treeRequest = new SObjectTreeRequest(sObjects); - return await client.HttpPostAsync(treeRequest, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls); + return await client.HttpPostAsync(treeRequest, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false); } /// @@ -515,7 +515,7 @@ public async Task UpdateRecord( JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - await client.HttpPatchAsync(sObject, uri, headers, ignoreNulls: ignoreNulls, fieldsToNull: fieldsToNull); + await client.HttpPatchAsync(sObject, uri, headers, ignoreNulls: ignoreNulls, fieldsToNull: fieldsToNull).ConfigureAwait(false); return; } @@ -573,7 +573,7 @@ public async Task> UpdateRecords( UpsertRequest upsertRequest = new UpsertRequest(sObjects, allOrNone); - return await client.HttpPatchAsync>(upsertRequest, uri, headers, includeSObjectId: true, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls); + return await client.HttpPatchAsync>(upsertRequest, uri, headers, includeSObjectId: true, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false); } @@ -614,7 +614,7 @@ public async Task InsertOrUpdateRecord( JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpPatchAsync(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls); + return await client.HttpPatchAsync(sObject, uri, headers, fieldsToNull: fieldsToNull, ignoreNulls: ignoreNulls).ConfigureAwait(false); } /// @@ -631,7 +631,7 @@ public async Task DeleteRecord(string sObjectTypeName, string objectId) JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - await client.HttpDeleteAsync(uri, headers); + await client.HttpDeleteAsync(uri, headers).ConfigureAwait(false); return; } @@ -656,13 +656,13 @@ public async Task BlobRetrieveStream(string blobUrl) string objectId = match.Groups[2].Value; string blobField = match.Groups[3].Value; - return await BlobRetrieveStream(sObjectTypeName, objectId, blobField); + return await BlobRetrieveStream(sObjectTypeName, objectId, blobField).ConfigureAwait(false); } public async Task BlobRetrieveStream(string sObjectTypeName, string objectId, string blobField) { - HttpResponseMessage response = await BlobRetrieveResponse(sObjectTypeName, objectId, blobField); - return await response.Content.ReadAsStreamAsync(); + HttpResponseMessage response = await BlobRetrieveResponse(sObjectTypeName, objectId, blobField).ConfigureAwait(false); + return await response.Content.ReadAsStreamAsync().ConfigureAwait(false); } // public async Task BlobRetrieveBytes(string blobUrl) @@ -734,7 +734,7 @@ public async Task GetOrganizationLimits() JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(uri); + return await client.HttpGetAsync(uri).ConfigureAwait(false); } /// @@ -745,7 +745,7 @@ public async Task GetOrganizationLimits() /// List of SalesforceVersion objects public async Task> GetAvailableRestApiVersions(string currentInstanceUrl = null) { - return await GetAvailableRestApiVersions(currentInstanceUrl, true); + return await GetAvailableRestApiVersions(currentInstanceUrl, true).ConfigureAwait(false); } private async Task> GetAvailableRestApiVersions(string currentInstanceUrl = null, bool deserializeResponse = true) @@ -769,7 +769,7 @@ private async Task> GetAvailableRestApiVersions(string c JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync>(uri: uri, deserializeResponse: deserializeResponse); + return await client.HttpGetAsync>(uri: uri, deserializeResponse: deserializeResponse).ConfigureAwait(false); } /// @@ -782,7 +782,7 @@ public async Task GetUserInfo(string identityUrl) { JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(new Uri(identityUrl)); + return await client.HttpGetAsync(new Uri(identityUrl)).ConfigureAwait(false); } /// @@ -798,7 +798,7 @@ public async Task GetObjectBasicInfo(string objectTypeName) JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(uri, headers); + return await client.HttpGetAsync(uri, headers).ConfigureAwait(false); } /// @@ -813,7 +813,7 @@ public async Task GetObjectDescribe(string objectTypeName) JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(uri); + return await client.HttpGetAsync(uri).ConfigureAwait(false); } /// @@ -827,7 +827,7 @@ public async Task DescribeGlobal() JsonClient client = new JsonClient(AccessToken, SharedHttpClient); - return await client.HttpGetAsync(uri); + return await client.HttpGetAsync(uri).ConfigureAwait(false); } #endregion diff --git a/src/NetCoreForce.Client/JsonClient.cs b/src/NetCoreForce.Client/JsonClient.cs index 0e4a7c6..c062145 100644 --- a/src/NetCoreForce.Client/JsonClient.cs +++ b/src/NetCoreForce.Client/JsonClient.cs @@ -74,7 +74,7 @@ public JsonClient(string accessToken, HttpClient httpClient = null) public async Task HttpGetAsync(Uri uri, Dictionary customHeaders = null, bool deserializeResponse = true) { //TODO: can this handle T = string? - return await HttpAsync(uri, HttpMethod.Get, null, customHeaders, deserializeResponse); + return await HttpAsync(uri, HttpMethod.Get, null, customHeaders, deserializeResponse).ConfigureAwait(false); } /// @@ -106,7 +106,7 @@ public async Task HttpPostAsync( request.Method = HttpMethod.Post; request.Content = content; - return await GetResponse(request, customHeaders, deserializeResponse); + return await GetResponse(request, customHeaders, deserializeResponse).ConfigureAwait(false); } /// @@ -148,7 +148,7 @@ public async Task HttpPatchAsync( var content = new StringContent(json, Encoding.UTF8, JsonMimeType); - return await HttpAsync(uri, new HttpMethod("PATCH"), content, customHeaders, deserializeResponse); + return await HttpAsync(uri, new HttpMethod("PATCH"), content, customHeaders, deserializeResponse).ConfigureAwait(false); } /// @@ -166,7 +166,7 @@ public async Task HttpDeleteAsync(Uri uri, Dictionary cust request.RequestUri = uri; request.Method = HttpMethod.Delete; - return await GetResponse(request, customHeaders, deserializeResponse); + return await GetResponse(request, customHeaders, deserializeResponse).ConfigureAwait(false); } private async Task HttpAsync(Uri uri, HttpMethod httpMethod, HttpContent content = null, Dictionary customHeaders = null, bool deserializeResponse = true) @@ -180,7 +180,7 @@ private async Task HttpAsync(Uri uri, HttpMethod httpMethod, HttpContent c request.Content = content; } - return await GetResponse(request, customHeaders, deserializeResponse); + return await GetResponse(request, customHeaders, deserializeResponse).ConfigureAwait(false); } ///