update newtonsoft json serialization

TheEightBot · Sep 1, 2021 · a6150e8 · a6150e8
1 parent daefaa2
commit a6150e8
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/Tycho.NewtonsoftJson/NewtonsoftJsonSerializer.cs b/Tycho.NewtonsoftJson/NewtonsoftJsonSerializer.cs
@@ -9,9 +9,8 @@ namespace Tycho
     public class NewtonsoftJsonSerializer : IJsonSerializer
     {
         private readonly JsonSerializer _jsonSerializer;
-        private readonly JsonSerializerSettings _jsonSerializerSettings;
 
-        public NewtonsoftJsonSerializer (JsonSerializer jsonSerializer = null, JsonSerializerSettings jsonSerializerSettings = null)
+        public NewtonsoftJsonSerializer (JsonSerializer jsonSerializer = null)
         {
             _jsonSerializer =
                 jsonSerializer ??
@@ -20,14 +19,6 @@ public NewtonsoftJsonSerializer (JsonSerializer jsonSerializer = null, JsonSeria
                     DefaultValueHandling = DefaultValueHandling.Include,
                     NullValueHandling = NullValueHandling.Ignore,
                 };
-
-            _jsonSerializerSettings =
-                jsonSerializerSettings ??
-                new JsonSerializerSettings
-                {
-                    DefaultValueHandling = DefaultValueHandling.Include,
-                    NullValueHandling = NullValueHandling.Ignore,
-                };
         }
 
 
@@ -40,7 +31,16 @@ public ValueTask<T> DeserializeAsync<T> (Stream stream, CancellationToken cancel
 
         public object Serialize<T> (T obj)
         {
-            return JsonConvert.SerializeObject (obj, _jsonSerializerSettings);
+            using var stream = new MemoryStream();
+            using var writer = new StreamWriter(stream);
+            using var jsonWriter = new JsonTextWriter(writer);
+
+            _jsonSerializer.Serialize(jsonWriter, obj);
+
+            jsonWriter.Flush();
+            stream.Position = 0;
+
+            return stream.ToArray();
         }
 
         public override string ToString () => nameof (NewtonsoftJsonSerializer);