Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PackageVersion Include="AMQPNetLite.Serialization" Version="2.5.1" />
<PackageVersion Include="Apache.Avro" Version="1.12.1" />
<PackageVersion Include="Confluent.Kafka" Version="2.14.0" />
<PackageVersion Include="System.Buffers" Version="4.6.1" />
<PackageVersion Include="Google.Protobuf" Version="3.34.1" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="5.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net8.0</TargetFrameworks>
<Description>JSON support for the CNCF CloudEvents SDK, based on System.Text.Json.</Description>
<PackageTags>cncf;cloudnative;cloudevents;events;json;systemtextjson</PackageTags>
<Nullable>enable</Nullable>
Expand Down
34 changes: 24 additions & 10 deletions src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using CloudNative.CloudEvents.Core;
using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.Net.Mime;
Expand Down Expand Up @@ -410,33 +411,33 @@ public override ReadOnlyMemory<byte> EncodeBatchModeMessage(IEnumerable<CloudEve
CharSet = Encoding.UTF8.WebName
};

var stream = new MemoryStream();
var writer = CreateUtf8JsonWriter(stream);
var bufferWriter = new ArrayBufferWriter<byte>();
var writer = CreateUtf8JsonWriter(bufferWriter);
writer.WriteStartArray();
foreach (var cloudEvent in cloudEvents)
{
WriteCloudEventForBatchOrStructuredMode(writer, cloudEvent);
}
writer.WriteEndArray();
writer.Flush();
return stream.ToArray();
return bufferWriter.WrittenMemory;
}

/// <inheritdoc />
public override ReadOnlyMemory<byte> EncodeStructuredModeMessage(CloudEvent cloudEvent, out ContentType contentType)
{
contentType = new ContentType(StructuredMediaType)
{
CharSet = Encoding.UTF8.WebName
};
contentType = new ContentType(StructuredMediaType) { CharSet = Encoding.UTF8.WebName };

var bufferWriter = new ArrayBufferWriter<byte>();
using var writer = CreateUtf8JsonWriter(bufferWriter);

var stream = new MemoryStream();
var writer = CreateUtf8JsonWriter(stream);
WriteCloudEventForBatchOrStructuredMode(writer, cloudEvent);
writer.Flush();
return stream.ToArray();

return bufferWriter.WrittenMemory;
}


/// <summary>
/// Converts the given <see cref="CloudEvent"/> to a <see cref="JsonElement"/> containing the structured mode JSON format representation
/// of the event.
Expand Down Expand Up @@ -470,6 +471,19 @@ private Utf8JsonWriter CreateUtf8JsonWriter(Stream stream)
return new Utf8JsonWriter(stream, options);
}

private Utf8JsonWriter CreateUtf8JsonWriter(IBufferWriter<byte> bufferWriter)
{
var options = new JsonWriterOptions
{
Encoder = SerializerOptions?.Encoder,
Indented = SerializerOptions?.WriteIndented ?? false,
// TODO: Consider skipping validation in the future for the sake of performance.
SkipValidation = false
};

return new Utf8JsonWriter(bufferWriter, options);
}

private void WriteCloudEventForBatchOrStructuredMode(Utf8JsonWriter writer, CloudEvent cloudEvent)
{
Validation.CheckCloudEventArgument(cloudEvent, nameof(cloudEvent));
Expand Down
1 change: 1 addition & 0 deletions src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.Memory" Condition="'$(TargetFramework)'=='netstandard2.0'" />
<!-- Source-only package with nullable reference annotations. -->
<PackageReference Include="Nullable" PrivateAssets="All" />
Expand Down
Loading