FIX: Using Newtonsoft.Json as the default serializer

By default the AspNet.Core Serializer on 3.0+ is the System.Text.Json, the current implementation of the library doesn't support Fields only Properties even public fields. There is a change that will be part of .net 5.0 that will provide a option to change this behaviour dotnet/runtime#36986
ViniciusSouza · Sep 3, 2020 · 106cd82 · 106cd82
1 parent 87e2135
commit 106cd82
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/src/Arriba/Adapters/Arriba.Adapter.Netwonsoft/Arriba.Adapter.Netwonsoft.csproj b/src/Arriba/Adapters/Arriba.Adapter.Netwonsoft/Arriba.Adapter.Netwonsoft.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Arriba/Arriba.Composition/Arriba.Composition.csproj b/src/Arriba/Arriba.Composition/Arriba.Composition.csproj
@@ -21,7 +21,7 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
-      <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+      <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Adapters\Arriba.Adapter.Cache\Arriba.Adapter.Cache.csproj" />

diff --git a/src/Arriba/Arriba.Server/Arriba.Server.csproj b/src/Arriba/Arriba.Server/Arriba.Server.csproj
@@ -21,8 +21,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     </ItemGroup>
     <ItemGroup>

diff --git a/src/Arriba/Arriba.Server/Startup.cs b/src/Arriba/Arriba.Server/Startup.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
+using Arriba.Client.Serialization.Json;
 using Arriba.Communication;
 using Arriba.Composition;
 using Arriba.Configuration;
@@ -49,8 +50,14 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton(serverConfig);
             services.AddSingleton((_) => serverConfig.OAuthConfig);
             services.AddOAuth(serverConfig);
-            services.AddControllers();
-
+            services.AddControllers().AddNewtonsoftJson(options =>
+            {
+                foreach (var converter in ConverterFactory.GetArribaConverters())
+                {
+                    options.SerializerSettings.Converters.Add(converter);
+                }
+            });
+
             //Arriba Composition
             services.AddSingleton<ISecurityConfiguration>(serverConfig);
             services.AddArribaServices(serverConfig);
@@ -139,19 +146,19 @@ private async Task Write(ArribaHttpContextRequest request, IResponse response, I
                 {
                     if (!context.Response.HasStarted)
                     {
-                    context.Response.StatusCode = 500;
+                        context.Response.StatusCode = 500;
 
-                    if (responseBody.CanWrite)
-                    {
-                        using (var failureWriter = new StreamWriter(responseBody))
+                        if (responseBody.CanWrite)
                         {
-                            var message = String.Format("ERROR: Content writer {0} for content type {1} failed with exception {2}", writer.GetType(), writer.ContentType, writeException.GetType().Name);
-                            await failureWriter.WriteAsync(message);
+                            using (var failureWriter = new StreamWriter(responseBody))
+                            {
+                                var message = String.Format("ERROR: Content writer {0} for content type {1} failed with exception {2}", writer.GetType(), writer.ContentType, writeException.GetType().Name);
+                                await failureWriter.WriteAsync(message);
+                            }
                         }
                     }
                 }
             }
-            }
 
             response.Dispose();
         }

diff --git a/src/Arriba/Arriba.Test/Arriba.Test.csproj b/src/Arriba/Arriba.Test/Arriba.Test.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Adapters\Arriba.Adapter.Configuration\Arriba.Adapter.Configuration.csproj" />