Fix System.Object serialization with custom number handling (#62020)

* Fix System.Object serialization with custom number handling * fix typos
dotnet · Nov 30, 2021 · fe68bf8 · fe68bf8
1 parent cc7b99b
commit fe68bf8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/...s/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs b/...s/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
@@ -7,11 +7,6 @@ namespace System.Text.Json.Serialization.Converters
 {
     internal sealed class ObjectConverter : JsonConverter<object?>
     {
-        public ObjectConverter()
-        {
-            IsInternalConverterForNumberType = true;
-        }
-
         public override object? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (options.UnknownTypeHandling == JsonUnknownTypeHandling.JsonElement)
@@ -50,15 +45,5 @@ internal override void WriteAsPropertyNameCore(Utf8JsonWriter writer, object? va
 
             runtimeConverter.WriteAsPropertyNameCoreAsObject(writer, value, options, isWritingExtensionDataProperty);
         }
-
-        internal override object? ReadNumberWithCustomHandling(ref Utf8JsonReader reader, JsonNumberHandling handling, JsonSerializerOptions options)
-        {
-            if (options.UnknownTypeHandling == JsonUnknownTypeHandling.JsonElement)
-            {
-                return JsonElement.ParseValue(ref reader);
-            }
-
-            return JsonNodeConverter.Instance.Read(ref reader, typeof(object), options);
-        }
     }
 }
diff --git a/...libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Object.ReadTests.cs b/...libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Object.ReadTests.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Text.Json.Nodes;
 using Xunit;
 
 namespace System.Text.Json.Serialization.Tests
@@ -655,5 +656,21 @@ public static void TooLittleJsonFails(string json)
 
             Assert.Equal(0, reader.BytesConsumed);
         }
+
+        // Regression test for https://github.com/dotnet/runtime/issues/61995
+        [Theory]
+        [InlineData(JsonUnknownTypeHandling.JsonElement, typeof(JsonElement))]
+        [InlineData(JsonUnknownTypeHandling.JsonNode, typeof(JsonNode))]
+        public static void ReadObjectWithNumberHandling(JsonUnknownTypeHandling unknownTypeHandling, Type expectedType)
+        {
+            var options = new JsonSerializerOptions
+            {
+                NumberHandling = JsonNumberHandling.AllowReadingFromString,
+                UnknownTypeHandling = unknownTypeHandling
+            };
+
+            object result = JsonSerializer.Deserialize<object>(@"{ ""key"" : ""42"" }", options);
+            Assert.IsAssignableFrom(expectedType, result);
+        }
     }
 }
diff --git a/...ibraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Object.WriteTests.cs b/...ibraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/Object.WriteTests.cs
@@ -138,5 +138,13 @@ public static void EscapingShouldntStackOverflow()
 
             Assert.Equal("{\"name\":\"\u6D4B\u8A6611\"}", result);
         }
+
+        // Regression test for https://github.com/dotnet/runtime/issues/61995
+        [Fact]
+        public static void WriteObjectWithNumberHandling()
+        {
+            var options = new JsonSerializerOptions { NumberHandling = JsonNumberHandling.AllowReadingFromString };
+            JsonSerializer.Serialize(new object(), options);
+        }
     }
 }