Skip to content

Use TranscodingStream for converting to UTF-8 #342

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

Open
erwinkramer wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −7
Open

Use TranscodingStream for converting to UTF-8 #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,23 @@ private async Task<IReadOnlyList<CloudEvent>> DecodeBatchModeMessageImpl(Stream
private async Task<JsonDocument> ReadDocumentAsync(Stream data, ContentType? contentType, bool async)
{
var encoding = MimeUtilities.GetEncoding(contentType);
if (encoding is UTF8Encoding)
{
return async
? await JsonDocument.ParseAsync(data, DocumentOptions).ConfigureAwait(false)
: JsonDocument.Parse(data, DocumentOptions);
}
else
if (encoding is not UTF8Encoding)
{
#if NET5_0_OR_GREATER
data = Encoding.CreateTranscodingStream(data, encoding, Encoding.UTF8);
#else
using var reader = new StreamReader(data, encoding);
var json = async
? await reader.ReadToEndAsync().ConfigureAwait(false)
: reader.ReadToEnd();

return JsonDocument.Parse(json, DocumentOptions);
#endif
}

return async
? await JsonDocument.ParseAsync(data, DocumentOptions).ConfigureAwait(false)
: JsonDocument.Parse(data, DocumentOptions);
}

private CloudEvent DecodeJsonElement(JsonElement element, IEnumerable<CloudEventAttribute>? extensionAttributes, string paramName)
Expand Down