Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-16 08:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ArgumentNullException.ThrowIfNull when possible (#2591)

Browse Source 
* Misc.

* Fix mistake
This commit is contained in:
Sebastian Göls
2022-05-26 13:29:12 +02:00
committed by GitHub
parent c9b1e46013
commit 68e30b43c2
13 changed files with 50 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ArchiSteamFarm/Web/GitHub.cs
View File

@@ -175,9 +175,7 @@ internal static class GitHub {
}
private static async Task<ReleaseResponse?> GetReleaseFromURL(Uri request) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (ASF.WebBrowser == null) {
throw new InvalidOperationException(nameof(ASF.WebBrowser));
@@ -189,9 +187,7 @@ internal static class GitHub {
}
private static async Task<ImmutableList<ReleaseResponse>?> GetReleasesFromURL(Uri request) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (ASF.WebBrowser == null) {
throw new InvalidOperationException(nameof(ASF.WebBrowser));

57
ArchiSteamFarm/Web/WebBrowser.cs
View File

@@ -116,9 +116,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<BinaryResponse?> UrlGetToBinary(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0, IProgress<byte>? progressReporter = null) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -225,9 +223,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<HtmlDocumentResponse?> UrlGetToHtmlDocument(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -286,9 +282,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<ObjectResponse<T>?> UrlGetToJsonObject<T>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -364,9 +358,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<StreamResponse?> UrlGetToStream(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -418,9 +410,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<BasicResponse?> UrlHead(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -480,9 +470,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<BasicResponse?> UrlPost<T>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, T? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) where T : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -542,9 +530,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<HtmlDocumentResponse?> UrlPostToHtmlDocument<T>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, T? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) where T : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -603,9 +589,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<ObjectResponse<TResult>?> UrlPostToJsonObject<TResult, TData>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, TData? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) where TData : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -681,9 +665,7 @@ public sealed class WebBrowser : IDisposable {
[PublicAPI]
public async Task<StreamResponse?> UrlPostToStream<T>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, T? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, byte maxTries = MaxTries, int rateLimitingDelay = 0) where T : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
if (maxTries == 0) {
throw new ArgumentOutOfRangeException(nameof(maxTries));
@@ -754,37 +736,26 @@ public sealed class WebBrowser : IDisposable {
}
private async Task<HttpResponseMessage?> InternalGet(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
return await InternalRequest<object>(request, HttpMethod.Get, headers, null, referer, requestOptions, httpCompletionOption).ConfigureAwait(false);
}
private async Task<HttpResponseMessage?> InternalHead(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead) {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
return await InternalRequest<object>(request, HttpMethod.Head, headers, null, referer, requestOptions, httpCompletionOption).ConfigureAwait(false);
}
private async Task<HttpResponseMessage?> InternalPost<T>(Uri request, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, T? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead) where T : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
ArgumentNullException.ThrowIfNull(request);
return await InternalRequest(request, HttpMethod.Post, headers, data, referer, requestOptions, httpCompletionOption).ConfigureAwait(false);
}
private async Task<HttpResponseMessage?> InternalRequest<T>(Uri request, HttpMethod httpMethod, IReadOnlyCollection<KeyValuePair<string, string>>? headers = null, T? data = null, Uri? referer = null, ERequestOptions requestOptions = ERequestOptions.None, HttpCompletionOption httpCompletionOption = HttpCompletionOption.ResponseContentRead, byte maxRedirections = MaxTries) where T : class {
if (request == null) {
throw new ArgumentNullException(nameof(request));
}
if (httpMethod == null) {
throw new ArgumentNullException(nameof(httpMethod));
}
ArgumentNullException.ThrowIfNull(request);
ArgumentNullException.ThrowIfNull(httpMethod);
HttpResponseMessage response;