Cleanup

Author: javiercn

src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointProperty.cs

@@ -16,6 +16,8 @@ public struct StaticWebAssetEndpointProperty : IComparable<StaticWebAssetEndpoin
     private static readonly JsonTypeInfo<StaticWebAssetEndpointProperty[]> _jsonTypeInfo =
         StaticWebAssetsJsonSerializerContext.Default.StaticWebAssetEndpointPropertyArray;
 
+    private static readonly Encoding _encoder = Encoding.UTF8;
+
     // Pre-encoded property names for high-performance serialization
     private static readonly JsonEncodedText NamePropertyName = JsonEncodedText.Encode("Name");
     private static readonly JsonEncodedText ValuePropertyName = JsonEncodedText.Encode("Value");
@@ -35,12 +37,12 @@ public static void PopulateFromMetadataValue(string value, List<StaticWebAssetEn
 
         // Use stack allocation to avoid heap allocation for the UTF-8 bytes on modern frameworks
 #if NET6_0_OR_GREATER
-        var maxByteCount = System.Text.Encoding.UTF8.GetMaxByteCount(value.Length);
+        var maxByteCount = _encoder.GetMaxByteCount(value.Length);
         Span<byte> bytes = stackalloc byte[maxByteCount];
-        var actualByteCount = System.Text.Encoding.UTF8.GetBytes(value, bytes);
+        var actualByteCount = _encoder.GetBytes(value, bytes);
         var reader = new Utf8JsonReader(bytes.Slice(0, actualByteCount));
 #else
-        var bytes = System.Text.Encoding.UTF8.GetBytes(value);
+        var bytes = _encoder.GetBytes(value);
         var reader = new Utf8JsonReader(bytes);
 #endif
 
@@ -101,28 +103,19 @@ internal static string ToMetadataValue(
         var (buffer, writer) = context;
 
         writer.WriteStartArray();
-        foreach (var property in properties)
+        for (int i = 0; i < properties.Count; i++)
         {
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(NamePropertyName);
+            var property = properties[i];
+            writer.WriteStartObject(NamePropertyName);
             writer.WriteStringValue(property.Name);
-
             writer.WritePropertyName(ValuePropertyName);
             writer.WriteStringValue(property.Value);
-
             writer.WriteEndObject();
         }
         writer.WriteEndArray();
         writer.Flush();
-
-#if !NET6_0_OR_GREATER
-        var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#else
         var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#endif
+        return _encoder.GetString(array, 0, count);
     }
 
     internal static JsonWriterContext CreateWriter()

src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointResponseHeader.cs

@@ -16,6 +16,8 @@ public struct StaticWebAssetEndpointResponseHeader : IEquatable<StaticWebAssetEn
     private static readonly JsonTypeInfo<StaticWebAssetEndpointResponseHeader[]> _jsonTypeInfo =
         StaticWebAssetsJsonSerializerContext.Default.StaticWebAssetEndpointResponseHeaderArray;
 
+    private static readonly Encoding _encoder = Encoding.UTF8;
+
     // Pre-encoded property names for high-performance serialization
     private static readonly JsonEncodedText NamePropertyName = JsonEncodedText.Encode("Name");
     private static readonly JsonEncodedText ValuePropertyName = JsonEncodedText.Encode("Value");
@@ -104,34 +106,24 @@ internal static string ToMetadataValue(
         var (buffer, writer) = context;
 
         writer.WriteStartArray();
-        foreach (var header in headers)
+        for (int i = 0; i < headers.Count; i++)
         {
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(NamePropertyName);
+            var header = headers[i];
+            writer.WriteStartObject(NamePropertyName);
             writer.WriteStringValue(header.Name);
-
             writer.WritePropertyName(ValuePropertyName);
             writer.WriteStringValue(header.Value);
-
             writer.WriteEndObject();
         }
         writer.WriteEndArray();
         writer.Flush();
-
-#if !NET6_0_OR_GREATER
         var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#else
-        var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#endif
+        return _encoder.GetString(array, 0, count);
     }
 
     internal static JsonWriterContext CreateWriter()
     {
         var context = new JsonWriterContext();
-        context.Reset();
         return context;
     }
 

src/StaticWebAssetsSdk/Tasks/Data/StaticWebAssetEndpointSelector.cs

@@ -16,6 +16,8 @@ public struct StaticWebAssetEndpointSelector : IEquatable<StaticWebAssetEndpoint
     private static readonly JsonTypeInfo<StaticWebAssetEndpointSelector[]> _jsonTypeInfo =
         StaticWebAssetsJsonSerializerContext.Default.StaticWebAssetEndpointSelectorArray;
 
+    private static readonly Encoding _encoder = Encoding.UTF8;
+
     // Pre-encoded property names for high-performance serialization
     private static readonly JsonEncodedText NamePropertyName = JsonEncodedText.Encode("Name");
     private static readonly JsonEncodedText ValuePropertyName = JsonEncodedText.Encode("Value");
@@ -111,31 +113,22 @@ internal static string ToMetadataValue(
         var (buffer, writer) = context;
 
         writer.WriteStartArray();
-        foreach (var selector in selectors)
+        for (int i = 0; i < selectors.Count; i++)
         {
-            writer.WriteStartObject();
-
-            writer.WritePropertyName(NamePropertyName);
+            var selector = selectors[i];
+            writer.WriteStartObject(NamePropertyName);
             writer.WriteStringValue(selector.Name);
-
             writer.WritePropertyName(ValuePropertyName);
             writer.WriteStringValue(selector.Value);
-
             writer.WritePropertyName(QualityPropertyName);
             writer.WriteStringValue(selector.Quality);
-
             writer.WriteEndObject();
         }
         writer.WriteEndArray();
         writer.Flush();
 
-#if !NET6_0_OR_GREATER
-        var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#else
         var (array, count) = buffer.GetArray();
-        return System.Text.Encoding.UTF8.GetString(array, 0, count);
-#endif
+        return _encoder.GetString(array, 0, count);
     }
 
     internal static JsonWriterContext CreateWriter()

src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointPropertyBenchmarks.cs

@@ -3,8 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
-using System.Buffers;
-using System.Text.Json;
+using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
@@ -16,17 +15,15 @@ public class StaticWebAssetEndpointPropertyBenchmarks
     private readonly List<StaticWebAssetEndpointProperty> _properties = [];
     private readonly StaticWebAssetEndpointProperty[] _propertiesArray;
     private readonly List<StaticWebAssetEndpointProperty> _propertiesList;
-
-    private readonly PooledArrayBufferWriter<byte> _buffer;
-
-    private readonly Utf8JsonWriter _writer;
+    private readonly JsonWriterContext _context;
 
     public StaticWebAssetEndpointPropertyBenchmarks()
     {
         // Initialize test data for ToMetadataValue benchmarks
         _propertiesArray = StaticWebAssetEndpointProperty.FromMetadataValue(TestValue);
         _propertiesList = new List<StaticWebAssetEndpointProperty>(_propertiesArray);
-        (_buffer, _writer) = StaticWebAssetEndpointProperty.CreateWriter();
+        _context = StaticWebAssetEndpointProperty.CreateWriter();
+        _context.Reset();
     }
 
     [Benchmark]
@@ -52,7 +49,6 @@ public string ToMetadataValue_Current()
     [Benchmark]
     public string ToMetadataValue_New()
     {
-        _buffer.Clear();
-        return StaticWebAssetEndpointProperty.ToMetadataValue(_propertiesList, _buffer, _writer);
+        return StaticWebAssetEndpointProperty.ToMetadataValue(_propertiesList, _context);
     }
 }

