(#110) Removing Newtonsoft.Json

phongnguyend · Nov 23, 2021 · de6fe6a · de6fe6a
1 parent af9f463
commit de6fe6a
Show file tree

Hide file tree

Showing 96 changed files with 353 additions and 344 deletions.
diff --git a/...services/Common/ClassifiedAds.Application/Decorators/AuditLog/AuditLogCommandDecorator.cs b/...services/Common/ClassifiedAds.Application/Decorators/AuditLog/AuditLogCommandDecorator.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace ClassifiedAds.Application.Decorators.AuditLog
 {
@@ -18,7 +18,7 @@ public AuditLogCommandDecorator(ICommandHandler<TCommand> handler)
 
         public async Task HandleAsync(TCommand command, CancellationToken cancellationToken = default)
         {
-            var commandJson = JsonConvert.SerializeObject(command);
+            var commandJson = JsonSerializer.Serialize(command);
             Console.WriteLine($"Command of type {command.GetType().Name}: {commandJson}");
             await _handler.HandleAsync(command, cancellationToken);
         }

diff --git a/...roservices/Common/ClassifiedAds.Application/Decorators/AuditLog/AuditLogQueryDecorator.cs b/...roservices/Common/ClassifiedAds.Application/Decorators/AuditLog/AuditLogQueryDecorator.cs
@@ -1,7 +1,7 @@
 using System;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace ClassifiedAds.Application.Decorators.AuditLog
 {
@@ -18,7 +18,7 @@ public AuditLogQueryDecorator(IQueryHandler<TQuery, TResult> handler)
 
         public Task<TResult> HandleAsync(TQuery query, CancellationToken cancellationToken = default)
         {
-            string queryJson = JsonConvert.SerializeObject(query);
+            string queryJson = JsonSerializer.Serialize(query);
             Console.WriteLine($"Query of type {query.GetType().Name}: {queryJson}");
             return _handler.HandleAsync(query, cancellationToken);
         }

diff --git a/...vices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/...vices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>ClassifiedAds.CrossCuttingConcerns</RootNamespace>
-    <CodeAnalysisRuleSet>ClassifiedAds.CrossCuttingConcerns.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>ClassifiedAds.CrossCuttingConcerns</RootNamespace>
+		<CodeAnalysisRuleSet>ClassifiedAds.CrossCuttingConcerns.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="System.Text.Json" Version="6.0.0" />
+	</ItemGroup>
 
 </Project>
diff --git a/...oservices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/CloningExtensions.cs b/...oservices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/CloningExtensions.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System.Reflection;
+using System.Reflection;
+using System.Text.Json;
 
 namespace ClassifiedAds.CrossCuttingConcerns.ExtensionMethods
 {
@@ -28,13 +28,7 @@ public static T DeepCloneJson<T>(this T source)
                 return default(T);
             }
 
-            // initialize inner objects individually
-            // for example in default constructor some list property initialized with some values,
-            // but in 'source' these items are cleaned -
-            // without ObjectCreationHandling.Replace default constructor values will be added to result
-            var deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace };
-
-            return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(source), deserializeSettings);
+            return JsonSerializer.Deserialize<T>(JsonSerializer.Serialize(source));
         }
     }
 }
diff --git a/...vices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/HttpContentExtensions.cs b/...vices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/HttpContentExtensions.cs
@@ -1,7 +1,6 @@
-using Newtonsoft.Json;
-using System.IO;
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace ClassifiedAds.CrossCuttingConcerns.ExtensionMethods
@@ -10,19 +9,22 @@ public static class HttpContentExtensions
     {
         public static async Task<T> ReadAs<T>(this HttpContent httpContent)
         {
-            using (var streamReader = new StreamReader(await httpContent.ReadAsStreamAsync()))
+            var json = await httpContent.ReadAsStringAsync();
+
+            if (string.IsNullOrWhiteSpace(json))
             {
-                using (var jsonTextReader = new JsonTextReader(streamReader))
-                {
-                    var jsonSerializer = new JsonSerializer();
-                    return jsonSerializer.Deserialize<T>(jsonTextReader);
-                }
+                return default;
             }
+
+            return JsonSerializer.Deserialize<T>(json, new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+            });
         }
 
         public static StringContent AsStringContent(this object obj, string contentType)
         {
-            var content = new StringContent(JsonConvert.SerializeObject(obj));
+            var content = new StringContent(JsonSerializer.Serialize(obj));
             content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
             return content;
         }

