From 2b3c3f49b9db41128365d58fd30117e3324bb6df Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 4 Aug 2015 21:17:42 -0700 Subject: [PATCH] Return result of ternary operator --- .../Clients/ObservableRepositoryForksClient.cs | 7 +++---- Octokit/Clients/RepositoryForksClient.cs | 7 +++---- Octokit/Helpers/ApiErrorExtensions.cs | 3 +-- Octokit/Helpers/PropertyOrField.cs | 6 +----- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs index 691a55d4..3238cd6c 100644 --- a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs +++ b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs @@ -30,10 +30,9 @@ namespace Octokit.Reactive Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); - if (request == null) - return _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, repositoryName)); - else - return _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, repositoryName), request.ToParametersDictionary()); + return request == null + ? _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, repositoryName)) + : _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, repositoryName), request.ToParametersDictionary()); } /// diff --git a/Octokit/Clients/RepositoryForksClient.cs b/Octokit/Clients/RepositoryForksClient.cs index 85dacf2b..c45a634b 100644 --- a/Octokit/Clients/RepositoryForksClient.cs +++ b/Octokit/Clients/RepositoryForksClient.cs @@ -24,10 +24,9 @@ namespace Octokit Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(repositoryName, "repositoryName"); - if (request == null) - return ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, repositoryName)); - else - return ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, repositoryName), request.ToParametersDictionary()); + return request == null + ? ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, repositoryName)) + : ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, repositoryName), request.ToParametersDictionary()); } /// diff --git a/Octokit/Helpers/ApiErrorExtensions.cs b/Octokit/Helpers/ApiErrorExtensions.cs index bc74fc3a..1d037e26 100644 --- a/Octokit/Helpers/ApiErrorExtensions.cs +++ b/Octokit/Helpers/ApiErrorExtensions.cs @@ -9,8 +9,7 @@ namespace Octokit if (apiError == null) return null; if (apiError.Errors == null) return apiError.Message; var firstError = apiError.Errors.FirstOrDefault(); - if (firstError == null) return null; - return firstError.Message; + return firstError == null ? null : firstError.Message; } } } diff --git a/Octokit/Helpers/PropertyOrField.cs b/Octokit/Helpers/PropertyOrField.cs index 97d51b20..c0acd6d2 100644 --- a/Octokit/Helpers/PropertyOrField.cs +++ b/Octokit/Helpers/PropertyOrField.cs @@ -110,11 +110,7 @@ namespace Octokit { var value = getDelegate(source); var stringValue = value as string; - if (stringValue == null) - { - return value; - } - return stringValue.ToBase64String(); + return stringValue == null ? value : stringValue.ToBase64String(); }; }