Merge branch 'master' into MappingSerializer

src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs

@@ -32,7 +32,7 @@ public class ResponseModel
     public object? BodyAsJson { get; set; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.
+    /// Gets or sets a value indicating whether the Json Body String needs to be indented.
     /// </summary>
     public bool? BodyAsJsonIndented { get; set; }
 

src/WireMock.Net.Abstractions/Models/IBodyData.cs

@@ -37,7 +37,7 @@ public interface IBodyData
     object? BodyAsJson { get; set; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.
+    /// Gets or sets a value indicating whether the Json Body String needs to be indented.
     /// </summary>
     bool? BodyAsJsonIndented { get; set; }
 

src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>WireMock.Net.Routing extends WireMock.Net with modern, minimal-API-style routing for .NET</Description>
         <Authors>Gennadii Saltyshchak</Authors>
@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+      <PackageReference Include="JsonConverter.Abstractions" Version="0.8.0" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Net.Minimal/MappingBuilder.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Linq;
 using System.Text;
-using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
@@ -164,8 +163,8 @@ public class MappingBuilder : IMappingBuilder
         }
     }
 
-    private static string ToJson(object value)
+    private string ToJson(object value)
     {
-        return JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsDefault);
+        return _settings.DefaultJsonSerializer.Serialize(value, JsonSerializationConstants.JsonConverterOptionsDefault);
     }
 }

src/WireMock.Net.Minimal/Serialization/MappingSerializer.cs

@@ -0,0 +1,49 @@
+// Copyright © WireMock.Net
+
+using System;
+using JsonConverter.Abstractions;
+using Newtonsoft.Json.Linq;
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET6_0_OR_GREATER || NET461
+using System.Text.Json;
+#endif
+
+namespace WireMock.Serialization;
+
+internal class MappingSerializer(IJsonConverter jsonConverter)
+{
+    internal T[] DeserializeJsonToArray<T>(string value)
+    {
+        return DeserializeObjectToArray<T>(jsonConverter.Deserialize<object>(value)!);
+    }
+
+    internal static T[] DeserializeObjectToArray<T>(object value)
+    {
+        if (value is JArray jArray)
+        {
+            return jArray.ToObject<T[]>()!;
+        }
+
+        if (value is JObject jObject)
+        {
+            var singleResult = jObject.ToObject<T>();
+            return [singleResult!];
+        }
+
+#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET6_0_OR_GREATER || NET461
+        if (value is JsonElement jElement)
+        {
+            if (jElement.ValueKind == JsonValueKind.Array)
+            {
+                return jElement.Deserialize<T[]>()!;
+            }
+
+            if (jElement.ValueKind == JsonValueKind.Object)
+            {
+                var singleResult = jElement.Deserialize<T>();
+                return [singleResult!];
+            }
+        }
+#endif
+        throw new InvalidOperationException("Cannot deserialize the provided value to an array or object.");
+    }
+}

src/WireMock.Net.Minimal/Serialization/MappingToFileSaver.cs

@@ -2,7 +2,8 @@
 
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Settings;
 
@@ -12,12 +13,15 @@ internal class MappingToFileSaver
 {
     private readonly WireMockServerSettings _settings;
     private readonly MappingConverter _mappingConverter;
+    private readonly IJsonConverter _jsonConverter;
     private readonly MappingFileNameSanitizer _fileNameSanitizer;
 
     public MappingToFileSaver(WireMockServerSettings settings, MappingConverter mappingConverter)
     {
         _settings = Guard.NotNull(settings);
         _mappingConverter = Guard.NotNull(mappingConverter);
+
+        _jsonConverter = settings.DefaultJsonSerializer ?? new NewtonsoftJsonConverter();
         _fileNameSanitizer = new MappingFileNameSanitizer(settings);
     }
 
@@ -56,6 +60,8 @@ internal class MappingToFileSaver
     {
         _settings.Logger.Info("Saving Mapping file {0}", path);
 
-        _settings.FileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsDefault));
+        var json = _jsonConverter.Serialize(value, JsonSerializationConstants.JsonConverterOptionsDefault);
+
+        _settings.FileSystemHandler.WriteMappingFile(path, json);
     }
 }

