Skip to content

Added missing .ConfigureAwait(false) to awaited async methods that we… #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added missing .ConfigureAwait(false) to awaited async methods that we… #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CommonLibrariesForNET/AuthenticationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public async Task GetLatestVersionAsync()
try
{
string serviceURL = InstanceUrl + @"/services/data/";
HttpResponseMessage responseMessage = await _httpClient.GetAsync(serviceURL);
HttpResponseMessage responseMessage = await _httpClient.GetAsync(serviceURL).ConfigureAwait(false);

var response = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
if (responseMessage.IsSuccessStatusCode)
Expand Down
2 changes: 1 addition & 1 deletion src/CommonLibrariesForNET/Extensions/HttpContentCompressedDataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static async Task<string> ReadAsDecompressedStringAsync(this HttpContent
{
var responseStream = await responseContent.ReadAsStreamAsync().ConfigureAwait(false);
var unzippedContent = new GZipStream(responseStream, CompressionMode.Decompress);
content = await(new StreamReader(unzippedContent)).ReadToEndAsync();
content = await(new StreamReader(unzippedContent)).ReadToEndAsync().ConfigureAwait(false);
}
else
{
Expand Down
32 changes: 16 additions & 16 deletions src/CommonLibrariesForNET/JsonHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ private static ForceException ParseForceException(string responseMessage)
public async Task<T> HttpGetAsync<T>(string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpGetAsync<T>(url);
return await HttpGetAsync<T>(url).ConfigureAwait(false);
}

public async Task<T> HttpGetAsync<T>(Uri uri)
{
try
{
var response = await HttpGetAsync(uri);
var response = await HttpGetAsync(uri).ConfigureAwait(false);
var jToken = JToken.Parse(response);
if (jToken.Type == JTokenType.Array)
{
Expand Down Expand Up @@ -79,7 +79,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
}
try
{
var response = await HttpGetAsync(url);
var response = await HttpGetAsync(url).ConfigureAwait(false);
var jObject = JObject.Parse(response);
var jToken = jObject.GetValue(nodeName);
next = (jObject.GetValue("nextRecordsUrl") != null) ? jObject.GetValue("nextRecordsUrl").ToString() : null;
Expand Down Expand Up @@ -107,7 +107,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
};

var responseMessage = await HttpClient.SendAsync(request).ConfigureAwait(false);
var response = await responseMessage.Content.ReadAsStreamAsync();
var response = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false);

if (responseMessage.IsSuccessStatusCode)
{
Expand All @@ -122,15 +122,15 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
public async Task<T> HttpGetRestApiAsync<T>(string apiName)
{
var url = Common.FormatRestApiUrl(apiName, InstanceUrl);
return await HttpGetAsync<T>(url);
return await HttpGetAsync<T>(url).ConfigureAwait(false);
}

// POST

public async Task<T> HttpPostAsync<T>(object inputObject, string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpPostAsync<T>(inputObject, url);
return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
}

public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
Expand All @@ -145,7 +145,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
});
try
{
var response = await HttpPostAsync(json, uri);
var response = await HttpPostAsync(json, uri).ConfigureAwait(false);
return JsonConvert.DeserializeObject<T>(response);
}
catch (BaseHttpClientException e)
Expand All @@ -157,7 +157,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
public async Task<T> HttpPostRestApiAsync<T>(string apiName, object inputObject)
{
var url = Common.FormatRestApiUrl(apiName, InstanceUrl);
return await HttpPostAsync<T>(inputObject, url);
return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
}

public async Task<T> HttpBinaryDataPostAsync<T>(string urlSuffix, object inputObject, byte[] fileContents, string headerName, string fileName)
Expand Down Expand Up @@ -201,21 +201,21 @@ public async Task<T> HttpBinaryDataPostAsync<T>(string urlSuffix, object inputOb
public async Task<SuccessResponse> HttpPatchAsync(object inputObject, string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpPatchAsync(inputObject, url);
return await HttpPatchAsync(inputObject, url).ConfigureAwait(false);
}

public async Task<SuccessResponse> HttpPatchAsync(object inputObject, string urlSuffix, bool ignoreNull)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
if (ignoreNull == true)
{
return await HttpPatchAsync(inputObject, url);
return await HttpPatchAsync(inputObject, url).ConfigureAwait(false);
}
else
{
return await HttpPatchAsync(inputObject, url, NullValueHandling.Include);
return await HttpPatchAsync(inputObject, url, NullValueHandling.Include).ConfigureAwait(false);
}
// return await HttpPatchAsync(inputObject, url, ignoreNull);
// return await HttpPatchAsync(inputObject, url, ignoreNull).ConfigureAwait(false);
}


Expand All @@ -231,7 +231,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri)
});
try
{
var response = await base.HttpPatchAsync(json, uri);
var response = await base.HttpPatchAsync(json, uri).ConfigureAwait(false);
return string.IsNullOrEmpty(response) ?
new SuccessResponse{ Id = "", Errors = "", Success = true } :
JsonConvert.DeserializeObject<SuccessResponse>(response);
Expand All @@ -257,7 +257,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri, N

try
{
var response = await base.HttpPatchAsync(json, uri);
var response = await base.HttpPatchAsync(json, uri).ConfigureAwait(false);
return string.IsNullOrEmpty(response) ?
new SuccessResponse { Id = "", Errors = "", Success = true } :
JsonConvert.DeserializeObject<SuccessResponse>(response);
Expand All @@ -273,14 +273,14 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri, N
public async Task<bool> HttpDeleteAsync(string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpDeleteAsync(url);
return await HttpDeleteAsync(url).ConfigureAwait(false);
}

public new async Task<bool> HttpDeleteAsync(Uri uri)
{
try
{
await base.HttpDeleteAsync(uri);
await base.HttpDeleteAsync(uri).ConfigureAwait(false);
return true;
}
catch (BaseHttpClientException e)
Expand Down
8 changes: 4 additions & 4 deletions src/CommonLibrariesForNET/XmlHttpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ public XmlHttpClient(string instanceUrl, string apiVersion, string accessToken,
public async Task<T> HttpGetAsync<T>(string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpGetAsync<T>(url);
return await HttpGetAsync<T>(url).ConfigureAwait(false);
}

public async Task<T> HttpGetAsync<T>(Uri uri)
{
try
{
var response = await HttpGetAsync(uri);
var response = await HttpGetAsync(uri).ConfigureAwait(false);
return DeserializeXmlString<T>(response);
}
catch (BaseHttpClientException e)
Expand All @@ -47,15 +47,15 @@ public async Task<T> HttpGetAsync<T>(Uri uri)
public async Task<T> HttpPostAsync<T>(object inputObject, string urlSuffix)
{
var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
return await HttpPostAsync<T>(inputObject, url);
return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
}

public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
{
var postBody = SerializeXmlObject(inputObject);
try
{
var response = await HttpPostAsync(postBody, uri);
var response = await HttpPostAsync(postBody, uri).ConfigureAwait(false);
return DeserializeXmlString<T>(response);
}
catch (BaseHttpClientException e)
Expand Down
Loading