.

Author: StefH

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -25,37 +25,37 @@ public AndConstraint<WireMockAssertions> WithBody(string body, string because =
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBody(IStringMatcher matcher, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+        var (filter, condition) = BuildFilterAndCondition(r => r.Body, matcher);
+
+        return ExecuteAssertionWithBodyStringMatcher(matcher, because, becauseArgs, condition, filter, r => r.Body);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, string because = "", params object[] becauseArgs)
     {
         return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsBytes(byte[] body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsBytes(new ExactObjectMatcher(body), because, becauseArgs);
+        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBody(IStringMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
     {
-        var (filter, condition) = BuildFilterAndCondition(r => r.Body, matcher);
+        var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
 
-        return ExecuteAssertionWithBodyStringMatcher(matcher, because, becauseArgs, condition, filter, r => r.Body);
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsBytes(byte[] body, string because = "", params object[] becauseArgs)
     {
-        var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
-
-        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
+        return WithBodyAsBytes(new ExactObjectMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
@@ -142,6 +142,6 @@ private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsIObjectMatch
     private static string? FormatBodies(IEnumerable<object?> bodies)
     {
         var valueAsArray = bodies as object[] ?? bodies.ToArray();
-        return valueAsArray.Length == 1 ? FormatBody(valueAsArray.First()) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
+        return valueAsArray.Length == 1 ? FormatBody(valueAsArray[0]) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
     }
 }

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithHeader.cs

@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 #pragma warning disable CS1591
-using System.Collections.Generic;
-using WireMock.Types;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
@@ -47,7 +45,7 @@ public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[]
     {
         var (filter, condition) = BuildFilterAndCondition(request =>
         {
-            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+            var headers = request.Headers?.ToArray() ?? [];
 
             var matchingHeaderValues = headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
 
@@ -121,7 +119,7 @@ public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, str
     {
         var (filter, condition) = BuildFilterAndCondition(request =>
         {
-            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+            var headers = request.Headers?.ToArray() ?? [];
 
             var matchingHeaderValues = headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
 

src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs

@@ -146,24 +146,24 @@ private bool IsMatch(dynamic input, string pattern)
             }
         }
 #elif (NET46 || NET461)
-            dynamic script;
-            try
-            {
-                script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
-            }
-            
-            try
-            {
-                result = script.IsMatch(inputValue);
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
-            }
+        dynamic script;
+        try
+        {
+            script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
+        }
+        catch (Exception ex)
+        {
+            throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
+        }
+        
+        try
+        {
+            result = script.IsMatch(inputValue);
+        }
+        catch (Exception ex)
+        {
+            throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
+        }
 
 #elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER)
         Assembly assembly;
@@ -195,7 +195,7 @@ private bool IsMatch(dynamic input, string pattern)
             throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
         }
 #else
-            throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
+        throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
 #endif
         try
         {