src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
+using JsonConverter.Abstractions;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
@@ -236,7 +236,7 @@ public partial class WireMockServer
 
         if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out var value))
         {
-            var mappingModels = DeserializeJsonToArray<MappingModel>(value);
+            var mappingModels = _mappingSerializer.DeserializeJsonToArray<MappingModel>(value);
             if (mappingModels.Length == 1 && Guid.TryParse(filenameWithoutExtension, out var guidFromFilename))
             {
                 ConvertMappingAndRegisterAsRespondProvider(mappingModels[0], guidFromFilename, path);
@@ -826,25 +826,31 @@ public partial class WireMockServer
         }
     }
 
-    private static Encoding? ToEncoding(EncodingModel? encodingModel)
+    private ResponseMessage ToJson<T>(T result, bool keepNullValues = false, object? statusCode = null)
     {
-        return encodingModel != null ? Encoding.GetEncoding(encodingModel.CodePage) : null;
+        var jsonOptions = new JsonConverterOptions
-    }
+        {
+            WriteIndented = true,
+            IgnoreNullValues = !keepNullValues
+        };
 
-    private static ResponseMessage ToJson<T>(T result, bool keepNullValues = false, object? statusCode = null)
-    {
         return new ResponseMessage
         {
             BodyData = new BodyData
             {
                 DetectedBodyType = BodyType.String,
-                BodyAsString = JsonConvert.SerializeObject(result, keepNullValues ? JsonSerializationConstants.JsonSerializerSettingsIncludeNullValues : JsonSerializationConstants.JsonSerializerSettingsDefault)
+                BodyAsString = _settings.DefaultJsonSerializer.Serialize(result!, jsonOptions)
             },
             StatusCode = statusCode ?? (int)HttpStatusCode.OK,
             Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>(WireMockConstants.ContentTypeJson) } }
         };
     }
 
+    private static Encoding? ToEncoding(EncodingModel? encodingModel)
+    {
+        return encodingModel != null ? Encoding.GetEncoding(encodingModel.CodePage) : null;
+    }
+
     private static ResponseMessage ToResponseMessage(string text)
     {
         return new ResponseMessage
@@ -859,6 +865,18 @@ public partial class WireMockServer
         };
     }
 
+    private static T[] DeserializeRequestMessageToArray<T>(IRequestMessage requestMessage)
+    {
+        if (requestMessage.BodyData?.DetectedBodyType == BodyType.Json && requestMessage.BodyData.BodyAsJson != null)
+        {
+            var bodyAsJson = requestMessage.BodyData.BodyAsJson!;
+
+            return MappingSerializer.DeserializeObjectToArray<T>(bodyAsJson);
+        }
+
+        throw new NotSupportedException();
+    }
+
     private static T DeserializeObject<T>(IRequestMessage requestMessage) where T : new()
     {
         switch (requestMessage.BodyData?.DetectedBodyType)
@@ -874,32 +892,4 @@ public partial class WireMockServer
                 throw new NotSupportedException();
         }
     }
-
-    private static T[] DeserializeRequestMessageToArray<T>(IRequestMessage requestMessage)
-    {
-        if (requestMessage.BodyData?.DetectedBodyType == BodyType.Json && requestMessage.BodyData.BodyAsJson != null)
-        {
-            var bodyAsJson = requestMessage.BodyData.BodyAsJson;
-
-            return DeserializeObjectToArray<T>(bodyAsJson);
-        }
-
-        throw new NotSupportedException();
-    }
-
-    private static T[] DeserializeJsonToArray<T>(string value)
-    {
-        return DeserializeObjectToArray<T>(JsonUtils.DeserializeObject(value));
-    }
-
-    private static T[] DeserializeObjectToArray<T>(object value)
-    {
-        if (value is JArray jArray)
-        {
-            return jArray.ToObject<T[]>()!;
-        }
-
-        var singleResult = ((JObject)value).ToObject<T>();
-        return new[] { singleResult! };
-    }
 }

