Updated solution to remove unnecessary dependencies on Newtonsoft.Json (#1524)

* Updated solution to remove unnecessary dependencies on Newtonsoft.Json in favor of just using System.Text.Json throughout for JSON serialization.

Author: WhitWaldo

Directory.Packages.props

@@ -40,7 +40,6 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="MinVer" Version="2.3.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.2.2" />
     <PackageVersion Include="Serilog.AspNetCore" Version="6.1.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />

test/Dapr.Actors.Test/DaprFormatTimeSpanTests.cs

@@ -11,15 +11,14 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using System.Text.Json;
+
 #pragma warning disable 0618
 namespace Dapr.Actors.Test;
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
+using System.Collections.Generic;using System.Threading.Tasks;
 using Dapr.Actors.Runtime;
-using Newtonsoft.Json;
 using Xunit;
 
 public class DaprFormatTimeSpanTests
@@ -28,12 +27,12 @@ public class DaprFormatTimeSpanTests
     {
         new object[]
         {
-            "{\"dueTime\":\"4h15m50s60ms\"",
+            "4h15m50s60ms",
             new TimeSpan(0, 4, 15, 50, 60),
         },
         new object[]
         {
-            "{\"dueTime\":\"0h35m10s12ms\"",
+            "0h35m10s12ms",
             new TimeSpan(0, 0, 35, 10, 12),
         },
     };
@@ -90,17 +89,8 @@ public class DaprFormatTimeSpanTests
 
     [Theory]
     [MemberData(nameof(DaprFormatTimeSpanJsonStringsAndExpectedDeserializedValues))]
-    public void DaprFormat_TimeSpan_Parsing(string daprFormatTimeSpanJsonString, TimeSpan expectedDeserializedValue)
+    public void DaprFormat_TimeSpan_Parsing(string timespanString, TimeSpan expectedDeserializedValue)
     {
-        using var textReader = new StringReader(daprFormatTimeSpanJsonString);
-        using var jsonTextReader = new JsonTextReader(textReader);
-
-        while (jsonTextReader.TokenType != JsonToken.String)
-        {
-            jsonTextReader.Read();
-        }
-
-        var timespanString = (string)jsonTextReader.Value;
         var deserializedTimeSpan = ConverterUtils.ConvertTimeSpanFromDaprFormat(timespanString);
 
         Assert.Equal(expectedDeserializedValue, deserializedTimeSpan);
@@ -116,7 +106,7 @@ static Task<string> SerializeAsync(TimeSpan dueTime, TimeSpan period)
                 state: null,
                 dueTime: dueTime,
                 period: period);
-            return Task.FromResult(System.Text.Json.JsonSerializer.Serialize<TimerInfo>(timerInfo));
+            return Task.FromResult(JsonSerializer.Serialize<TimerInfo>(timerInfo));
         }
 
         var inTheFuture = TimeSpan.FromMilliseconds(20);

test/Dapr.AspNetCore.IntegrationTest.App/Widget.cs

@@ -11,11 +11,15 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using System.Text.Json.Serialization;
+
 namespace Dapr.AspNetCore.IntegrationTest.App;
 
 public class Widget
 {
+    [JsonPropertyName("size")]
     public string Size { get; set; }
 
+    [JsonPropertyName("count")]
     public int Count { get; set; }
-}
+}

test/Dapr.AspNetCore.IntegrationTest/AuthenticationTest.cs

@@ -14,16 +14,21 @@
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Dapr.AspNetCore.IntegrationTest.App;
 using Shouldly;
-using Newtonsoft.Json;
 using Xunit;
 
 namespace Dapr.AspNetCore.IntegrationTest;
 
 public class AuthenticationTest
 {
+    private JsonSerializerOptions serializerOptions = new JsonSerializerOptions
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+    };
+    
     [Fact]
     public async Task ValidToken_ShouldBeAuthenticatedAndAuthorized()
     {
@@ -36,13 +41,13 @@ public async Task ValidToken_ShouldBeAuthenticatedAndAuthorized()
             var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
             var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/requires-api-token")
             {
-                Content = new StringContent(JsonConvert.SerializeObject(userInfo), Encoding.UTF8, "application/json")
+                Content = new StringContent(JsonSerializer.Serialize(userInfo), Encoding.UTF8, "application/json")
             };
             request.Headers.Add("Dapr-Api-Token", "abcdefg");
             var response = await httpClient.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var responseContent = await response.Content.ReadAsStringAsync();
-            var responseUserInfo = JsonConvert.DeserializeObject<UserInfo>(responseContent);
+            var responseUserInfo = JsonSerializer.Deserialize<UserInfo>(responseContent, serializerOptions);
             responseUserInfo.Name.ShouldBe(userInfo.Name);
         }
     }
