No json.net

sillsdev · Oct 6, 2023 · dae1c7d · dae1c7d
1 parent e09ae39
commit dae1c7d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/Serval.Shared/Usings.cs b/src/Serval.Shared/Usings.cs
@@ -1,5 +1,7 @@
 global using Grpc.Core;
 global using Grpc.Net.ClientFactory;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;

diff --git a/src/Serval.Shared/Utils/ObjectToInferredTypesConverter.cs b/src/Serval.Shared/Utils/ObjectToInferredTypesConverter.cs
@@ -0,0 +1,17 @@
+public class ObjectToInferredTypesConverter : JsonConverter<object>
+{
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
+        reader.TokenType switch
+        {
+            JsonTokenType.True => true,
+            JsonTokenType.False => false,
+            JsonTokenType.Number when reader.TryGetInt64(out long l) => l,
+            JsonTokenType.Number => reader.GetDouble(),
+            JsonTokenType.String when reader.TryGetDateTime(out DateTime datetime) => datetime,
+            JsonTokenType.String => reader.GetString()!,
+            _ => JsonDocument.ParseValue(ref reader).RootElement.Clone()
+        };
+
+    public override void Write(Utf8JsonWriter writer, object objectToWrite, JsonSerializerOptions options) =>
+        JsonSerializer.Serialize(writer, objectToWrite, objectToWrite.GetType(), options);
+}
diff --git a/src/Serval.Translation/Controllers/TranslationEnginesController.cs b/src/Serval.Translation/Controllers/TranslationEnginesController.cs
@@ -984,7 +984,12 @@ private static Build Map(Engine engine, TranslationBuildConfigDto source)
         }
         try
         {
-            build.Options = JsonConvert.DeserializeObject<IDictionary<string, object>>(source.Options ?? "{}");
+            var jsonSerializerOptions = new JsonSerializerOptions();
+            jsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter());
+            build.Options = JsonSerializer.Deserialize<IDictionary<string, object>>(
+                source.Options ?? "{}",
+                jsonSerializerOptions
+            );
         }
         catch (Exception e)
         {
@@ -1029,7 +1034,7 @@ private TranslationBuildDto Map(Build source)
             Message = source.Message,
             State = source.State,
             DateFinished = source.DateFinished,
-            Options = JsonConvert.SerializeObject(source.Options)
+            Options = JsonSerializer.Serialize(source.Options)
         };
     }
 

diff --git a/src/Serval.Translation/Usings.cs b/src/Serval.Translation/Usings.cs
@@ -1,6 +1,5 @@
 global using System.Diagnostics.CodeAnalysis;
 global using System.Linq.Expressions;
-global using System.Text.Json.Nodes;
 global using Asp.Versioning;
 global using Grpc.Core;
 global using Grpc.Net.ClientFactory;
@@ -11,7 +10,6 @@
 global using Microsoft.AspNetCore.Routing;
 global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.Options;
-global using Newtonsoft.Json;
 global using NSwag.Annotations;
 global using Serval.Shared.Configuration;
 global using Serval.Shared.Contracts;
@@ -25,3 +23,4 @@
 global using Serval.Translation.Models;
 global using Serval.Translation.Services;
 global using SIL.DataAccess;
+global using System.Text.Json;