Merge pull request #293 from bobbyangers/dev-rangers-json

Example Proposal to remove depenency on Newtonsoft.Json

Author: vivet

.tests/GoogleApi.Test/AppSettings.cs

@@ -1,12 +1,12 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace GoogleApi.Test;
 
 public class AppSettings
 {
-    [JsonProperty("ApiKey")]
+    [JsonPropertyName("ApiKey")]
     public string ApiKey { get; set; }
 
-    [JsonProperty("SearchEngineId")]
+    [JsonPropertyName("SearchEngineId")]
     public string SearchEngineId { get; set; }
 }

.tests/GoogleApi.Test/Search/Web/WebSearchTests.cs

@@ -101,7 +101,7 @@ public void WebSearchTest()
         Assert.IsFalse(query.Filter);
         Assert.IsNull(query.GeoLocation);
         Assert.IsNull(query.CountryRestrict);
-        Assert.IsNull(query.Googlehost);
+        Assert.IsNull(query.GoogleHost);
         Assert.IsTrue(query.DisableCnTwTranslation);
         Assert.IsNull(query.AndTerms);
         Assert.AreEqual(Language.English, query.InterfaceLanguage);

.tests/GoogleApi.UnitTests/Common/Converters/BooleanConverterTest.cs

@@ -26,4 +26,8 @@
     <ProjectReference Include="..\..\GoogleApi\GoogleApi.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Common\Converters\" />
+  </ItemGroup>
+
 </Project>

.tests/GoogleApi.UnitTests/Common/Converters/StringEnumListConverterTest.cs

@@ -1,15 +1,22 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
 using AutoFixture;
+
 using GoogleApi.Entities;
+using GoogleApi.Entities.Common.Converters;
 using GoogleApi.Entities.Common.Enums;
 using GoogleApi.Entities.Interfaces;
 using GoogleApi.Exceptions;
+
+
 using NUnit.Framework;
+
 using RichardSzalay.MockHttp;
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace GoogleApi.UnitTests;
 
@@ -18,6 +25,16 @@ public sealed class HttpEngineTests
 {
     private const string APPLICATION_JSON = "application/json";
 
+    private static System.Text.Json.JsonSerializerOptions _options = new System.Text.Json.JsonSerializerOptions
+                    {
+                        PropertyNameCaseInsensitive = true,
+                        MaxDepth = 100,
+                        DefaultIgnoreCondition =  JsonIgnoreCondition.Always,
+                        Converters = { new BooleanJsonConverter(), new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) },
+                        ReferenceHandler = ReferenceHandler.Preserve,
+
+                    };
+
     private readonly IFixture fixture = new Fixture();
     private MockHttpMessageHandler mockHttpMessageHandler;
 
@@ -50,7 +67,7 @@ public void QueryWhenOkTest()
             status = "OK",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -79,7 +96,7 @@ public async Task QueryAsyncWhenOkTest()
             status = "OK",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -108,7 +125,7 @@ public async Task QueryPostWhenOk()
             status = "OK",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -160,7 +177,7 @@ public async Task QueryWhenNotFound()
             status = "NOT_FOUND",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -189,7 +206,7 @@ public async Task QueryWhenZeroResults()
             status = "ZERO_RESULTS",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -218,7 +235,7 @@ public void QueryWhenOverLimit()
             status = "OVER_QUERY_LIMIT",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -246,7 +263,7 @@ public void QueryWhenInvalidRequest()
             status = "INVALID_REQUEST",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -274,7 +291,7 @@ public void QueryWhenNoApiKey()
             status = "NO_API_KEY",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -303,7 +320,7 @@ public void QueryWhenRequestDenied()
             status = "REQUEST_DENIED",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -331,7 +348,7 @@ public void QueryWhenHttpError()
             status = "HTTP_ERROR",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")
@@ -360,7 +377,7 @@ public void QueryWhenUnknownError()
             status = "UNKNOWN_ERROR",
             data = new { }
         };
-        var response = JsonConvert.SerializeObject(data);
+        var response = JsonSerializer.Serialize(data, _options);
 
         this.mockHttpMessageHandler
             .When("https://demo.googleapis.com/fakeservice/*")

.tests/GoogleApi.UnitTests/Common/Converters/StringEnumOrDefaultConverterTest.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Text.Json;
 using GoogleApi.Entities.Search.Common;
 using GoogleApi.Entities.Search.Common.Converters;
-using Newtonsoft.Json;
 using NUnit.Framework;
 
 namespace GoogleApi.UnitTests.Search.Common.Converters;
@@ -37,10 +37,9 @@ public void ReadJsonTest()
     [Test]
     public void WriteJsonTest()
     {
-        var writer = new JsonTextWriter(TextWriter.Null);
-        var serializer = new JsonSerializer();
-        var converter = new DateRestrictJsonConverter();
+        var writer = new Utf8JsonWriter(new MemoryStream());
+        var sut = new DateRestrictJsonConverter();
 
-        Assert.Throws<NotImplementedException>(() => converter.WriteJson(writer, new object(), serializer));
+        Assert.Throws<NotImplementedException>(() => sut.Write(writer, new DateRestrict(), new JsonSerializerOptions()));
     }
 }

.tests/GoogleApi.UnitTests/GoogleApi.UnitTests.csproj

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Text.Json;
 using GoogleApi.Entities.Search.Common;
 using GoogleApi.Entities.Search.Common.Converters;
-using Newtonsoft.Json;
 using NUnit.Framework;
 
 namespace GoogleApi.UnitTests.Search.Common.Converters;
@@ -37,10 +37,9 @@ public void ReadJsonTest()
     [Test]
     public void WriteJsonTest()
     {
-        var writer = new JsonTextWriter(TextWriter.Null);
-        var serializer = new JsonSerializer();
-        var converter = new SortExpressionJsonConverter();
+        var writer = new Utf8JsonWriter(new MemoryStream());
+        var sut = new SortExpressionJsonConverter();
 
-        Assert.Throws<NotImplementedException>(() => converter.WriteJson(writer, new object(), serializer));
+        Assert.Throws<NotImplementedException>(() => sut.Write(writer, new SortExpression(), new JsonSerializerOptions()));
     }
 }

.tests/GoogleApi.UnitTests/HttpEngineTests.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using GoogleApi.Entities.Interfaces;
-using Newtonsoft.Json;
+
 using GoogleApi.Entities.Common.Extensions;
 using Org.BouncyCastle.Crypto.Digests;
 using Org.BouncyCastle.Crypto.Macs;