change JToken.WriteTo converters parameter to params IList<JsonConverter> (#359)

Author: SimonCropp

.gitignore

@@ -6,4 +6,5 @@ obj/
 *.DotSettings.user
 .idea/
 *.received.*
-nugets/
+nugets/
+/BenchmarkDotNet.Artifacts

src/Argon/Linq/JArray.cs

@@ -174,7 +174,7 @@ internal override JToken CloneToken() =>
     /// </summary>
     [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)]
     [RequiresDynamicCode(MiscellaneousUtils.AotWarning)]
-    public override void WriteTo(JsonWriter writer, params JsonConverter[] converters)
+    public override void WriteTo(JsonWriter writer, params IList<JsonConverter> converters)
     {
         writer.WriteStartArray();
 

src/Argon/Linq/JObject.cs

@@ -349,7 +349,7 @@ public JToken? this[string propertyName]
     /// </summary>
     [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)]
     [RequiresDynamicCode(MiscellaneousUtils.AotWarning)]
-    public override void WriteTo(JsonWriter writer, params JsonConverter[] converters)
+    public override void WriteTo(JsonWriter writer, params IList<JsonConverter> converters)
     {
         writer.WriteStartObject();
 

src/Argon/Linq/JProperty.cs

@@ -250,7 +250,7 @@ public JProperty(string name, object? content)
     /// </summary>
     [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)]
     [RequiresDynamicCode(MiscellaneousUtils.AotWarning)]
-    public override void WriteTo(JsonWriter writer, params JsonConverter[] converters)
+    public override void WriteTo(JsonWriter writer, params IList<JsonConverter> converters)
     {
         writer.WritePropertyName(Name);
 

src/Argon/Linq/JToken.cs

@@ -419,21 +419,21 @@ public void Replace(JToken value)
     [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "WriteTo without converters is safe.")]
     [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "WriteTo without converters is safe.")]
     public void WriteTo(JsonWriter writer) =>
-        WriteTo(writer, CollectionUtils.ArrayEmpty<JsonConverter>());
+        WriteTo(writer, []);
 
     /// <summary>
     /// Writes this token to a <see cref="JsonWriter" />.
     /// </summary>
     [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)]
     [RequiresDynamicCode(MiscellaneousUtils.AotWarning)]
-    public abstract void WriteTo(JsonWriter writer, params JsonConverter[] converters);
+    public abstract void WriteTo(JsonWriter writer, params IList<JsonConverter> converters);
 
     /// <summary>
     /// Returns the indented JSON for this token.
     /// </summary>
     /// <remarks>
     /// <c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="JTokenType.String" />.
-    /// If you want the JSON for all token types then you should use <see cref="WriteTo(JsonWriter, JsonConverter[])" />.
+    /// If you want the JSON for all token types then you should use <see cref="WriteTo(JsonWriter, IList{JsonConverter})" />.
     /// </remarks>
     /// <returns>
     /// The indented JSON for this token.
@@ -2070,4 +2070,4 @@ object ICloneable.Clone() =>
     /// <returns>A new instance of the <see cref="JToken" />.</returns>
     public JToken DeepClone() =>
         CloneToken();
-}
+}

src/Argon/Linq/JValue.cs

@@ -657,9 +657,9 @@ public object? Value
     /// <param name="converters">A collection of <see cref="JsonConverter" />s which will be used when writing the token.</param>
     [RequiresUnreferencedCode(MiscellaneousUtils.TrimWarning)]
     [RequiresDynamicCode(MiscellaneousUtils.AotWarning)]
-    public override void WriteTo(JsonWriter writer, params JsonConverter[] converters)
+    public override void WriteTo(JsonWriter writer, params IList<JsonConverter> converters)
     {
-        if (converters is {Length: > 0} && value != null)
+        if (converters.Count > 0 && value != null)
         {
             var matchingConverter = JsonSerializer.GetMatchingConverter(converters, value.GetType());
             if (matchingConverter is {CanWrite: true})
@@ -819,7 +819,7 @@ public override int GetHashCode()
     /// </summary>
     /// <remarks>
     /// <c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="JTokenType.String" />.
-    /// If you want the JSON for all token types then you should use <see cref="WriteTo(JsonWriter, JsonConverter[])" />.
+    /// If you want the JSON for all token types then you should use <see cref="WriteTo(JsonWriter, IList{JsonConverter})" />.
     /// </remarks>
     /// <returns>
     /// A <see cref="String" /> that represents this instance.

src/Argon/Serialization/JsonSerializerInternalWriter.cs

@@ -158,7 +158,7 @@ void SerializeValue(JsonWriter writer, object? value, JsonContract? valueContrac
             case JsonContractType.Linq:
                 var token = (JToken) value;
                 OnSerializing(writer, token);
-                token.WriteTo(writer, Serializer.Converters.ToArray());
+                token.WriteTo(writer, Serializer.Converters);
                 OnSerialized(writer, token);
                 break;
         }

src/ArgonTests/Benchmarks/SerializeJTokenList.cs

@@ -0,0 +1,53 @@
+// Copyright (c) 2007 James Newton-King. All rights reserved.
+// Use of this source code is governed by The MIT License,
+// as found in the license.md file.
+
+using BenchmarkDotNet.Attributes;
+
+[MemoryDiagnoser]
+public class SerializeJTokenList
+{
+    List<JObject> tokens = null!;
+    JsonSerializer defaultSerializer = null!;
+    JsonSerializer serializerWithConverters = null!;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        tokens = [];
+        for (var i = 0; i < 100; i++)
+        {
+            tokens.Add(new JObject
+            {
+                ["id"] = i,
+                ["name"] = $"item-{i}",
+                ["active"] = i % 2 == 0,
+                ["score"] = i * 1.5
+            });
+        }
+
+        defaultSerializer = JsonSerializer.CreateDefault();
+
+        serializerWithConverters = JsonSerializer.CreateDefault();
+        serializerWithConverters.Converters.Add(new StringEnumConverter());
+        serializerWithConverters.Converters.Add(new IsoDateTimeConverter());
+    }
+
+    [Benchmark]
+    public string NoConverters()
+    {
+        using var stringWriter = new StringWriter();
+        using var jsonWriter = new JsonTextWriter(stringWriter);
+        defaultSerializer.Serialize(jsonWriter, tokens);
+        return stringWriter.ToString();
+    }
+
+    [Benchmark]
+    public string WithConverters()
+    {
+        using var stringWriter = new StringWriter();
+        using var jsonWriter = new JsonTextWriter(stringWriter);
+        serializerWithConverters.Serialize(jsonWriter, tokens);
+        return stringWriter.ToString();
+    }
+}

src/Benchmark.Tests/Program.cs

@@ -6,11 +6,19 @@
 
 public class Program
 {
-    public static void Main()
+    public static void Main(string[] args)
     {
         var attribute = (AssemblyFileVersionAttribute)typeof(JsonConvert).Assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute))!;
         Console.WriteLine($"Json.NET Version: {attribute.Version}");
 
-        new BenchmarkSwitcher([typeof(WriteEscapedJavaScriptString)]).Run([ "*" ]);
+        var switcher = new BenchmarkSwitcher([typeof(WriteEscapedJavaScriptString), typeof(SerializeJTokenList)]);
+        if (args.Length == 0)
+        {
+            switcher.Run(["*"]);
+        }
+        else
+        {
+            switcher.Run(args);
+        }
     }
 }