Skip to content

Mark StringContent mediaType parameters as nullable #103442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Mark StringContent mediaType parameters as nullable #103442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b15680
Mark StringContent mediaType parameters as nullable
MihaZupan Jun 13, 2024
8962b4b
Update tests
MihaZupan Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/libraries/System.Net.Http/ref/System.Net.Http.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,10 +476,10 @@ protected override void SerializeToStream(System.IO.Stream stream, System.Net.Tr
public partial class StringContent : System.Net.Http.ByteArrayContent
{
public StringContent(string content) : base (default(byte[])) { }
public StringContent(string content, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) : base (default(byte[])) { }
public StringContent(string content, System.Net.Http.Headers.MediaTypeHeaderValue? mediaType) : base (default(byte[])) { }
public StringContent(string content, System.Text.Encoding? encoding) : base (default(byte[])) { }
public StringContent(string content, System.Text.Encoding? encoding, System.Net.Http.Headers.MediaTypeHeaderValue mediaType) : base (default(byte[])) { }
public StringContent(string content, System.Text.Encoding? encoding, string mediaType) : base (default(byte[])) { }
public StringContent(string content, System.Text.Encoding? encoding, System.Net.Http.Headers.MediaTypeHeaderValue? mediaType) : base (default(byte[])) { }
public StringContent(string content, System.Text.Encoding? encoding, string? mediaType) : base (default(byte[])) { }
protected override System.Threading.Tasks.Task SerializeToStreamAsync(System.IO.Stream stream, System.Net.TransportContext? context, System.Threading.CancellationToken cancellationToken) { throw null; }
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Net.Http/src/System/Net/Http/StringContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public StringContent(string content)
/// <summary>Creates a new instance of the <see cref="StringContent"/> class.</summary>
/// <param name="content">The content used to initialize the <see cref="StringContent"/>.</param>
/// <param name="mediaType">The media type to use for the content.</param>
public StringContent(string content, MediaTypeHeaderValue mediaType)
public StringContent(string content, MediaTypeHeaderValue? mediaType)
: this(content, DefaultStringEncoding, mediaType)
{
}
Expand All @@ -45,7 +45,7 @@ public StringContent(string content, Encoding? encoding)
/// <param name="content">The content used to initialize the <see cref="StringContent"/>.</param>
/// <param name="encoding">The encoding to use for the content.</param>
/// <param name="mediaType">The media type to use for the content.</param>
public StringContent(string content, Encoding? encoding, string mediaType)
public StringContent(string content, Encoding? encoding, string? mediaType)
: base(GetContentByteArray(content, encoding))
{
Debug.Assert(DefaultStringEncoding.WebName == "utf-8");
Expand Down Expand Up @@ -77,7 +77,7 @@ public StringContent(string content, Encoding? encoding, string mediaType)
/// <param name="content">The content used to initialize the <see cref="StringContent"/>.</param>
/// <param name="encoding">The encoding to use for the content.</param>
/// <param name="mediaType">The media type to use for the content.</param>
public StringContent(string content, Encoding? encoding, MediaTypeHeaderValue mediaType)
public StringContent(string content, Encoding? encoding, MediaTypeHeaderValue? mediaType)
: base(GetContentByteArray(content, encoding))
{
Headers.ContentType = mediaType;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/tests/FunctionalTests/HttpRequestMessageTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public async Task HttpRequest_StringContent_WithoutMediaType()
await LoopbackServer.CreateServerAsync(async (server, uri) =>
{
var request = new HttpRequestMessage(HttpMethod.Post, uri);
request.Content = new StringContent("", null, ((MediaTypeHeaderValue)null)!);
request.Content = new StringContent("", null, (MediaTypeHeaderValue)null);

Task<HttpResponseMessage> requestTask = client.SendAsync(request);
await server.AcceptConnectionAsync(async connection =>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Http/tests/FunctionalTests/StringContentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void Ctor_PassNullHeaderValueForMediaType_NoMediaTypeUsed()
{
string sourceString = "\u00C4\u00E4\u00FC\u00DC";
Encoding defaultStringEncoding = Encoding.GetEncoding("utf-8");
var content = new StringContent(sourceString, defaultStringEncoding, ((Headers.MediaTypeHeaderValue)null)!);
var content = new StringContent(sourceString, defaultStringEncoding, (MediaTypeHeaderValue)null);

// If no media header value is passed-in, there is none
Assert.Null(content.Headers.ContentType);
Expand Down
Loading