From d3c43b77a9fa215febb7baddba60c4a329382576 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Wed, 6 Apr 2016 20:09:59 -0400 Subject: [PATCH] drop unnecessary awaits and specify ConfigureAwait otherwise for other core clients --- Octokit/Clients/PullRequestsClient.cs | 2 +- Octokit/Clients/RepositoriesClient.cs | 2 +- Octokit/Clients/RepositoryContentsClient.cs | 2 +- Octokit/Clients/StatisticsClient.cs | 12 ++++++------ Octokit/Clients/TeamsClient.cs | 14 +++++++------- Octokit/Clients/UserAdministrationClient.cs | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Octokit/Clients/PullRequestsClient.cs b/Octokit/Clients/PullRequestsClient.cs index 85ffe16f..39d3abc9 100644 --- a/Octokit/Clients/PullRequestsClient.cs +++ b/Octokit/Clients/PullRequestsClient.cs @@ -118,7 +118,7 @@ namespace Octokit try { - return await ApiConnection.Put(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest); + return await ApiConnection.Put(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest).ConfigureAwait(false); } catch (ApiException ex) { diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs index 41af07ae..7d209297 100644 --- a/Octokit/Clients/RepositoriesClient.cs +++ b/Octokit/Clients/RepositoriesClient.cs @@ -87,7 +87,7 @@ namespace Octokit { try { - return await ApiConnection.Post(url, newRepository); + return await ApiConnection.Post(url, newRepository).ConfigureAwait(false); } catch (ApiValidationException e) { diff --git a/Octokit/Clients/RepositoryContentsClient.cs b/Octokit/Clients/RepositoryContentsClient.cs index cc63f00e..fbd1d850 100644 --- a/Octokit/Clients/RepositoryContentsClient.cs +++ b/Octokit/Clients/RepositoryContentsClient.cs @@ -259,7 +259,7 @@ namespace Octokit var endpoint = ApiUrls.RepositoryArchiveLink(owner, name, archiveFormat, reference); - var response = await Connection.Get(endpoint, timeout); + var response = await Connection.Get(endpoint, timeout).ConfigureAwait(false); return response.Body; } diff --git a/Octokit/Clients/StatisticsClient.cs b/Octokit/Clients/StatisticsClient.cs index f63a94ec..d55207d2 100644 --- a/Octokit/Clients/StatisticsClient.cs +++ b/Octokit/Clients/StatisticsClient.cs @@ -39,13 +39,13 @@ namespace Octokit /// The name of the repository /// A token used to cancel this potentially long running request /// A list of - public async Task> GetContributors(string owner, string repositoryName, CancellationToken cancellationToken) + public Task> GetContributors(string owner, string repositoryName, CancellationToken cancellationToken) { Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); var endpoint = "repos/{0}/{1}/stats/contributors".FormatUri(owner, repositoryName); - return await ApiConnection.GetQueuedOperation(endpoint, cancellationToken); + return ApiConnection.GetQueuedOperation(endpoint, cancellationToken); } /// @@ -72,7 +72,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); var endpoint = "repos/{0}/{1}/stats/commit_activity".FormatUri(owner, repositoryName); - var activity = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken); + var activity = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken).ConfigureAwait(false); return new CommitActivity(activity); } @@ -100,7 +100,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); var endpoint = "repos/{0}/{1}/stats/code_frequency".FormatUri(owner, repositoryName); - var rawFrequencies = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken); + var rawFrequencies = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken).ConfigureAwait(false); return new CodeFrequency(rawFrequencies); } @@ -128,7 +128,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); var endpoint = "repos/{0}/{1}/stats/participation".FormatUri(owner, repositoryName); - var result = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken); + var result = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken).ConfigureAwait(false); return result.FirstOrDefault(); } @@ -156,7 +156,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); var endpoint = "repos/{0}/{1}/stats/punch_card".FormatUri(owner, repositoryName); - var punchCardData = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken); + var punchCardData = await ApiConnection.GetQueuedOperation(endpoint, cancellationToken).ConfigureAwait(false); return new PunchCard(punchCardData); } } diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs index 67376b42..ae721871 100644 --- a/Octokit/Clients/TeamsClient.cs +++ b/Octokit/Clients/TeamsClient.cs @@ -137,7 +137,7 @@ namespace Octokit try { - response = await ApiConnection.Get>(endpoint); + response = await ApiConnection.Get>(endpoint).ConfigureAwait(false); } catch (NotFoundException) { @@ -208,7 +208,7 @@ namespace Octokit try { - response = await ApiConnection.Put>(endpoint, RequestBody.Empty); + response = await ApiConnection.Put>(endpoint, RequestBody.Empty).ConfigureAwait(false); } catch (NotFoundException) { @@ -242,7 +242,7 @@ namespace Octokit try { - var httpStatusCode = await ApiConnection.Connection.Delete(endpoint); + var httpStatusCode = await ApiConnection.Connection.Delete(endpoint).ConfigureAwait(false); return httpStatusCode == HttpStatusCode.NoContent; } @@ -268,7 +268,7 @@ namespace Octokit try { - var response = await ApiConnection.Connection.GetResponse(endpoint); + var response = await ApiConnection.Connection.GetResponse(endpoint).ConfigureAwait(false); return response.HttpResponse.StatusCode == HttpStatusCode.NoContent; } catch (NotFoundException) @@ -333,7 +333,7 @@ namespace Octokit try { - var httpStatusCode = await ApiConnection.Connection.Put(endpoint); + var httpStatusCode = await ApiConnection.Connection.Put(endpoint).ConfigureAwait(false); return httpStatusCode == HttpStatusCode.NoContent; } catch (NotFoundException) @@ -356,7 +356,7 @@ namespace Octokit try { - var httpStatusCode = await ApiConnection.Connection.Delete(endpoint); + var httpStatusCode = await ApiConnection.Connection.Delete(endpoint).ConfigureAwait(false); return httpStatusCode == HttpStatusCode.NoContent; } @@ -385,7 +385,7 @@ namespace Octokit try { - var response = await ApiConnection.Connection.GetResponse(endpoint); + var response = await ApiConnection.Connection.GetResponse(endpoint).ConfigureAwait(false); return response.HttpResponse.StatusCode == HttpStatusCode.NoContent; } catch (NotFoundException) diff --git a/Octokit/Clients/UserAdministrationClient.cs b/Octokit/Clients/UserAdministrationClient.cs index 1b7a15e6..7245a8ad 100644 --- a/Octokit/Clients/UserAdministrationClient.cs +++ b/Octokit/Clients/UserAdministrationClient.cs @@ -95,7 +95,7 @@ namespace Octokit var endpoint = ApiUrls.UserAdministrationAuthorization(login); - var response = ((HttpStatusCode)await Connection.Delete(endpoint)); + var response = await Connection.Delete(endpoint).ConfigureAwait(false); if (response != HttpStatusCode.NoContent) { throw new ApiException("Invalid Status Code returned. Expected a 204", response); @@ -196,7 +196,7 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(login, "login"); var endpoint = ApiUrls.UserAdministration(login); - var response = ((HttpStatusCode)await Connection.Delete(endpoint)); + var response = await Connection.Delete(endpoint).ConfigureAwait(false); if (response != HttpStatusCode.NoContent) { throw new ApiException("Invalid Status Code returned. Expected a 204", response); @@ -219,7 +219,7 @@ namespace Octokit Ensure.ArgumentNotNull(keyId, "keyId"); var endpoint = ApiUrls.UserAdministrationPublicKeys(keyId); - var response = ((HttpStatusCode)await Connection.Delete(endpoint)); + var response = await Connection.Delete(endpoint).ConfigureAwait(false); if (response != HttpStatusCode.NoContent) { throw new ApiException("Invalid Status Code returned. Expected a 204", response);