src/WireMock.Net.Minimal/Server/WireMockServer.ImportWireMockOrg.cs

@@ -31,7 +31,7 @@ public partial class WireMockServer
 
         if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out var value))
         {
-            var mappings = DeserializeJsonToArray<OrgMapping>(value);
+            var mappings = _mappingSerializer.DeserializeJsonToArray<OrgMapping>(value);
             foreach (var mapping in mappings)
             {
                 if (mappings.Length == 1 && Guid.TryParse(filenameWithoutExtension, out var guidFromFilename))

src/WireMock.Net.Minimal/Server/WireMockServer.cs

@@ -11,6 +11,7 @@ using System.Net.Http;
 using System.Threading;
 using AnyOfTypes;
 using JetBrains.Annotations;
+using JsonConverter.Newtonsoft.Json;
 using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
@@ -47,6 +48,7 @@ public partial class WireMockServer : IWireMockServer
     private readonly MappingBuilder _mappingBuilder;
     private readonly IGuidUtils _guidUtils = new GuidUtils();
     private readonly IDateTimeUtils _dateTimeUtils = new DateTimeUtils();
+    private readonly MappingSerializer _mappingSerializer;
 
     /// <inheritdoc />
     [PublicAPI]
@@ -357,6 +359,8 @@ public partial class WireMockServer : IWireMockServer
     {
         _settings = Guard.NotNull(settings);
 
+        _mappingSerializer = new MappingSerializer(settings.DefaultJsonSerializer ?? new NewtonsoftJsonConverter());
+
         // Set default values if not provided
         _settings.Logger = settings.Logger ?? new WireMockNullLogger();
         _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
@@ -634,7 +638,7 @@ public partial class WireMockServer : IWireMockServer
     [PublicAPI]
     public IWireMockServer WithMapping(string mappings)
     {
-        var mappingModels = DeserializeJsonToArray<MappingModel>(mappings);
+        var mappingModels = _mappingSerializer.DeserializeJsonToArray<MappingModel>(mappings);
         foreach (var mappingModel in mappingModels)
         {
             ConvertMappingAndRegisterAsRespondProvider(mappingModel, mappingModel.Guid ?? Guid.NewGuid());

src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Minimal version from the lightweight Http Mocking Server for .NET</Description>
         <AssemblyTitle>WireMock.Net.Minimal</AssemblyTitle>
@@ -62,8 +62,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JsonConverter.Abstractions" Version="0.7.0" />
+        <!--<PackageReference Include="JsonConverter.Abstractions" Version="0.8.0" />-->
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <!--<PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.8.0" />-->
         <PackageReference Include="NJsonSchema.Extensions" Version="0.1.0" />
         <PackageReference Include="NSwag.Core" Version="13.16.1" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
@@ -123,11 +123,13 @@
 
         <!-- https://github.com/wiremock/WireMock.Net/issues/507 -->
         <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+        <PackageReference Include="JsonConverter.System.Text.Json" Version="0.8.0" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <PackageReference Include="Scriban.Signed" Version="5.5.0" />
+        <PackageReference Include="JsonConverter.System.Text.Json" Version="0.8.0" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj

@@ -33,7 +33,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.8.0" />
         <PackageReference Include="RestEase" Version="1.6.4" />
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
     </ItemGroup>

src/WireMock.Net.Shared/Serialization/JsonSerializationConstants.cs

@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using JsonConverter.Abstractions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
@@ -7,24 +8,30 @@ namespace WireMock.Serialization;
 
 internal static class JsonSerializationConstants
 {
-    public static readonly JsonSerializerSettings JsonSerializerSettingsDefault = new()
+    internal static readonly JsonConverterOptions JsonConverterOptionsDefault = new()
     {
-        Formatting = Formatting.Indented,
+        WriteIndented = true,
-        NullValueHandling = NullValueHandling.Ignore
+        IgnoreNullValues = true
     };
 
-    public static readonly JsonSerializerSettings JsonSerializerSettingsIncludeNullValues = new()
+    //internal static readonly JsonSerializerSettings JsonSerializerSettingsDefault = new()
+    //{
+    //    Formatting = Formatting.Indented,
+    //    NullValueHandling = NullValueHandling.Ignore
+    //};
+
+    internal static readonly JsonSerializerSettings JsonSerializerSettingsIncludeNullValues = new()
     {
         Formatting = Formatting.Indented,
         NullValueHandling = NullValueHandling.Include
     };
 
-    public static readonly JsonSerializerSettings JsonDeserializerSettingsWithDateParsingNone = new()
+    internal static readonly JsonSerializerSettings JsonDeserializerSettingsWithDateParsingNone = new()
     {
         DateParseHandling = DateParseHandling.None
     };
 
-    public static readonly JsonSerializerSettings JsonSerializerSettingsPact = new()
+    internal static readonly JsonSerializerSettings JsonSerializerSettingsPact = new()
     {
         Formatting = Formatting.Indented,
         NullValueHandling = NullValueHandling.Ignore,

src/WireMock.Net.Shared/Settings/WireMockServerSettings.cs

@@ -14,6 +14,8 @@ using WireMock.RegularExpressions;
 using WireMock.Types;
 using System.Globalization;
 using WireMock.Models;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
 
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
@@ -349,4 +351,14 @@ public class WireMockServerSettings
     /// </remarks>
     [PublicAPI]
     public ActivityTracingOptions? ActivityTracingOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default JSON converter used for serialization.
+    /// </summary>
+    /// <remarks>
+    /// Set this property to customize how objects are serialized to and deserialized from JSON during mapping.
+    /// Default is <see cref="NewtonsoftJsonConverter"/>.
+    /// </remarks>
+    [PublicAPI]
+    public IJsonConverter DefaultJsonSerializer { get; set; } = new NewtonsoftJsonConverter();
 }

src/WireMock.Net.Shared/WireMock.Net.Shared.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Shared interfaces, models, enumerations and types.</Description>
         <Authors>Stef Heyenrath</Authors>
@@ -48,9 +48,10 @@
         </PackageReference>
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
         <PackageReference Include="AnyOf" Version="0.4.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />-->
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.0" />
-        <PackageReference Include="JsonConverter.Abstractions" Version="0.7.0" />
+        <!--<PackageReference Include="JsonConverter.Abstractions" Version="0.8.0" />-->
+        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.8.0" />
     </ItemGroup>
 
     <ItemGroup>

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs

@@ -4,6 +4,7 @@ using System;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
+using JsonConverter.Newtonsoft.Json;
 using Moq;
 using Newtonsoft.Json.Linq;
 using NFluent;
@@ -316,12 +317,11 @@ public class ResponseWithBodyTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request1, _settings).ConfigureAwait(false);
 
         Check.That(response.Message.StatusCode).IsEqualTo(200);
-        Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted.");
+        Check.That(response.Message.BodyData?.BodyAsString).Contains("File deleted.");
     }
 
-#if !(NET451 || NET452)
     [Fact]
-    public async Task Response_ProvideResponse_WithBody_IJsonConverter_SystemTextJson()
+    public async Task Response_ProvideResponse_WithBody_NewtonsoftJsonConverter()
     {
         // Arrange
         var requestBody = new BodyData
@@ -331,13 +331,34 @@ public class ResponseWithBodyTests
         };
         var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, requestBody);
 
-        var responseBuilder = Response.Create().WithBody(new { foo = "bar", n = 42 }, new JsonConverter.System.Text.Json.SystemTextJsonConverter());
+        var responseBuilder = Response.Create().WithBody(new { foo = "< > & ' 😀 👍 ❤️", n = 42 }, new NewtonsoftJsonConverter());
 
         // Act
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        response.Message.BodyData!.BodyAsString.Should().Be(@"{""foo"":""bar"",""n"":42}");
+        response.Message.BodyData!.BodyAsString.Should().Be("""{"foo":"< > & ' 😀 👍 ❤️","n":42}""");
+    }
+
+#if !(NET451 || NET452 || NET461)
+    [Fact]
+    public async Task Response_ProvideResponse_WithBody_SystemTextJsonConverter()
+    {
+        // Arrange
+        var requestBody = new BodyData
+        {
+            DetectedBodyType = BodyType.String,
+            BodyAsString = "abc"
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, requestBody);
+
+        var responseBuilder = Response.Create().WithBody(new { foo = "< > & ' 😀 👍 ❤️", n = 42 }, new JsonConverter.System.Text.Json.SystemTextJsonConverter());
+
+        // Act
+        var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
+
+        // Assert
+        response.Message.BodyData!.BodyAsString.Should().Be("""{"foo":"\u003C \u003E \u0026 \u0027 \uD83D\uDE00 \uD83D\uDC4D \u2764\uFE0F","n":42}""");
     }
 #endif
 }

test/WireMock.Net.Tests/Serialization/MappingSerializerTests.cs

@@ -0,0 +1,326 @@
+// Copyright © WireMock.Net
+
+using System;
+using FluentAssertions;
+using JsonConverter.Newtonsoft.Json;
+using WireMock.Admin.Mappings;
+using WireMock.Serialization;
+using Xunit;
+#if NET8_0_OR_GREATER
+using JsonConverter.System.Text.Json;
+#endif
+
+namespace WireMock.Net.Tests.Serialization;
+
+public class MappingSerializerTests
+{
+    private const string SingleMappingJson =
+        """
+        {
+            "Guid": "12345678-1234-1234-1234-123456789012",
+            "Priority": 1,
+            "Request": {
+                "Path": "/test"
+            },
+            "Response": {
+                "StatusCode": 200
+            }
+        }
+        """;
+
+    private const string ArrayMappingJson =
+        """
+        [
+            {
+                "Guid": "12345678-1234-1234-1234-123456789012",
+                "Priority": 1,
+                "Request": {
+                    "Path": "/test1"
+                },
+                "Response": {
+                    "StatusCode": 200
+                }
+            },
+            {
+                "Guid": "87654321-4321-4321-4321-210987654321",
+                "Priority": 2,
+                "Request": {
+                    "Path": "/test2"
+                },
+                "Response": {
+                    "StatusCode": 404
+                }
+            }
+        ]
+        """;
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_SingleObject_ShouldReturnArray()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(SingleMappingJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(1);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Priority.Should().Be(1);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_Array_ShouldReturnArray()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(ArrayMappingJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(2);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Priority.Should().Be(1);
+        result[1].Guid.Should().Be(Guid.Parse("87654321-4321-4321-4321-210987654321"));
+        result[1].Priority.Should().Be(2);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_EmptyArray_ShouldReturnEmptyArray()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var emptyArrayJson = "[]";
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(emptyArrayJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().BeEmpty();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_InvalidJson_ShouldThrowException()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var invalidJson = "not valid json";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(invalidJson);
+
+        // Assert
+        act.Should().Throw<Exception>();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_ComplexMapping_ShouldDeserializeCorrectly()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var complexJson =
+            """
+            {
+                "Guid": "12345678-1234-1234-1234-123456789012",
+                "Title": "Test Mapping",
+                "Description": "A test mapping",
+                "Priority": 10,
+                "Request": {
+                    "Path": "/api/test",
+                    "Methods": ["GET", "POST"]
+                },
+                "Response": {
+                    "StatusCode": 201,
+                    "Body": "Test Response"
+                }
+            }
+            """;
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(complexJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(1);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Title.Should().Be("Test Mapping");
+        result[0].Description.Should().Be("A test mapping");
+        result[0].Priority.Should().Be(10);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_NullValue_ShouldThrowException()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var nullJson = "null";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(nullJson);
+
+        // Assert
+        act.Should().Throw<Exception>();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithNewtonsoftJson_PrimitiveValue_ShouldThrowInvalidOperationException()
+    {
+        // Arrange
+        var jsonConverter = new NewtonsoftJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var primitiveJson = "\"string value\"";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(primitiveJson);
+
+        // Assert
+        act.Should().Throw<InvalidOperationException>()
+            .WithMessage("Cannot deserialize the provided value to an array or object.");
+    }
+
+#if NET8_0_OR_GREATER
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_SingleObject_ShouldReturnArray()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(SingleMappingJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(1);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Priority.Should().Be(1);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_Array_ShouldReturnArray()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(ArrayMappingJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(2);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Priority.Should().Be(1);
+        result[1].Guid.Should().Be(Guid.Parse("87654321-4321-4321-4321-210987654321"));
+        result[1].Priority.Should().Be(2);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_EmptyArray_ShouldReturnEmptyArray()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var emptyArrayJson = "[]";
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(emptyArrayJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().BeEmpty();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_InvalidJson_ShouldThrowException()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var invalidJson = "not valid json";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(invalidJson);
+
+        // Assert
+        act.Should().Throw<Exception>();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_ComplexMapping_ShouldDeserializeCorrectly()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var complexJson =
+            """
+            {
+                "Guid": "12345678-1234-1234-1234-123456789012",
+                "Title": "Test Mapping",
+                "Description": "A test mapping",
+                "Priority": 10,
+                "Request": {
+                    "Path": "/api/test",
+                    "Methods": ["GET", "POST"]
+                },
+                "Response": {
+                    "StatusCode": 201,
+                    "Body": "Test Response"
+                }
+            }
+            """;
+
+        // Act
+        var result = serializer.DeserializeJsonToArray<MappingModel>(complexJson);
+
+        // Assert
+        result.Should().NotBeNull();
+        result.Should().HaveCount(1);
+        result[0].Guid.Should().Be(Guid.Parse("12345678-1234-1234-1234-123456789012"));
+        result[0].Title.Should().Be("Test Mapping");
+        result[0].Description.Should().Be("A test mapping");
+        result[0].Priority.Should().Be(10);
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_NullValue_ShouldThrowException()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var nullJson = "null";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(nullJson);
+
+        // Assert
+        act.Should().Throw<Exception>();
+    }
+
+    [Fact]
+    public void MappingSerializer_DeserializeJsonToArray_WithSystemTextJson_PrimitiveValue_ShouldThrowInvalidOperationException()
+    {
+        // Arrange
+        var jsonConverter = new SystemTextJsonConverter();
+        var serializer = new MappingSerializer(jsonConverter);
+        var primitiveJson = "\"string value\"";
+
+        // Act
+        Action act = () => serializer.DeserializeJsonToArray<MappingModel>(primitiveJson);
+
+        // Assert
+        act.Should().Throw<InvalidOperationException>()
+            .WithMessage("Cannot deserialize the provided value to an array or object.");
+    }
+#endif
+}

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
@@ -107,7 +107,7 @@
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net452'">
         <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
-        <PackageReference Include="JsonConverter.System.Text.Json" Version="0.7.0" />
+        <!--<PackageReference Include="JsonConverter.System.Text.Json" Version="0.8.0" />-->
         <PackageReference Include="Google.Protobuf" Version="3.25.1" />
         <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
         <PackageReference Include="Grpc.Tools" Version="2.60.0">

test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -34,11 +33,10 @@ public partial class WireMockServerTests
             Request.Create()
                 .WithPath("/a")
                 .WithBody(
-                    new IMatcher[]
+                    [
-                    {
                         new JmesPathMatcher("requestId == '1'"),
                         new JmesPathMatcher("value == 'A'")
-                    },
+                    ],
                     MatchOperator.And
                 )
                 .UsingPost()
@@ -49,11 +47,10 @@ public partial class WireMockServerTests
                 Request.Create()
                     .WithPath("/a")
                     .WithBody(
-                        new IMatcher[]
+                        [
-                        {
                             new JmesPathMatcher("requestId == '2'"),
                             new JmesPathMatcher("value == 'A'")
-                        },
+                        ],
                         MatchOperator.And
                     )
                     .UsingPost()
@@ -81,12 +78,11 @@ public partial class WireMockServerTests
                 Request.Create()
                     .WithPath("/a")
                     .WithBody(
-                        new IMatcher[]
+                        [
-                        {
                             new JmesPathMatcher("extra == 'X'"),
                             new JmesPathMatcher("requestId == '1'"),
                             new JmesPathMatcher("value == 'A'")
-                        },
+                        ],
                         MatchOperator.And
                     )
                     .UsingPost()
@@ -98,11 +94,10 @@ public partial class WireMockServerTests
                 Request.Create()
                     .WithPath("/a")
                     .WithBody(
-                        new IMatcher[]
+                        [
-                        {
                             new JmesPathMatcher("requestId == '1'"),
                             new JmesPathMatcher("value == 'A'")
-                        },
+                        ],
                         MatchOperator.And
                     )
                     .UsingPost()
@@ -188,6 +183,7 @@ public partial class WireMockServerTests
                       {"jsonrpc":"2.0","id":"{{request.bodyAsJson.id}}","result":{"protocolVersion":"2024-11-05","capabilities":{"logging":{},"prompts":{"listChanged":true},"resources":{"subscribe":true,"listChanged":true},"tools":{"listChanged":true}},"serverInfo":{"name":"ExampleServer","version":"1.0.0"}}}
                       """)
             .WithStatusCode(200)
+            .WithTransformer(true)
         );
 
         // Act
@@ -199,15 +195,47 @@ public partial class WireMockServerTests
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
 
-        var responseText = await response.RequestMessage!.Content!.ReadAsStringAsync();
+        var responseText = await response.Content.ReadAsStringAsync();
         responseText.Should().Contain("ec475f56d4694b48bc737500ba575b35-1");
     }
 
+#if NET6_0_OR_GREATER
+    [Fact]
+    public async Task WireMockServer_WithBodyAsJson_Using_PostAsync_And_JsonPartialWildcardMatcher_And_SystemTextJson_ShouldMatch()
+    {
+        // Arrange
+        using var server = WireMockServer.Start(x => x.DefaultJsonSerializer = new JsonConverter.System.Text.Json.SystemTextJsonConverter() );
+
+        var matcher = new JsonPartialWildcardMatcher(new { id = "^[a-f0-9]{32}-[0-9]$" }, ignoreCase: true, regex: true);
+        server.Given(Request.Create()
+            .WithHeader("Content-Type", "application/json*")
+            .UsingPost()
+            .WithPath("/system-text-json")
+            .WithBody(matcher)
+        )
+        .RespondWith(Response.Create()
+            .WithBody("OK")
+        );
+
+        // Act
+        var content = """{"id":"ec475f56d4694b48bc737500ba575b35-1"}""";
+        var response = await new HttpClient()
+            .PostAsync($"{server.Url}/system-text-json", new StringContent(content, Encoding.UTF8, "application/json"))
+            .ConfigureAwait(false);
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+
+        var responseText = await response.Content.ReadAsStringAsync();
+        responseText.Should().Contain("OK");
+    }
+#endif
+
     [Fact]
     public async Task WireMockServer_WithBodyAsFormUrlEncoded_Using_PostAsync_And_WithFunc()
     {
         // Arrange
-        var server = WireMockServer.Start();
+        using var server = WireMockServer.Start();
         server.Given(
             Request.Create()
                 .UsingPost()
@@ -219,7 +247,7 @@ public partial class WireMockServerTests
             );
 
         // Act
-        var content = new FormUrlEncodedContent(new[] { new KeyValuePair<string, string>("key1", "value1") });
+        var content = new FormUrlEncodedContent([new KeyValuePair<string, string>("key1", "value1")]);
         var response = await new HttpClient()
             .PostAsync($"{server.Url}/foo", content)
             .ConfigureAwait(false);