change ycs to use system.text.json instead of newtonsoft json

sillsdev · Nov 13, 2024 · 0e33804 · 0e33804
1 parent 1a41180
commit 0e33804
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/src/Ycs/Structs/ContentJson.cs b/src/Ycs/Structs/ContentJson.cs
@@ -4,22 +4,26 @@
 //  </copyright>
 // ------------------------------------------------------------------------------
 
+using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 namespace Ycs
 {
     public class ContentJson : IContentEx
     {
         internal const int _ref = 2;
 
-        private readonly List<object> _content;
+        private readonly List<JsonNode> _content;
 
-        internal ContentJson(IEnumerable<object> data)
+        internal ContentJson(IEnumerable<JsonNode> data)
         {
-            _content = new List<object>(data);
+            _content = new List<JsonNode>(data);
         }
 
-        private ContentJson(List<object> other)
+        private ContentJson(List<JsonNode> other)
         {
             _content = other;
         }
@@ -29,7 +33,7 @@ private ContentJson(List<object> other)
         public bool Countable => true;
         public int Length => _content?.Count ?? 0;
 
-        public IReadOnlyList<object> GetContent() => _content.AsReadOnly();
+        public IReadOnlyList<object> GetContent() => new ReadOnlyCollection<object>(_content.OfType<object>().ToList());
 
         public IContent Copy() => new ContentJson(_content);
 
@@ -68,22 +72,22 @@ void IContentEx.Write(IUpdateEncoder encoder, int offset)
             encoder.WriteLength(len);
             for (int i = offset; i < len; i++)
             {
-                var jsonStr = Newtonsoft.Json.JsonConvert.SerializeObject(_content[i]);
+                var jsonStr = JsonSerializer.Serialize(_content[i]);
                 encoder.WriteString(jsonStr);
             }
         }
 
         internal static ContentJson Read(IUpdateDecoder decoder)
         {
             var len = decoder.ReadLength();
-            var content = new List<object>(len);
+            var content = new List<JsonNode>(len);
 
             for (int i = 0; i < len; i++)
             {
                 var jsonStr = decoder.ReadString();
-                object jsonObj = string.Equals(jsonStr, "undefined")
+                JsonNode jsonObj = string.Equals(jsonStr, "undefined")
                     ? null
-                    : Newtonsoft.Json.JsonConvert.DeserializeObject(jsonStr);
+                    : JsonSerializer.Deserialize<JsonNode>(jsonStr);
                 content.Add(jsonObj);
             }
 

diff --git a/src/Ycs/Utils/UpdateDecoderV2.cs b/src/Ycs/Utils/UpdateDecoderV2.cs
@@ -5,6 +5,8 @@
 // ------------------------------------------------------------------------------
 
 using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
 namespace Ycs
 {
@@ -197,7 +199,7 @@ public object ReadJson()
             CheckDisposed();
 
             var jsonString = Reader.ReadVarString();
-            var result = Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString);
+            var result = JsonSerializer.Deserialize<JsonNode>(jsonString);
             return result;
         }
 

diff --git a/src/Ycs/Utils/UpdateEncoderV2.cs b/src/Ycs/Utils/UpdateEncoderV2.cs
@@ -5,6 +5,7 @@
 // ------------------------------------------------------------------------------
 
 using System.Diagnostics;
+using System.Text.Json;
 
 namespace Ycs
 {
@@ -201,7 +202,7 @@ public void WriteKey(string key)
 
         public void WriteJson<T>(T any)
         {
-            var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(any, typeof(T), null);
+            var jsonString = JsonSerializer.Serialize(any);
             RestWriter.WriteVarString(jsonString);
         }
 

diff --git a/src/Ycs/Ycs.csproj b/src/Ycs/Ycs.csproj
@@ -15,7 +15,7 @@
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>