From 17ac32194b0608d1fc8d944c68c401b2723220d0 Mon Sep 17 00:00:00 2001
From: Erwin <erwinkramer@hotmail.com>
Date: Fri, 10 Apr 2026 10:37:35 +0200
Subject: [PATCH] ArrayBufferWriter

Signed-off-by: Erwin <erwinkramer@hotmail.com>
---
 Directory.Packages.props                      |  1 +
 ...udNative.CloudEvents.SystemTextJson.csproj |  2 +-
 .../JsonEventFormatter.cs                     | 34 +++++++++++++------
 .../CloudNative.CloudEvents.csproj            |  1 +
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 42b8c4b..78e9043 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -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" />
diff --git a/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj b/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj
index dde18c8..077c8d5 100644
--- a/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj
+++ b/src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj
@@ -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>
diff --git a/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs b/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
index e170bd2..853802e 100644
--- a/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
+++ b/src/CloudNative.CloudEvents.SystemTextJson/JsonEventFormatter.cs
@@ -4,6 +4,7 @@
 
 using CloudNative.CloudEvents.Core;
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Mime;
@@ -410,8 +411,8 @@ 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)
         {
@@ -419,24 +420,24 @@ public override ReadOnlyMemory<byte> EncodeBatchModeMessage(IEnumerable<CloudEve
         }
         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.
@@ -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));
diff --git a/src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj b/src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj
index aa85f9b..0c08995 100644
--- a/src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj
+++ b/src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj
@@ -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" />