diff --git a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs index 7d5fdf3f..9d74de70 100644 --- a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs +++ b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs @@ -135,10 +135,10 @@ namespace Octokit.Reactive { Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(name, "name"); + Ensure.ArgumentNotNull(request, "request"); Ensure.ArgumentNotNull(options, "options"); - return request == null ? _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, name), options) : - _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options); + return _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options); } /// @@ -152,10 +152,10 @@ namespace Octokit.Reactive /// Options for changing the API response public IObservable GetAll(int repositoryId, RepositoryForksListRequest request, ApiOptions options) { + Ensure.ArgumentNotNull(request, "request"); Ensure.ArgumentNotNull(options, "options"); - return request == null ? _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(repositoryId), options) : - _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options); + return _connection.GetAndFlattenAllPages(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options); } /// diff --git a/Octokit.Tests/Clients/RepositoryForksClientTests.cs b/Octokit.Tests/Clients/RepositoryForksClientTests.cs index 41f5f615..6f4b5b92 100644 --- a/Octokit.Tests/Clients/RepositoryForksClientTests.cs +++ b/Octokit.Tests/Clients/RepositoryForksClientTests.cs @@ -156,11 +156,14 @@ namespace Octokit.Tests.Clients await Assert.ThrowsAsync(() => client.GetAll("owner", "name", (ApiOptions)null)); await Assert.ThrowsAsync(() => client.GetAll(null, "name", new RepositoryForksListRequest())); await Assert.ThrowsAsync(() => client.GetAll("owner", null, new RepositoryForksListRequest())); + await Assert.ThrowsAsync(() => client.GetAll("owner", "name", (RepositoryForksListRequest)null)); await Assert.ThrowsAsync(() => client.GetAll(null, "name", new RepositoryForksListRequest(), ApiOptions.None)); await Assert.ThrowsAsync(() => client.GetAll("owner", null, new RepositoryForksListRequest(), ApiOptions.None)); + await Assert.ThrowsAsync(() => client.GetAll("owner", "name", null, ApiOptions.None)); await Assert.ThrowsAsync(() => client.GetAll("owner", "name", new RepositoryForksListRequest(), null)); await Assert.ThrowsAsync(() => client.GetAll(1, (ApiOptions)null)); + await Assert.ThrowsAsync(() => client.GetAll(1, (RepositoryForksListRequest)null)); await Assert.ThrowsAsync(() => client.GetAll(1, new RepositoryForksListRequest(), null)); await Assert.ThrowsAsync(() => client.GetAll("", "name")); diff --git a/Octokit.Tests/Reactive/ObservableRepositoryForksClientTests.cs b/Octokit.Tests/Reactive/ObservableRepositoryForksClientTests.cs index e6611a1a..49e7cedf 100644 --- a/Octokit.Tests/Reactive/ObservableRepositoryForksClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableRepositoryForksClientTests.cs @@ -157,11 +157,14 @@ namespace Octokit.Tests.Reactive Assert.Throws(() => client.GetAll("owner", "name", (ApiOptions)null)); Assert.Throws(() => client.GetAll(null, "name", new RepositoryForksListRequest())); Assert.Throws(() => client.GetAll("owner", null, new RepositoryForksListRequest())); + Assert.Throws(() => client.GetAll("owner", "name", (RepositoryForksListRequest)null)); Assert.Throws(() => client.GetAll(null, "name", new RepositoryForksListRequest(), ApiOptions.None)); Assert.Throws(() => client.GetAll("owner", null, new RepositoryForksListRequest(), ApiOptions.None)); + Assert.Throws(() => client.GetAll("owner", "name", null, ApiOptions.None)); Assert.Throws(() => client.GetAll("owner", "name", new RepositoryForksListRequest(), null)); Assert.Throws(() => client.GetAll(1, (ApiOptions)null)); + Assert.Throws(() => client.GetAll(1, (RepositoryForksListRequest)null)); Assert.Throws(() => client.GetAll(1, new RepositoryForksListRequest(), null)); Assert.Throws(() => client.GetAll("", "name")); diff --git a/Octokit/Clients/RepositoryForksClient.cs b/Octokit/Clients/RepositoryForksClient.cs index c7da5265..827da5f5 100644 --- a/Octokit/Clients/RepositoryForksClient.cs +++ b/Octokit/Clients/RepositoryForksClient.cs @@ -94,6 +94,7 @@ namespace Octokit { Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(name, "name"); + Ensure.ArgumentNotNull(request, "request"); return GetAll(owner, name, request, ApiOptions.None); } @@ -108,6 +109,8 @@ namespace Octokit /// Used to request and filter a list of repository forks public Task> GetAll(int repositoryId, RepositoryForksListRequest request) { + Ensure.ArgumentNotNull(request, "request"); + return GetAll(repositoryId, request, ApiOptions.None); } @@ -125,11 +128,10 @@ namespace Octokit { Ensure.ArgumentNotNullOrEmptyString(owner, "owner"); Ensure.ArgumentNotNullOrEmptyString(name, "name"); + Ensure.ArgumentNotNull(request, "request"); Ensure.ArgumentNotNull(options, "options"); - return request == null - ? ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, name), options) : - ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options); + return ApiConnection.GetAll(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options); } /// @@ -143,11 +145,10 @@ namespace Octokit /// Options for changing the API response public Task> GetAll(int repositoryId, RepositoryForksListRequest request, ApiOptions options) { + Ensure.ArgumentNotNull(request, "request"); Ensure.ArgumentNotNull(options, "options"); - return request == null - ? ApiConnection.GetAll(ApiUrls.RepositoryForks(repositoryId), options) : - ApiConnection.GetAll(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options); + return ApiConnection.GetAll(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options); } ///