[r] CodeMaid cleanup

i4004 · i4004 · commit 0364c9789a32 · 2024-05-25T21:16:05.000+05:00
diff --git a/src/Simplify.Web.Tests/Controllers/Execution/PreviousPageUrlUpdaterTests.cs b/src/Simplify.Web.Tests/Controllers/Execution/PreviousPageUrlUpdaterTests.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Moq;
 using NUnit.Framework;
 using Simplify.Web.Controllers;
diff --git a/src/Simplify.Web.Tests/Controllers/Resolution/ControllerResolutionPipelineTests.cs b/src/Simplify.Web.Tests/Controllers/Resolution/ControllerResolutionPipelineTests.cs
@@ -1,6 +1,5 @@
 using System;
 using Microsoft.AspNetCore.Http;
-using Microsoft.VisualBasic;
 using Moq;
 using NUnit.Framework;
 using Simplify.Web.Controllers.Meta;
@@ -66,4 +65,4 @@ public void Execute_ThreeStagesSecondStopProcessing_TwoExecuted()
 		stage2.Verify(x => x.Execute(It.IsAny<IControllerResolutionState>(), It.Is<HttpContext>(c => c == _context), It.IsAny<Action>()));
 		stage3.Verify(x => x.Execute(It.IsAny<IControllerResolutionState>(), It.Is<HttpContext>(c => c == _context), It.IsAny<Action>()), Times.Never);
 	}
-}
+}
diff --git a/src/Simplify.Web.Tests/Controllers/V2/Execution/TestTypes/NullResponseController.cs b/src/Simplify.Web.Tests/Controllers/V2/Execution/TestTypes/NullResponseController.cs
@@ -3,6 +3,7 @@ namespace Simplify.Web.Tests.Controllers.V2.Execution.TestTypes;
 public class NullResponseController : Controller2
 {
 	public bool Invoked { get; private set; }
+
 	public ControllerResponse? Invoke()
 	{
 		Invoked = true;
diff --git a/src/Simplify.Web.Tests/Controllers/V2/Execution/TestTypes/StringResponseController.cs b/src/Simplify.Web.Tests/Controllers/V2/Execution/TestTypes/StringResponseController.cs
@@ -3,6 +3,7 @@ namespace Simplify.Web.Tests.Controllers.V2.Execution.TestTypes;
 public class StringResponseController : Controller2
 {
 	public bool Invoked { get; private set; }
+
 	public virtual ControllerResponse Invoke()
 	{
 		Invoked = true;
diff --git a/src/Simplify.Web.Tests/Controllers/V2/Metadata/MetadataTests/TestTypes/VoidResultController.cs b/src/Simplify.Web.Tests/Controllers/V2/Metadata/MetadataTests/TestTypes/VoidResultController.cs
@@ -2,5 +2,6 @@ namespace Simplify.Web.Tests.Controllers.V2.Metadata.MetadataTests.TestTypes;
 
 public class VoidResultController : Controller2
 {
-	public void Invoke() { }
+	public void Invoke()
+	{ }
 }
diff --git a/src/Simplify.Web/Controllers/V2/Metadata/Controller2Metadata.cs b/src/Simplify.Web/Controllers/V2/Metadata/Controller2Metadata.cs
@@ -27,16 +27,16 @@ public Controller2Metadata(Type controllerType) : base(controllerType)
 
 	protected override IControllerRoute BuildControllerRoute(string path) => new Controller2Route(path, InvokeMethodParameters);
 
-	private MethodInfo BuildInvokeMethodInfo(string invokeMethodName) =>
-		ControllerType.GetMethod(invokeMethodName)
-		?? throw new InvalidOperationException($"Method {invokeMethodName} not found in class {ControllerType.Name}");
-
 	private static void ValidateReturnType(MethodInfo methodInfo)
 	{
 		if (!Controller2ValidReturnTypes.Types.Contains(methodInfo.ReturnType))
 			throw new InvalidOperationException($"Invoke method invalid return type, can be one of: {Controller2ValidReturnTypes.Types.GetTypeNamesAsString()}");
 	}
 
+	private MethodInfo BuildInvokeMethodInfo(string invokeMethodName) =>
+			ControllerType.GetMethod(invokeMethodName)
+		?? throw new InvalidOperationException($"Method {invokeMethodName} not found in class {ControllerType.Name}");
+
 	private IDictionary<string, Type> BuildInvokeMethodParameters() =>
 		InvokeMethodInfo
 			.GetParameters()
diff --git a/src/Simplify.Web/Diagnostics/Templates/Http500ErrorPage.html b/src/Simplify.Web/Diagnostics/Templates/Http500ErrorPage.html
@@ -22,5 +22,4 @@ <h2>Internal Server Error</h2>
 		</div>
 	</div>
 </body>
-
 </html>
diff --git a/src/Simplify.Web/Responses/Json.cs b/src/Simplify.Web/Responses/Json.cs
@@ -13,22 +13,21 @@ namespace Simplify.Web.Responses;
 /// <param name="statusCode">The HTTP response status code.</param>
 public class Json(object objectToConvert, int statusCode = 200) : ControllerResponse
 {
-
 	/// <summary>
-	/// Gets or sets the default JsonSerializerOptions
+	/// Gets the HTTP response status code.
 	/// </summary>
 	/// <value>
-	/// The default JsonSerializerOptions.
+	/// The HTTP response status code.
 	/// </value>
-	public static JsonSerializerOptions? DefaultOptions { get; set; } = null;
+	private readonly int _statusCode = statusCode;
 
 	/// <summary>
-	/// Gets the HTTP response status code.
+	/// Gets or sets the default JsonSerializerOptions
 	/// </summary>
 	/// <value>
-	/// The HTTP response status code.
+	/// The default JsonSerializerOptions.
 	/// </value>
-	private readonly int _statusCode = statusCode;
+	public static JsonSerializerOptions? DefaultOptions { get; set; } = null;
 
 	/// <summary>
 	/// Processes this response

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace Simplify.Web.Tests.Controllers.V2.Execution.TestTypes;`
`3`	`3`	`public class NullResponseController : Controller2`
`4`	`4`	`{`
`5`	`5`	`public bool Invoked { get; private set; }`
	`6`	`+`
`6`	`7`	`public ControllerResponse? Invoke()`
`7`	`8`	`{`
`8`	`9`	`Invoked = true;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace Simplify.Web.Tests.Controllers.V2.Execution.TestTypes;`
`3`	`3`	`public class StringResponseController : Controller2`
`4`	`4`	`{`
`5`	`5`	`public bool Invoked { get; private set; }`
	`6`	`+`
`6`	`7`	`public virtual ControllerResponse Invoke()`
`7`	`8`	`{`
`8`	`9`	`Invoked = true;`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@ namespace Simplify.Web.Tests.Controllers.V2.Metadata.MetadataTests.TestTypes;`
`2`	`2`
`3`	`3`	`public class VoidResultController : Controller2`
`4`	`4`	`{`
`5`		`- public void Invoke() { }`
	`5`	`+ public void Invoke()`
	`6`	`+ { }`
`6`	`7`	`}`
-Original file line number
+Diff line change
 		</div>
 	</div>
 </body>
+-
 </html>