reafactor: change Newtonsoft.Json by System.Text.Json

Remove generic exception encapsulation

Author: xavibel

src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/HttpJsonBodyParserMiddleware.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
+using System.Text.Json;
 using Amazon.Lambda.APIGatewayEvents;
-using Newtonsoft.Json;
 using System.Threading.Tasks;
 
 namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware
@@ -20,16 +20,9 @@ public Task Before(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)
             {
                 lambdaEvent.Body = Encoding.UTF8.GetString(Convert.FromBase64String(lambdaEvent.Body));
             }
-           
-            T source;
-            try
-            {
-                source = JsonConvert.DeserializeObject<T>(lambdaEvent.Body);
-            }
-            catch (JsonReaderException)
-            {
-                throw new Exception("Content type defined as JSON but an invalid JSON was provided");
-            }
+
+            var source = JsonSerializer.Deserialize<T>(lambdaEvent.Body);
+            
 
             context.AdditionalContext.Add("Body", source);
             return Task.CompletedTask;

src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.4.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/HttpJsonBodyParserMiddlewareShould.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Amazon.Lambda.APIGatewayEvents;
 using Amazon.Lambda.Core;
 using FluentAssertions;
-using Newtonsoft.Json;
 using NSubstitute;
 using Xunit;
 
@@ -20,8 +20,11 @@ public class HttpJsonBodyParserMiddlewareShould
         public HttpJsonBodyParserMiddlewareShould()
         {
             context = new MiddyNetContext(Substitute.For<ILambdaContext>());
-            expectation = new TestObject("bar");
-            serializedExpectation = JsonConvert.SerializeObject(expectation);
+            expectation = new TestObject
+            {
+                foo = "bar"
+            };
+            serializedExpectation = JsonSerializer.Serialize(expectation);
         }
 
         [Fact]
@@ -51,7 +54,7 @@ public void ErrorWhenJsonNotMapsToObject()
             var middleware = new HttpJsonBodyParserMiddleware<TestObject>();
             Action action = () => middleware.Before(request, context);
 
-            action.Should().Throw<Exception>().WithMessage("Content type defined as JSON but an invalid JSON was provided");
+            action.Should().Throw<Exception>().WithMessage("'M' is an invalid start of a value.*");
         }
 
         [Fact]
@@ -72,7 +75,7 @@ public async Task NotProcessTheBodyIfNoHeaderIsPassed()
         public async Task HandleABase64Body()
         {
             string base64Serialized = Convert.ToBase64String(Encoding.UTF8.GetBytes(serializedExpectation));
-            
+
             var request = new APIGatewayProxyRequest()
             {
                 Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } },
@@ -103,7 +106,7 @@ public void HandleInvalidBase64Body()
             var middleware = new HttpJsonBodyParserMiddleware<TestObject>();
             Action action = () => middleware.Before(request, context);
 
-            action.Should().Throw<Exception>().WithMessage("Content type defined as JSON but an invalid JSON was provided");
+            action.Should().Throw<Exception>().WithMessage("'M' is an invalid start of a value.*");
         }
     }
 }

test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/TestObject.cs

@@ -2,11 +2,7 @@ namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests
 {
     public class TestObject
     {
-        public string foo { get; }
-
-        public TestObject(string foo)
-        {
-            this.foo = foo;
-        }
+        public string foo { get; set; }
+        
     }
 }