src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointResponseHeaderBenchmarks.cs

@@ -3,6 +3,7 @@
 
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
+using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
 
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
@@ -14,14 +15,15 @@ public class StaticWebAssetEndpointResponseHeaderBenchmarks
     private readonly List<StaticWebAssetEndpointResponseHeader> _headers = [];
     private readonly StaticWebAssetEndpointResponseHeader[] _headersArray;
     private readonly List<StaticWebAssetEndpointResponseHeader> _headersList;
-    private readonly StaticWebAssetEndpointResponseHeader.JsonWriterContext _context;
+    private readonly JsonWriterContext _context;
 
     public StaticWebAssetEndpointResponseHeaderBenchmarks()
     {
         // Initialize test data for ToMetadataValue benchmarks
         _headersArray = StaticWebAssetEndpointResponseHeader.FromMetadataValue(TestValue);
         _headersList = new List<StaticWebAssetEndpointResponseHeader>(_headersArray);
         _context = StaticWebAssetEndpointResponseHeader.CreateWriter();
+        _context.Reset();
     }
 
     [Benchmark]

src/StaticWebAssetsSdk/benchmarks/StaticWebAssetEndpointSelectorBenchmarks.cs

@@ -4,6 +4,8 @@
 using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.StaticWebAssets.Tasks;
 
+using Microsoft.NET.Sdk.StaticWebAssets.Tasks.Utils;
+
 namespace Microsoft.NET.Sdk.StaticWebAssets.Benchmarks;
 
 [MemoryDiagnoser]
@@ -14,14 +16,15 @@ public class StaticWebAssetEndpointSelectorBenchmarks
     private readonly List<StaticWebAssetEndpointSelector> _selectors = [];
     private readonly StaticWebAssetEndpointSelector[] _selectorsArray;
     private readonly List<StaticWebAssetEndpointSelector> _selectorsList;
-    private readonly StaticWebAssetEndpointSelector.JsonWriterContext _context;
+    private readonly JsonWriterContext _context;
 
     public StaticWebAssetEndpointSelectorBenchmarks()
     {
         // Initialize test data for ToMetadataValue benchmarks
         _selectorsArray = StaticWebAssetEndpointSelector.FromMetadataValue(TestValue);
         _selectorsList = new List<StaticWebAssetEndpointSelector>(_selectorsArray);
         _context = StaticWebAssetEndpointSelector.CreateWriter();
+        _context.Reset();
     }
 
     [Benchmark]