@@ -59,12 +64,12 @@ public async Task InvalidToken_ShouldBeUnauthorized()
             var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
             var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/requires-api-token")
             {
-                Content = new StringContent(JsonConvert.SerializeObject(userInfo), Encoding.UTF8, "application/json")
+                Content = new StringContent(JsonSerializer.Serialize(userInfo, serializerOptions), Encoding.UTF8, "application/json")
             };
             request.Headers.Add("Dapr-Api-Token", "asdfgh");
             var response = await httpClient.SendAsync(request);
 
             response.StatusCode.ShouldBe(HttpStatusCode.Unauthorized);
         }
     }
-}
+}

test/Dapr.AspNetCore.IntegrationTest/ControllerIntegrationTest.cs

@@ -11,15 +11,15 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace Dapr.AspNetCore.IntegrationTest;
-
+using System.Text.Json;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Dapr.AspNetCore.IntegrationTest.App;
 using Shouldly;
-using Newtonsoft.Json;
 using Xunit;
 
+namespace Dapr.AspNetCore.IntegrationTest;
+
 public class ControllerIntegrationTest
 {
     [Fact]
@@ -55,7 +55,7 @@ public async Task ModelBinder_GetFromStateEntryWithKeyPresentInStateStore_Return
             var response = await httpClient.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var responseContent = await response.Content.ReadAsStringAsync();
-            var responseWidget = JsonConvert.DeserializeObject<Widget>(responseContent);
+            var responseWidget = JsonSerializer.Deserialize<Widget>(responseContent);
             responseWidget.Size.ShouldBe(widget.Size);
             responseWidget.Count.ShouldBe(widget.Count);
         }
@@ -72,7 +72,8 @@ public async Task ModelBinder_GetFromStateEntryWithKeyNotInStateStore_ReturnsNul
             var response = await httpClient.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var responseContent = await response.Content.ReadAsStringAsync();
-            var responseWidget = JsonConvert.DeserializeObject<Widget>(responseContent);
+            var responseWidget =
+                !string.IsNullOrWhiteSpace(responseContent) ? JsonSerializer.Deserialize<Widget>(responseContent) : null;
             Assert.Null(responseWidget);
         }
     }
@@ -129,7 +130,7 @@ public async Task ModelBinder_GetFromStateEntryWithStateEntry_WithKeyPresentInSt
             var response = await httpClient.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var responseContent = await response.Content.ReadAsStringAsync();
-            var responseWidget = JsonConvert.DeserializeObject<Widget>(responseContent);
+            var responseWidget = JsonSerializer.Deserialize<Widget>(responseContent);
             responseWidget.Size.ShouldBe(widget.Size);
             responseWidget.Count.ShouldBe(widget.Count);
         }
@@ -146,7 +147,7 @@ public async Task ModelBinder_GetFromStateEntryWithStateEntry_WithKeyNotInStateS
             var response = await httpClient.SendAsync(request);
             response.EnsureSuccessStatusCode();
             var responseContent = await response.Content.ReadAsStringAsync();
-            var responseWidget = JsonConvert.DeserializeObject<Widget>(responseContent);
+            var responseWidget = !string.IsNullOrWhiteSpace(responseContent) ? JsonSerializer.Deserialize<Widget>(responseContent) : null;
             Assert.Null(responseWidget);
         }
     }
@@ -163,4 +164,4 @@ public async Task ModelBinder_CanGetOutOfTheWayWhenTheresNoBinding()
             response.EnsureSuccessStatusCode();
         }
     }
-}
+}