From 507525b67f9db11834642b3c65de9aeafd8a26a3 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 18 Nov 2020 11:09:09 -0500 Subject: [PATCH] Fix nullable annotations on HttpClient.Post/Put/PatchAsync Null content is allowed. --- .../System.Net.Http/ref/System.Net.Http.cs | 24 +++++++++---------- .../src/System/Net/Http/HttpClient.cs | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/libraries/System.Net.Http/ref/System.Net.Http.cs b/src/libraries/System.Net.Http/ref/System.Net.Http.cs index 957f8f05e36c9d..35406af37bb8c3 100644 --- a/src/libraries/System.Net.Http/ref/System.Net.Http.cs +++ b/src/libraries/System.Net.Http/ref/System.Net.Http.cs @@ -78,18 +78,18 @@ protected override void Dispose(bool disposing) { } public System.Threading.Tasks.Task GetStringAsync(string? requestUri, System.Threading.CancellationToken cancellationToken) { throw null; } public System.Threading.Tasks.Task GetStringAsync(System.Uri? requestUri) { throw null; } public System.Threading.Tasks.Task GetStringAsync(System.Uri? requestUri, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PatchAsync(string? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PatchAsync(string? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PatchAsync(System.Uri? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PatchAsync(System.Uri? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PostAsync(string? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PostAsync(string? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PostAsync(System.Uri? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PostAsync(System.Uri? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PutAsync(string? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PutAsync(string? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task PutAsync(System.Uri? requestUri, System.Net.Http.HttpContent content) { throw null; } - public System.Threading.Tasks.Task PutAsync(System.Uri? requestUri, System.Net.Http.HttpContent content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PatchAsync(string? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PatchAsync(string? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PatchAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PatchAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PostAsync(string? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PostAsync(string? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PostAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PostAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PutAsync(string? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PutAsync(string? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task PutAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content) { throw null; } + public System.Threading.Tasks.Task PutAsync(System.Uri? requestUri, System.Net.Http.HttpContent? content, System.Threading.CancellationToken cancellationToken) { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] public System.Net.Http.HttpResponseMessage Send(System.Net.Http.HttpRequestMessage request) { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs index 0a9aa077909090..807bab6911d83f 100644 --- a/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs +++ b/src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs @@ -376,48 +376,48 @@ public Task GetAsync(string? requestUri, HttpCompletionOpti public Task GetAsync(Uri? requestUri, HttpCompletionOption completionOption, CancellationToken cancellationToken) => SendAsync(CreateRequestMessage(HttpMethod.Get, requestUri), completionOption, cancellationToken); - public Task PostAsync(string? requestUri, HttpContent content) => + public Task PostAsync(string? requestUri, HttpContent? content) => PostAsync(CreateUri(requestUri), content); - public Task PostAsync(Uri? requestUri, HttpContent content) => + public Task PostAsync(Uri? requestUri, HttpContent? content) => PostAsync(requestUri, content, CancellationToken.None); - public Task PostAsync(string? requestUri, HttpContent content, CancellationToken cancellationToken) => + public Task PostAsync(string? requestUri, HttpContent? content, CancellationToken cancellationToken) => PostAsync(CreateUri(requestUri), content, cancellationToken); - public Task PostAsync(Uri? requestUri, HttpContent content, CancellationToken cancellationToken) + public Task PostAsync(Uri? requestUri, HttpContent? content, CancellationToken cancellationToken) { HttpRequestMessage request = CreateRequestMessage(HttpMethod.Post, requestUri); request.Content = content; return SendAsync(request, cancellationToken); } - public Task PutAsync(string? requestUri, HttpContent content) => + public Task PutAsync(string? requestUri, HttpContent? content) => PutAsync(CreateUri(requestUri), content); - public Task PutAsync(Uri? requestUri, HttpContent content) => + public Task PutAsync(Uri? requestUri, HttpContent? content) => PutAsync(requestUri, content, CancellationToken.None); - public Task PutAsync(string? requestUri, HttpContent content, CancellationToken cancellationToken) => + public Task PutAsync(string? requestUri, HttpContent? content, CancellationToken cancellationToken) => PutAsync(CreateUri(requestUri), content, cancellationToken); - public Task PutAsync(Uri? requestUri, HttpContent content, CancellationToken cancellationToken) + public Task PutAsync(Uri? requestUri, HttpContent? content, CancellationToken cancellationToken) { HttpRequestMessage request = CreateRequestMessage(HttpMethod.Put, requestUri); request.Content = content; return SendAsync(request, cancellationToken); } - public Task PatchAsync(string? requestUri, HttpContent content) => + public Task PatchAsync(string? requestUri, HttpContent? content) => PatchAsync(CreateUri(requestUri), content); - public Task PatchAsync(Uri? requestUri, HttpContent content) => + public Task PatchAsync(Uri? requestUri, HttpContent? content) => PatchAsync(requestUri, content, CancellationToken.None); - public Task PatchAsync(string? requestUri, HttpContent content, CancellationToken cancellationToken) => + public Task PatchAsync(string? requestUri, HttpContent? content, CancellationToken cancellationToken) => PatchAsync(CreateUri(requestUri), content, cancellationToken); - public Task PatchAsync(Uri? requestUri, HttpContent content, CancellationToken cancellationToken) + public Task PatchAsync(Uri? requestUri, HttpContent? content, CancellationToken cancellationToken) { HttpRequestMessage request = CreateRequestMessage(HttpMethod.Patch, requestUri); request.Content = content;