diff --git a/...roservices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/ObjectExtensions.cs b/...roservices/Common/ClassifiedAds.CrossCuttingConcerns/ExtensionMethods/ObjectExtensions.cs
@@ -1,12 +1,12 @@
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace ClassifiedAds.CrossCuttingConcerns.ExtensionMethods
 {
     public static class ObjectExtensions
     {
         public static string AsJsonString(this object obj)
         {
-            var content = JsonConvert.SerializeObject(obj, Formatting.Indented);
+            var content = JsonSerializer.Serialize(obj, new JsonSerializerOptions { WriteIndented = true });
             return content;
         }
     }

diff --git a/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <CodeAnalysisRuleSet>ClassifiedAds.Domain.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<CodeAnalysisRuleSet>ClassifiedAds.Domain.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+		<PackageReference Include="System.Text.Json" Version="6.0.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ClassifiedAds.CrossCuttingConcerns\ClassifiedAds.CrossCuttingConcerns.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\ClassifiedAds.CrossCuttingConcerns\ClassifiedAds.CrossCuttingConcerns.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/src/Microservices/Common/ClassifiedAds.Domain/Infrastructure/MessageBrokers/Message.cs b/src/Microservices/Common/ClassifiedAds.Domain/Infrastructure/MessageBrokers/Message.cs
@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System.Text;
+using System.Text;
+using System.Text.Json;
 
 namespace ClassifiedAds.Domain.Infrastructure.MessageBrokers
 {
@@ -11,7 +11,7 @@ public class Message<T>
 
         public string SerializeObject()
         {
-            return JsonConvert.SerializeObject(this);
+            return JsonSerializer.Serialize(this);
         }
 
         public byte[] GetBytes()

diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>ClassifiedAds.Infrastructure</RootNamespace>
-    <CodeAnalysisRuleSet>ClassifiedAds.Infrastructure.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>ClassifiedAds.Infrastructure</RootNamespace>
+		<CodeAnalysisRuleSet>ClassifiedAds.Infrastructure.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
@@ -55,7 +55,6 @@
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.2.22" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.2.0-beta2.1" />
 		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.2.0-beta2.1" />
 		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.2.0-beta2.1" />
@@ -80,19 +79,19 @@
 		<PackageReference Include="Twilio" Version="5.68.1" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ClassifiedAds.Domain\ClassifiedAds.Domain.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\ClassifiedAds.Domain\ClassifiedAds.Domain.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ContentWithTargetPath Include="..\libs\libwkhtmltox\libwkhtmltox-0.12.4-x64.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>libwkhtmltox.dll</TargetPath>
+		</ContentWithTargetPath>
+		<ContentWithTargetPath Include="..\libs\libwkhtmltox\libwkhtmltox-0.12.4-x64.so">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<TargetPath>libwkhtmltox.so</TargetPath>
+		</ContentWithTargetPath>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ContentWithTargetPath Include="..\libs\libwkhtmltox\libwkhtmltox-0.12.4-x64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libwkhtmltox.dll</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="..\libs\libwkhtmltox\libwkhtmltox-0.12.4-x64.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libwkhtmltox.so</TargetPath>
-    </ContentWithTargetPath>
-  </ItemGroup>
-
 </Project>
diff --git a/...icroservices/Common/ClassifiedAds.Infrastructure/Interceptors/ErrorCatchingInterceptor.cs b/...icroservices/Common/ClassifiedAds.Infrastructure/Interceptors/ErrorCatchingInterceptor.cs
@@ -1,7 +1,8 @@
 using Castle.DynamicProxy;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace ClassifiedAds.Infrastructure.Interceptors
 {
@@ -27,7 +28,12 @@ public void Intercept(IInvocation invocation)
                 var methodName = method.Name;
 
                 // TODO: Ignore serialize large argument object.
-                var arguments = JsonConvert.SerializeObject(invocation.Arguments, Formatting.None, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
+                var arguments = JsonSerializer.Serialize(invocation.Arguments, new JsonSerializerOptions()
+                {
+                    WriteIndented = false,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                    ReferenceHandler = ReferenceHandler.IgnoreCycles,
+                });
                 _logger.LogError($"An unhandled exception has occurred while executing the method: {className}.{methodName} with ({arguments}). {Environment.NewLine}{ex.ToString()}");
                 throw;
             }

diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Interceptors/LoggingInterceptor.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Interceptors/LoggingInterceptor.cs
@@ -1,7 +1,8 @@
 using Castle.DynamicProxy;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace ClassifiedAds.Infrastructure.Interceptors
 {
@@ -19,7 +20,13 @@ public void Intercept(IInvocation invocation)
             var method = invocation.Method;
             var className = method.DeclaringType.Name;
             var methodName = method.Name;
-            var arguments = JsonConvert.SerializeObject(invocation.Arguments, Formatting.None, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
+
+            var arguments = JsonSerializer.Serialize(invocation.Arguments, new JsonSerializerOptions()
+            {
+                WriteIndented = false,
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                ReferenceHandler = ReferenceHandler.IgnoreCycles,
+            });
 
             _logger.LogDebug($"Start calling method: {className}.{methodName} with ({arguments}).");
 

diff --git a/...Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventGrid/AzureEventGridSender.cs b/...Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventGrid/AzureEventGridSender.cs
@@ -1,9 +1,9 @@
 using Azure;
 using Azure.Messaging.EventGrid;
 using ClassifiedAds.Domain.Infrastructure.MessageBrokers;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -27,7 +27,7 @@ public async Task SendAsync(T message, MetaData metaData, CancellationToken canc
 
             EventGridPublisherClient client = new EventGridPublisherClient(new Uri(_domainEndpoint), new AzureKeyCredential(_domainKey));
 
-            var data = new BinaryData(JsonConvert.SerializeObject(new Message<T>
+            var data = new BinaryData(JsonSerializer.Serialize(new Message<T>
             {
                 Data = message,
                 MetaData = metaData,

diff --git a/...Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventHub/AzureEventHubReceiver.cs b/...Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventHub/AzureEventHubReceiver.cs
@@ -3,9 +3,9 @@
 using Azure.Messaging.EventHubs.Processor;
 using Azure.Storage.Blobs;
 using ClassifiedAds.Domain.Infrastructure.MessageBrokers;
-using Newtonsoft.Json;
 using System;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace ClassifiedAds.Infrastructure.MessageBrokers.AzureEventHub
@@ -43,7 +43,7 @@ Task ProcessEventHandler(ProcessEventArgs eventArgs)
                 try
                 {
                     var messageAsString = Encoding.UTF8.GetString(eventArgs.Data.EventBody);
-                    var message = JsonConvert.DeserializeObject<Message<T>>(messageAsString);
+                    var message = JsonSerializer.Deserialize<Message<T>>(messageAsString);
                     action(message.Data, message.MetaData);
                 }
                 catch (Exception ex)

diff --git a/...s/Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventHub/AzureEventHubSender.cs b/...s/Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureEventHub/AzureEventHubSender.cs
@@ -1,8 +1,8 @@
 using Azure.Messaging.EventHubs;
 using Azure.Messaging.EventHubs.Producer;
 using ClassifiedAds.Domain.Infrastructure.MessageBrokers;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -25,7 +25,7 @@ public async Task SendAsync(T message, MetaData metaData, CancellationToken canc
 
             var events = new List<EventData>
             {
-                new EventData(JsonConvert.SerializeObject(new Message<T>
+                new EventData(JsonSerializer.Serialize(new Message<T>
                 {
                     Data = message,
                     MetaData = metaData,

diff --git a/...vices/Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureQueue/AzureQueueReceiver.cs b/...vices/Common/ClassifiedAds.Infrastructure/MessageBrokers/AzureQueue/AzureQueueReceiver.cs
@@ -1,7 +1,7 @@
 using Azure.Storage.Queues;
 using ClassifiedAds.Domain.Infrastructure.MessageBrokers;
-using Newtonsoft.Json;
 using System;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace ClassifiedAds.Infrastructure.MessageBrokers.AzureQueue
@@ -28,7 +28,7 @@ private Task ReceiveAsync(Action<T, MetaData> action)
         {
             return ReceiveStringAsync(retrievedMessage =>
             {
-                var message = JsonConvert.DeserializeObject<Message<T>>(retrievedMessage);
+                var message = JsonSerializer.Deserialize<Message<T>>(retrievedMessage);
                 action(message.Data, message.MetaData);
             });
         }