Remove deprecated functionaliaty from the new SystemTextJson.FromJson methods (graphql-dotnet#2530)

Author: Shane32

src/GraphQL.SystemTextJson/StringExtensions.cs

@@ -25,13 +25,23 @@ public static class StringExtensions
             }
         };
 
+        private static readonly JsonSerializerOptions _jsonOptions2 = new JsonSerializerOptions
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            Converters =
+            {
+                new InputsConverter(),
+                new JsonConverterBigInteger(),
+            }
+        };
+
         /// <summary>
         /// Converts a JSON-formatted string into a dictionary.
         /// </summary>
         /// <param name="json">A JSON formatted string.</param>
         /// <returns>Inputs.</returns>
         public static Inputs ToInputs(this string json)
-            => json != null ? JsonSerializer.Deserialize<Inputs>(json, _jsonOptions) : Inputs.Empty;
+            => json != null ? JsonSerializer.Deserialize<Inputs>(json, _jsonOptions2) : Inputs.Empty;
 
         /// <summary>
         /// Converts a JSON-formatted string into a dictionary of objects of their actual type.
@@ -50,7 +60,7 @@ public static Dictionary<string, object> ToDictionary(this string json)
         /// Property names are converted to camel case and matched based on a case sensitive comparison (the default for System.Text.Json).
         /// </summary>
         public static T FromJson<T>(this string json)
-            => JsonSerializer.Deserialize<T>(json, _jsonOptions);
+            => JsonSerializer.Deserialize<T>(json, _jsonOptions2);
 
         /// <summary>
         /// Deserializes a JSON-formatted stream of data into the specified type.
@@ -60,7 +70,7 @@ public static T FromJson<T>(this string json)
         /// Property names are converted to camel case and matched based on a case sensitive comparison (the default for System.Text.Json).
         /// </summary>
         public static ValueTask<T> FromJsonAsync<T>(this System.IO.Stream stream, CancellationToken cancellationToken = default)
-            => JsonSerializer.DeserializeAsync<T>(stream, _jsonOptions, cancellationToken);
+            => JsonSerializer.DeserializeAsync<T>(stream, _jsonOptions2, cancellationToken);
 
         /// <summary>
         /// Converts a JSON element into an <see cref="Inputs"/> object.

src/GraphQL.Tests/Serialization/SystemTextJson/StringExtensionTests.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -62,45 +61,22 @@ public void StringToInputs()
             Verify(actual);
         }
 
-        [Fact]
-        public void FromJson()
-        {
-            var test = $"{{\"query\":\"hello\",\"variables\":{_exampleJson}}}";
-            var actual = test.FromJson<TestClass1>();
-            actual.query.ShouldBe("hello");
-            Verify(actual.variables);
-        }
-
         [Fact]
         public void FromJson_Null()
         {
             var test = $"{{\"query\":\"hello\",\"variables\":null}}";
-            var actual = test.FromJson<TestClass1>();
-            actual.query.ShouldBe("hello");
-            actual.variables.ShouldBeNull();
+            var actual = test.FromJson<TestClass3>();
+            actual.Query.ShouldBe("hello");
+            actual.Variables.ShouldBeNull();
         }
 
         [Fact]
         public void FromJson_Missing()
         {
             var test = $"{{\"query\":\"hello\"}}";
-            var actual = test.FromJson<TestClass1>();
-            actual.query.ShouldBe("hello");
-            actual.variables.ShouldBeNull();
-        }
-
-        [Fact]
-        public async Task FromJsonAsync()
-        {
-            var test = $"{{\"query\":\"hello\",\"variables\":{_exampleJson}}}";
-            var testData = new MemoryStream(Encoding.UTF8.GetBytes(test));
-            var actual = await testData.FromJsonAsync<TestClass1>();
-            actual.query.ShouldBe("hello");
-            Verify(actual.variables);
-            // verify that the stream has not been disposed
-            testData.ReadByte().ShouldBe(-1);
-            testData.Dispose();
-            Should.Throw<ObjectDisposedException>(() => testData.ReadByte());
+            var actual = test.FromJson<TestClass3>();
+            actual.Query.ShouldBe("hello");
+            actual.Variables.ShouldBeNull();
         }
 
         [Fact]
@@ -198,12 +174,6 @@ public void ToInputsReturnsEmptyForNull()
             ((string)null).ToInputs().ShouldNotBeNull().Count.ShouldBe(0);
         }
 
-        private class TestClass1
-        {
-            public string query { get; set; }
-            public Dictionary<string, object> variables { get; set; }
-        }
-
         private class TestClass2
         {
             public string Query { get; set; }