refac: include constant to main class

xavi-belloso · xavi-belloso · commit 989dbd0d7887 · 2021-04-21T15:16:08.000+02:00
diff --git a/samples/HttpJsonBodyParser/Voxel.MiddyNet.HttpJsonBodyParserSample/HttpJsonBodyParser.cs b/samples/HttpJsonBodyParser/Voxel.MiddyNet.HttpJsonBodyParserSample/HttpJsonBodyParser.cs
@@ -15,8 +15,8 @@ public HttpJsonBodyParser()
 
         protected override Task<APIGatewayProxyResponse> Handle(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)
         {
-            var person = ((Person) context.AdditionalContext[Constants.BodyContextKey]);
-            context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(Constants.BodyContextKey, person));
+            var person = ((Person) context.AdditionalContext[HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey]);
+            context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey, person));
             var result = new APIGatewayProxyResponse
             {
                 StatusCode = 200,
diff --git a/samples/HttpV2JsonBodyParser/Voxel.MiddyNet.HttpV2JsonBodyParserSample/HttpV2JsonBodyParser.cs b/samples/HttpV2JsonBodyParser/Voxel.MiddyNet.HttpV2JsonBodyParserSample/HttpV2JsonBodyParser.cs
@@ -15,8 +15,8 @@ public HttpV2JsonBodyParser()
 
         protected override Task<APIGatewayHttpApiV2ProxyResponse> Handle(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext context)
         {
-            var person = ((Person)context.AdditionalContext[Constants.BodyContextKey]);
-            context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(Constants.BodyContextKey, person));
+            var person = ((Person)context.AdditionalContext[HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey]);
+            context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey, person));
             var result = new APIGatewayHttpApiV2ProxyResponse
             {
                 StatusCode = 200,
diff --git a/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/Constants.cs b/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/Constants.cs
diff --git a/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/HttpJsonBodyParserMiddleware.cs b/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/HttpJsonBodyParserMiddleware.cs
@@ -6,13 +6,17 @@
 
 namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware
 {
-    public class HttpJsonBodyParserMiddleware<T> : ILambdaMiddleware<APIGatewayProxyRequest, APIGatewayProxyResponse>
+    public abstract class HttpJsonBodyParserMiddleware
+    {
+        public const string BodyContextKey = "Body";
+    }
+    public class HttpJsonBodyParserMiddleware<T> : HttpJsonBodyParserMiddleware, ILambdaMiddleware<APIGatewayProxyRequest, APIGatewayProxyResponse> where T : new()
     {
         public Task Before(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)
         {
             if (!HasJsonContentHeaders(lambdaEvent))
             {
-                context.AdditionalContext.Add(Constants.BodyContextKey, lambdaEvent.Body);
+                context.AdditionalContext.Add(BodyContextKey, lambdaEvent.Body);
                 return Task.CompletedTask;
             }
 
@@ -22,9 +26,9 @@ public Task Before(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)
             }
 
             var source = JsonSerializer.Deserialize<T>(lambdaEvent.Body);
-            
-            
-            context.AdditionalContext.Add(Constants.BodyContextKey, source);
+
+
+            context.AdditionalContext.Add(BodyContextKey, source);
             return Task.CompletedTask;
         }
 
diff --git a/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/HttpV2JsonBodyParserMiddleware.cs b/src/Voxel.MiddyNet.HttpJsonBodyParserMiddleware/HttpV2JsonBodyParserMiddleware.cs
@@ -6,13 +6,13 @@
 
 namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware
 {
-    public class HttpV2JsonBodyParserMiddleware<T> : ILambdaMiddleware<APIGatewayHttpApiV2ProxyRequest, APIGatewayHttpApiV2ProxyResponse>
+    public class HttpV2JsonBodyParserMiddleware<T> : HttpJsonBodyParserMiddleware, ILambdaMiddleware<APIGatewayHttpApiV2ProxyRequest, APIGatewayHttpApiV2ProxyResponse>
     {
         public Task Before(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext context)
         {
             if (!HasJsonContentHeaders(lambdaEvent))
             {
-                context.AdditionalContext.Add(Constants.BodyContextKey, lambdaEvent.Body);
+                context.AdditionalContext.Add(BodyContextKey, lambdaEvent.Body);
                 return Task.CompletedTask;
             }
 
@@ -24,7 +24,7 @@ public Task Before(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext
             var source = JsonSerializer.Deserialize<T>(lambdaEvent.Body);
             
             
-            context.AdditionalContext.Add(Constants.BodyContextKey, source);
+            context.AdditionalContext.Add(BodyContextKey, source);
             return Task.CompletedTask;
         }
 
diff --git a/test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/HttpJsonBodyParserMiddlewareShould.cs b/test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/HttpJsonBodyParserMiddlewareShould.cs
@@ -38,8 +38,8 @@ public async Task ProcessTheJsonRequest()
             var middleware = new HttpJsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().BeEquivalentTo(expectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().BeEquivalentTo(expectation);
         }
 
         [Fact]
@@ -67,8 +67,8 @@ public async Task NotProcessTheBodyIfNoHeaderIsPassed()
             var middleware = new HttpJsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().Be(serializedExpectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().Be(serializedExpectation);
         }
 
         [Fact]
@@ -86,8 +86,8 @@ public async Task HandleABase64Body()
             var middleware = new HttpJsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().BeEquivalentTo(expectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().BeEquivalentTo(expectation);
         }
 
         [Fact]
diff --git a/test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/HttpV2JsonBodyParserMiddlewareShould.cs b/test/Voxel.MiddyNet.HttpJsonBodyParserMiddleware.Tests/HttpV2JsonBodyParserMiddlewareShould.cs
@@ -38,8 +38,8 @@ public async Task ProcessTheJsonRequest()
             var middleware = new HttpV2JsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().BeEquivalentTo(expectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().BeEquivalentTo(expectation);
         }
 
         [Fact]
@@ -67,8 +67,8 @@ public async Task NotProcessTheBodyIfNoHeaderIsPassed()
             var middleware = new HttpV2JsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().Be(serializedExpectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().Be(serializedExpectation);
         }
 
         [Fact]
@@ -86,8 +86,8 @@ public async Task HandleABase64Body()
             var middleware = new HttpV2JsonBodyParserMiddleware<TestObject>();
             await middleware.Before(request, context);
 
-            context.AdditionalContext.ContainsKey(Constants.BodyContextKey).Should().BeTrue();
-            context.AdditionalContext[Constants.BodyContextKey].Should().BeEquivalentTo(expectation);
+            context.AdditionalContext.ContainsKey(HttpJsonBodyParserMiddleware.BodyContextKey).Should().BeTrue();
+            context.AdditionalContext[HttpJsonBodyParserMiddleware.BodyContextKey].Should().BeEquivalentTo(expectation);
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public HttpJsonBodyParser()`
`15`	`15`
`16`	`16`	`protected override Task<APIGatewayProxyResponse> Handle(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)`
`17`	`17`	`{`
`18`		`- var person = ((Person) context.AdditionalContext[Constants.BodyContextKey]);`
`19`		`- context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(Constants.BodyContextKey, person));`
	`18`	`+ var person = ((Person) context.AdditionalContext[HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey]);`
	`19`	`+ context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey, person));`
`20`	`20`	`var result = new APIGatewayProxyResponse`
`21`	`21`	`{`
`22`	`22`	`StatusCode = 200,`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public HttpV2JsonBodyParser()`
`15`	`15`
`16`	`16`	`protected override Task<APIGatewayHttpApiV2ProxyResponse> Handle(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext context)`
`17`	`17`	`{`
`18`		`- var person = ((Person)context.AdditionalContext[Constants.BodyContextKey]);`
`19`		`- context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(Constants.BodyContextKey, person));`
	`18`	`+ var person = ((Person)context.AdditionalContext[HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey]);`
	`19`	`+ context.Logger.Log(LogLevel.Info, "Function called", new LogProperty(HttpJsonBodyParserMiddleware.HttpJsonBodyParserMiddleware.BodyContextKey, person));`
`20`	`20`	`var result = new APIGatewayHttpApiV2ProxyResponse`
`21`	`21`	`{`
`22`	`22`	`StatusCode = 200,`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,17 @@`
`6`	`6`
`7`	`7`	`namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware`
`8`	`8`	`{`
`9`		`- public class HttpJsonBodyParserMiddleware<T> : ILambdaMiddleware<APIGatewayProxyRequest, APIGatewayProxyResponse>`
	`9`	`+ public abstract class HttpJsonBodyParserMiddleware`
	`10`	`+ {`
	`11`	`+ public const string BodyContextKey = "Body";`
	`12`	`+ }`
	`13`	`+ public class HttpJsonBodyParserMiddleware<T> : HttpJsonBodyParserMiddleware, ILambdaMiddleware<APIGatewayProxyRequest, APIGatewayProxyResponse> where T : new()`
`10`	`14`	`{`
`11`	`15`	`public Task Before(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)`
`12`	`16`	`{`
`13`	`17`	`if (!HasJsonContentHeaders(lambdaEvent))`
`14`	`18`	`{`
`15`		`- context.AdditionalContext.Add(Constants.BodyContextKey, lambdaEvent.Body);`
	`19`	`+ context.AdditionalContext.Add(BodyContextKey, lambdaEvent.Body);`
`16`	`20`	`return Task.CompletedTask;`
`17`	`21`	`}`
`18`	`22`
`@@ -22,9 +26,9 @@ public Task Before(APIGatewayProxyRequest lambdaEvent, MiddyNetContext context)`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`var source = JsonSerializer.Deserialize<T>(lambdaEvent.Body);`
`25`		`-`
`26`		`-`
`27`		`- context.AdditionalContext.Add(Constants.BodyContextKey, source);`
	`29`	`+`
	`30`	`+`
	`31`	`+ context.AdditionalContext.Add(BodyContextKey, source);`
`28`	`32`	`return Task.CompletedTask;`
`29`	`33`	`}`
`30`	`34`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`
`7`	`7`	`namespace Voxel.MiddyNet.HttpJsonBodyParserMiddleware`
`8`	`8`	`{`
`9`		`- public class HttpV2JsonBodyParserMiddleware<T> : ILambdaMiddleware<APIGatewayHttpApiV2ProxyRequest, APIGatewayHttpApiV2ProxyResponse>`
	`9`	`+ public class HttpV2JsonBodyParserMiddleware<T> : HttpJsonBodyParserMiddleware, ILambdaMiddleware<APIGatewayHttpApiV2ProxyRequest, APIGatewayHttpApiV2ProxyResponse>`
`10`	`10`	`{`
`11`	`11`	`public Task Before(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext context)`
`12`	`12`	`{`
`13`	`13`	`if (!HasJsonContentHeaders(lambdaEvent))`
`14`	`14`	`{`
`15`		`- context.AdditionalContext.Add(Constants.BodyContextKey, lambdaEvent.Body);`
	`15`	`+ context.AdditionalContext.Add(BodyContextKey, lambdaEvent.Body);`
`16`	`16`	`return Task.CompletedTask;`
`17`	`17`	`}`
`18`	`18`
`@@ -24,7 +24,7 @@ public Task Before(APIGatewayHttpApiV2ProxyRequest lambdaEvent, MiddyNetContext`
`24`	`24`	`var source = JsonSerializer.Deserialize<T>(lambdaEvent.Body);`
`25`	`25`
`26`	`26`
`27`		`- context.AdditionalContext.Add(Constants.BodyContextKey, source);`
	`27`	`+ context.AdditionalContext.Add(BodyContextKey, source);`
`28`	`28`	`return Task.CompletedTask;`
`29`	`29`	`}`
`30`	`30`