From 43e82e124fd8a1ac2b30f718744576a136a7d74d Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Thu, 31 Oct 2013 12:06:46 +1100 Subject: [PATCH] doing await right by calling .ConfigureAwait(false) --- Octokit/Authentication/Authenticator.cs | 2 +- Octokit/Clients/ApiPagination.cs | 4 ++-- Octokit/Clients/AssigneesClient.cs | 2 +- Octokit/Clients/MiscellaneousClient.cs | 4 ++-- Octokit/Clients/RepositoriesClient.cs | 2 +- Octokit/Helpers/AuthorizationExtensions.cs | 8 ++++---- Octokit/Http/ApiConnection.cs | 18 +++++++++--------- Octokit/Http/Connection.cs | 6 +++--- Octokit/Http/HttpClientAdapter.cs | 6 +++--- Octokit/Http/ReadOnlyPagedCollection.cs | 2 +- Octokit/Models/Response/Readme.cs | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Octokit/Authentication/Authenticator.cs b/Octokit/Authentication/Authenticator.cs index bbadae7c..50a918d3 100644 --- a/Octokit/Authentication/Authenticator.cs +++ b/Octokit/Authentication/Authenticator.cs @@ -24,7 +24,7 @@ namespace Octokit.Internal { Ensure.ArgumentNotNull(request, "request"); - var credentials = await CredentialStore.GetCredentials() ?? Credentials.Anonymous; + var credentials = await CredentialStore.GetCredentials().ConfigureAwait(false) ?? Credentials.Anonymous; authenticators[credentials.AuthenticationType].Authenticate(request, credentials); } diff --git a/Octokit/Clients/ApiPagination.cs b/Octokit/Clients/ApiPagination.cs index 2647bc1f..a37f78e9 100644 --- a/Octokit/Clients/ApiPagination.cs +++ b/Octokit/Clients/ApiPagination.cs @@ -19,9 +19,9 @@ namespace Octokit { Ensure.ArgumentNotNull(getFirstPage, "getFirstPage"); - var page = await getFirstPage(); + var page = await getFirstPage().ConfigureAwait(false); var allItems = new List(page); - while ((page = await page.GetNextPage()) != null) + while ((page = await page.GetNextPage().ConfigureAwait(false)) != null) { allItems.AddRange(page); } diff --git a/Octokit/Clients/AssigneesClient.cs b/Octokit/Clients/AssigneesClient.cs index 998d74d8..7463d0c1 100644 --- a/Octokit/Clients/AssigneesClient.cs +++ b/Octokit/Clients/AssigneesClient.cs @@ -39,7 +39,7 @@ namespace Octokit try { - var response = await Connection.GetAsync(ApiUrls.CheckAssignee(owner, name, assignee), null, null); + var response = await Connection.GetAsync(ApiUrls.CheckAssignee(owner, name, assignee), null, null).ConfigureAwait(false); if (response.StatusCode != HttpStatusCode.NotFound && response.StatusCode != HttpStatusCode.NoContent) { throw new ApiException("Invalid Status Code returned. Expected a 204 or a 404", response.StatusCode); diff --git a/Octokit/Clients/MiscellaneousClient.cs b/Octokit/Clients/MiscellaneousClient.cs index 1ec06af6..c6582093 100644 --- a/Octokit/Clients/MiscellaneousClient.cs +++ b/Octokit/Clients/MiscellaneousClient.cs @@ -37,7 +37,7 @@ namespace Octokit public async Task> GetEmojis() { var endpoint = new Uri("emojis", UriKind.Relative); - var response = await _connection.GetAsync>(endpoint, null, null); + var response = await _connection.GetAsync>(endpoint, null, null).ConfigureAwait(false); return new ReadOnlyDictionary( response.BodyAsObject.ToDictionary(kvp => kvp.Key, kvp => new Uri(kvp.Value))); } @@ -51,7 +51,7 @@ namespace Octokit public async Task RenderRawMarkdown(string markdown) { var endpoint = new Uri("markdown/raw", UriKind.Relative); - var response = await _connection.PostAsync(endpoint, markdown, "text/html", "text/plain"); + var response = await _connection.PostAsync(endpoint, markdown, "text/html", "text/plain").ConfigureAwait(false); return response.Body; } } diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs index f23bf445..023651ca 100644 --- a/Octokit/Clients/RepositoriesClient.cs +++ b/Octokit/Clients/RepositoriesClient.cs @@ -162,7 +162,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(name, "name"); var endpoint = "repos/{0}/{1}/readme".FormatUri(owner, name); - var readmeInfo = await ApiConnection.Get(endpoint, null); + var readmeInfo = await ApiConnection.Get(endpoint, null).ConfigureAwait(false); return new Readme(readmeInfo, ApiConnection); } diff --git a/Octokit/Helpers/AuthorizationExtensions.cs b/Octokit/Helpers/AuthorizationExtensions.cs index 895ae92c..7b0a89b1 100644 --- a/Octokit/Helpers/AuthorizationExtensions.cs +++ b/Octokit/Helpers/AuthorizationExtensions.cs @@ -38,25 +38,25 @@ namespace Octokit TwoFactorRequiredException twoFactorException = null; try { - return await authorizationsClient.GetOrCreateApplicationAuthentication(clientId, clientSecret, newAuthorization); + return await authorizationsClient.GetOrCreateApplicationAuthentication(clientId, clientSecret, newAuthorization).ConfigureAwait(false); } catch (TwoFactorRequiredException exception) { twoFactorException = exception; } - var twoFactorChallengeResult = await twoFactorChallengeHandler(twoFactorException); + var twoFactorChallengeResult = await twoFactorChallengeHandler(twoFactorException).ConfigureAwait(false); return await (twoFactorChallengeResult.ResendCodeRequested ? authorizationsClient.GetOrCreateApplicationAuthentication( clientId, clientSecret, newAuthorization, - twoFactorChallengeHandler) + twoFactorChallengeHandler).ConfigureAwait(false) : authorizationsClient.GetOrCreateApplicationAuthentication( clientId, clientSecret, newAuthorization, - twoFactorChallengeResult.AuthenticationCode)); + twoFactorChallengeResult.AuthenticationCode).ConfigureAwait(false)); } } } diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs index e0cfee4b..a947d99e 100644 --- a/Octokit/Http/ApiConnection.cs +++ b/Octokit/Http/ApiConnection.cs @@ -52,7 +52,7 @@ namespace Octokit { Ensure.ArgumentNotNull(uri, "uri"); - var response = await Connection.GetAsync(uri, parameters, null); + var response = await Connection.GetAsync(uri, parameters, null).ConfigureAwait(false); return response.BodyAsObject; } @@ -67,7 +67,7 @@ namespace Octokit { Ensure.ArgumentNotNull(uri, "uri"); - var response = await Connection.GetHtml(uri, parameters); + var response = await Connection.GetHtml(uri, parameters).ConfigureAwait(false); return response.Body; } @@ -109,7 +109,7 @@ namespace Octokit { Ensure.ArgumentNotNull(uri, "uri"); - return _pagination.GetAllPages(async () => await GetPage(uri, parameters, accepts)); + return _pagination.GetAllPages(async () => await GetPage(uri, parameters, accepts).ConfigureAwait(false)); } /// @@ -161,7 +161,7 @@ namespace Octokit uri, data, accepts, - contentType); + contentType).ConfigureAwait(false); return response.BodyAsObject; } @@ -178,7 +178,7 @@ namespace Octokit Ensure.ArgumentNotNull(uri, "uri"); Ensure.ArgumentNotNull(data, "data"); - var response = await Connection.PutAsync(uri, data); + var response = await Connection.PutAsync(uri, data).ConfigureAwait(false); return response.BodyAsObject; } @@ -197,8 +197,8 @@ namespace Octokit Ensure.ArgumentNotNull(uri, "uri"); Ensure.ArgumentNotNull(data, "data"); Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode"); - - var response = await Connection.PutAsync(uri, data, twoFactorAuthenticationCode); + + var response = await Connection.PutAsync(uri, data, twoFactorAuthenticationCode).ConfigureAwait(false); return response.BodyAsObject; } @@ -216,7 +216,7 @@ namespace Octokit Ensure.ArgumentNotNull(uri, "uri"); Ensure.ArgumentNotNull(data, "data"); - var response = await Connection.PatchAsync(uri, data); + var response = await Connection.PatchAsync(uri, data).ConfigureAwait(false); return response.BodyAsObject; } @@ -240,7 +240,7 @@ namespace Octokit { Ensure.ArgumentNotNull(uri, "uri"); - var response = await Connection.GetAsync>(uri, parameters, accepts); + var response = await Connection.GetAsync>(uri, parameters, accepts).ConfigureAwait(false); return new ReadOnlyPagedCollection( response, nextPageUri => Connection.GetAsync>(nextPageUri, parameters, accepts)); diff --git a/Octokit/Http/Connection.cs b/Octokit/Http/Connection.cs index 003dee9f..e9418f26 100644 --- a/Octokit/Http/Connection.cs +++ b/Octokit/Http/Connection.cs @@ -260,7 +260,7 @@ namespace Octokit async Task> Run(IRequest request) { _jsonPipeline.SerializeRequest(request); - var response = await RunRequest(request); + var response = await RunRequest(request).ConfigureAwait(false); _jsonPipeline.DeserializeResponse(response); return response; } @@ -269,8 +269,8 @@ namespace Octokit async Task> RunRequest(IRequest request) { request.Headers.Add("User-Agent", UserAgent); - await _authenticator.Apply(request); - var response = await _httpClient.Send(request); + await _authenticator.Apply(request).ConfigureAwait(false); + var response = await _httpClient.Send(request).ConfigureAwait(false); ApiInfoParser.ParseApiHttpHeaders(response); HandleErrors(response); return response; diff --git a/Octokit/Http/HttpClientAdapter.cs b/Octokit/Http/HttpClientAdapter.cs index 60658a05..5b0ed64d 100644 --- a/Octokit/Http/HttpClientAdapter.cs +++ b/Octokit/Http/HttpClientAdapter.cs @@ -33,8 +33,8 @@ namespace Octokit.Internal using (var requestMessage = BuildRequestMessage(request)) { // Make the request - var responseMessage = await http.SendAsync(requestMessage, HttpCompletionOption.ResponseContentRead); - return await BuildResponse(responseMessage); + var responseMessage = await http.SendAsync(requestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false); + return await BuildResponse(responseMessage).ConfigureAwait(false); } } @@ -48,7 +48,7 @@ namespace Octokit.Internal { if (content != null) { - responseBody = await responseMessage.Content.ReadAsStringAsync(); + responseBody = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false); contentType = GetContentType(content); } } diff --git a/Octokit/Http/ReadOnlyPagedCollection.cs b/Octokit/Http/ReadOnlyPagedCollection.cs index f061388a..743b7aae 100644 --- a/Octokit/Http/ReadOnlyPagedCollection.cs +++ b/Octokit/Http/ReadOnlyPagedCollection.cs @@ -25,7 +25,7 @@ namespace Octokit.Internal var nextPageUrl = _info.GetNextPageUrl(); if (nextPageUrl == null) return null; - var response = await _nextPageFunc(nextPageUrl); + var response = await _nextPageFunc(nextPageUrl).ConfigureAwait(false); return new ReadOnlyPagedCollection(response, _nextPageFunc); } } diff --git a/Octokit/Models/Response/Readme.cs b/Octokit/Models/Response/Readme.cs index 82d871e7..ff99a657 100644 --- a/Octokit/Models/Response/Readme.cs +++ b/Octokit/Models/Response/Readme.cs @@ -22,7 +22,7 @@ namespace Octokit var contentAsBytes = Convert.FromBase64String(response.Content); Content = Encoding.UTF8.GetString(contentAsBytes, 0, contentAsBytes.Length); } - htmlContent = new Lazy>(async () => await client.GetHtml(HtmlUrl)); + htmlContent = new Lazy>(async () => await client.GetHtml(HtmlUrl).ConfigureAwait(false)); } public string Content { get; private set; }