Skip to content

If ByteArrayDeserializer gets an empty array, return null instead of calling Activator.CreateInstance #70

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
twogood merged 8 commits into from
Oct 19, 2025
Merged

If ByteArrayDeserializer gets an empty array, return null instead of calling Activator.CreateInstance #70

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b4f71f
If ByteArrayDeserializer gets an empty array, return null instead of …
twogood May 29, 2025
b7bab77
Merge branch 'main' into fix-22
twogood May 29, 2025
d9e1873
Merge remote-tracking branch 'origin/main' into fix-22
twogood Oct 18, 2025
8aed99f
Add clarifying comment
twogood Oct 18, 2025
b6617a3
Merge branch 'main' into fix-22
twogood Oct 18, 2025
8f66dee
Refactor to return bytes directly if possible
twogood Oct 18, 2025
10cf449
Merge branch 'fix-22' of github.com:twogood/Activout.RestClient into …
twogood Oct 18, 2025
b77ff77
Improve exception message
twogood Oct 19, 2025
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
35 changes: 35 additions & 0 deletions Activout.RestClient.Test/NonJsonRestClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,24 @@ public async Task TestGetByteArray()
Assert.Equal(new byte[] { 42 }, bytes);
}

[Fact]
public async Task TestGetEmptyByteArray()
{
// arrange
_mockHttp
.When($"{BaseUri}/movies/bytes")
.Respond(new ByteArrayContent(new byte[0]));

var reviewSvc = CreateMovieReviewService();

// act
var bytes = await reviewSvc.GetByteArray();

// assert
Assert.NotNull(bytes);
Assert.Empty(bytes);
}

[Fact]
public async Task TestGetByteArrayObject()
{
Expand All @@ -246,6 +264,23 @@ public async Task TestGetByteArrayObject()
Assert.Equal(new byte[] { 42 }, byteArrayObject.Bytes);
}

[Fact]
public async Task TestGetByteArrayObjectWithEmptyArray()
{
// arrange
_mockHttp
.When($"{BaseUri}/movies/byte-object")
.Respond(new ByteArrayContent(new byte[0]));

var reviewSvc = CreateMovieReviewService();

// act
var byteArrayObject = await reviewSvc.GetByteArrayObject();

// assert
Assert.Null(byteArrayObject);
}

[Fact]
public async Task TestGetString()
{
Expand Down
15 changes: 12 additions & 3 deletions Activout.RestClient/Serialization/Implementation/ByteArrayDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,19 @@ internal class ByteArrayDeserializer : IDeserializer
public async Task<object> Deserialize(HttpContent content, Type type)
{
var bytes = await content.ReadAsByteArrayAsync();
if (type == typeof(byte[]))
{
return bytes;
}

return type == typeof(byte[])
? bytes
: Activator.CreateInstance(type, bytes);
if (type.IsValueType)
{
throw new InvalidOperationException(
$"Cannot deserialize empty application/octet-stream to value type '{type.FullName}'.");
}

// If the byte array is empty, do not try to create an object
return bytes.Length == 0 ? null : Activator.CreateInstance(type, bytes);
}

public bool CanDeserialize(MediaType mediaType)
Expand Down
Loading