...

CHANGELOG.md

@@ -1,26 +1,3 @@
-# 1.5.52 (06 April 2024)
-- [#1091](https://github.com/WireMock-Net/WireMock.Net/pull/1091) - Add RegEx support to JsonMatcher [feature] contributed by [StefH](https://github.com/StefH)
-- [#1088](https://github.com/WireMock-Net/WireMock.Net/issues/1088) - Regex support for JsonMatcher  [feature]
-
-# 1.5.51 (20 March 2024)
-- [#1085](https://github.com/WireMock-Net/WireMock.Net/pull/1085) - Fix FluentAssertions (actual body is not displayed in error message) [bug] contributed by [StefH](https://github.com/StefH)
-- [#1084](https://github.com/WireMock-Net/WireMock.Net/issues/1084) - FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]
-
-# 1.5.50 (12 March 2024)
-- [#1080](https://github.com/WireMock-Net/WireMock.Net/pull/1080) - Fix FluentAssertions on Header(s) [bug] contributed by [StefH](https://github.com/StefH)
-- [#1082](https://github.com/WireMock-Net/WireMock.Net/pull/1082) - Make WireMockAssertions extendable [feature] contributed by [StefH](https://github.com/StefH)
-- [#1074](https://github.com/WireMock-Net/WireMock.Net/issues/1074) - FluentAssertions extensions do not filter headers correctly [bug]
-- [#1075](https://github.com/WireMock-Net/WireMock.Net/issues/1075) - FluentAssertions extensions are not open for extension [feature]
-
-# 1.5.49 (06 March 2024)
-- [#1069](https://github.com/WireMock-Net/WireMock.Net/pull/1069) - Extend TypeLoader [feature] contributed by [StefH](https://github.com/StefH)
-- [#1078](https://github.com/WireMock-Net/WireMock.Net/pull/1078) - Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug] contributed by [StefH](https://github.com/StefH)
-- [#1077](https://github.com/WireMock-Net/WireMock.Net/issues/1077) - ProtoBufMatcher not working when proto package name contains dots [bug]
-
-# 1.5.48 (22 February 2024)
-- [#1047](https://github.com/WireMock-Net/WireMock.Net/pull/1047) - Add Grpc ProtoBuf support (request-response) [feature] contributed by [StefH](https://github.com/StefH)
-- [#1058](https://github.com/WireMock-Net/WireMock.Net/pull/1058) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)
-
 # 1.5.47 (25 January 2024)
 - [#1049](https://github.com/WireMock-Net/WireMock.Net/pull/1049) - Add WithoutHeader to WireMock.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
 - [#1053](https://github.com/WireMock-Net/WireMock.Net/pull/1053) - [Snyk] Security upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect from 6.12.2 to 6.34.0 [security] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.52</VersionPrefix>
+        <VersionPrefix>1.5.47</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.52
+SET version=1.5.47
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate example --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,5 +1,10 @@
-# 1.5.52 (06 April 2024)
+# 1.5.47 (25 January 2024)
-- #1091 Add RegEx support to JsonMatcher [feature]
+- #1049 Add WithoutHeader to WireMock.FluentAssertions [feature]
-- #1088 Regex support for JsonMatcher  [feature]
+- #1053 [Snyk] Security upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect from 6.12.2 to 6.34.0 [security]
+- #1055 Bump System.IdentityModel.Tokens.Jwt from 6.25.0 to 6.34.0 in /examples/WireMock.Net.Console.Net472.Classic [example]
+- #1057 Pin the version from Testcontainers to 3.7.0 in WireMock.Net.Testcontainers [bug]
+- #1048 WithoutHeader fluent assertion [feature]
+- #1054 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 1) [bug]
+- #1059 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 2) [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -17,7 +17,6 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 ## :memo: Blogs
 - [mstack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode/)
 - [mstack.nl : Chaos Engineering with Fault Injections](https://mstack.nl/blogs/wiremock-net-chaos-engineering-with-fault-injections/)
-- [mstack.nl : gRPC / ProtoBuf Support](https://mstack.nl/blogs/wiremock-net-grpc/)
 
 
 ## :computer: Project Info
@@ -92,3 +91,4 @@ For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-
 
 #### HTTPS / SSL
 More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+

WireMock.Net Solution.sln

@@ -112,8 +112,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET8",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{7FC0B409-2682-40EE-B3B9-3930D6769D01}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.GrpcClient", "examples\WireMock.Net.Console.GrpcClient\WireMock.Net.Console.GrpcClient.csproj", "{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -264,10 +262,6 @@ Global
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -311,7 +305,6 @@ Global
 		{941229D6-191B-4B5E-AC81-0905EBF4F19D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

WireMock.Net Solution.sln.DotSettings

@@ -23,17 +23,14 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dlls/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grpc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=protobuf/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>

examples/WireMock.Net.Console.GrpcClient/Program.cs

@@ -1,21 +0,0 @@
-using Greet;
-using Grpc.Net.Client;
-
-namespace WireMock.Net.Console.GrpcClient;
-
-internal class Program
-{
-    static async Task Main(string[] args)
-    {
-        var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc3", new GrpcChannelOptions
-        {
-            Credentials = Grpc.Core.ChannelCredentials.Insecure
-        });
-
-        var client = new Greeter.GreeterClient(channel);
-
-        var reply = await client.SayHelloAsync(new HelloRequest { Name = "stef" });
-
-        System.Console.WriteLine("Greeting: " + reply.Message);
-    }
-}

examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Protobuf Include="greet.proto" GrpcServices="Client" />
-    </ItemGroup>
-
-</Project>

examples/WireMock.Net.Console.GrpcClient/greet.proto

@@ -1,33 +0,0 @@
-// Copyright 2019 The gRPC Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package greet;
-
-// The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply);
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-  string message = 1;
-}

examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs

@@ -1,8 +1,6 @@
 using System.Net;
-using System.Net.Http.Headers;
 using System.Text;
 using FluentAssertions;
-using MimeKit;
 using WireMock.Logging;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -20,90 +18,17 @@ internal class Program
             Logger = new WireMockConsoleLogger(),
         });
 
-        server
+        server.Given(Request.Create().UsingPost().WithPath("/some/endpoint"))
-            .Given(Request.Create()
+            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.Created));
-                .UsingPost()
-                .WithPath("/test")
-            )
-            .RespondWith(Response.Create()
-                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage != null ?
-                    "BodyAsMimeMessage is present" :
-                    "BodyAsMimeMessage is not present")
-        );
 
-        server
+        var httpClient = new HttpClient { BaseAddress = new Uri(server.Url!) };
-            .Given(Request.Create()
+        var requestUri = new Uri(httpClient.BaseAddress!, "some/endpoint");
-                .UsingPost()
+        var content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
-                .WithPath("/some/endpoint")
-            )
-            .RespondWith(Response.Create()
-                .WithStatusCode(HttpStatusCode.Created)
-            );
-
-        var httpClient = server.CreateClient();
-        var content = new StringContent("abc", Encoding.UTF8, "application/json");
-
-        await TestAsync(httpClient, content);
-
-        await TestNoMultiPartAsync(httpClient, content);
-
-        await TestMultiPartAsync(server);
-    }
-
-    private static async Task TestNoMultiPartAsync(HttpClient httpClient, StringContent content)
-    {
-        var response = await httpClient.PostAsync("/test", content);
-
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is not present");
-    }
-
-    private static async Task TestAsync(HttpClient httpClient, StringContent content)
-    {
-        var response = await httpClient.PostAsync("some/endpoint", content);
-
-        response.StatusCode.Should().Be(HttpStatusCode.Created);
-        (await response.Content.ReadAsStringAsync()).Should().BeEmpty();
-    }
-
-    private static async Task TestMultiPartAsync(WireMockServer server)
-    {
-        var textPlainContent = "This is some plain text";
-        var textPlainContentType = "text/plain";
-
-        var textJson = "{ \"Key\" : \"Value\" }";
-        var textJsonContentType = "text/json";
-
-        var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
-
-        server
-            .Given(
-                Request.Create()
-                    .UsingPost()
-                    .WithPath("/multipart")
-            )
-            .RespondWith(Response.Create()
-                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage is MimeMessage mm ?
-                    "BodyAsMimeMessage is present: " + ((MimePart)mm.BodyParts.Last()).FileName :
-                    "BodyAsMimeMessage is not present")
-            );
 
         // Act
-        var formDataContent = new MultipartFormDataContent
+        var actual = await httpClient.PostAsync(requestUri, content);
-        {
-            { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
-            { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
-        };
 
-        var fileContent = new ByteArrayContent(imagePngBytes);
+        // Assert
-        fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+        actual.StatusCode.Should().Be(HttpStatusCode.Created);
-        formDataContent.Add(fileContent, "somefile", "image.png");
-
-        var client = server.CreateClient();
-
-        var response = await client.PostAsync("/multipart", formDataContent);
-
-        response.StatusCode.Should().Be(HttpStatusCode.OK);
-        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is present: image.png");
     }
 }

examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="WireMock.Net" Version="1.5.51" />
+    <PackageReference Include="WireMock.Net" Version="1.5.42" />
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
+      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -42,24 +42,6 @@ namespace WireMock.Net.ConsoleApplication
 
     public static class MainApp
     {
-        private const string ProtoDefinition = @"
-syntax = ""proto3"";
-
-package greet;
-
-service Greeter {
-  rpc SayHello (HelloRequest) returns (HelloReply);
-}
-
-message HelloRequest {
-  string name = 1;
-}
-
-message HelloReply {
-  string message = 1;
-}
-";
-
         private const string TestSchema = @"
   scalar DateTime
   scalar MyCustomScalar
@@ -133,14 +115,17 @@ message HelloReply {
                     .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
                 );
 
-            using var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
+            var httpClient = server.CreateClient();
+            //server.Stop();
+
+            var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
             {
                 HostingScheme = HostingScheme.HttpAndHttps,
                 Port = 12399
             });
             httpAndHttpsWithPort.Stop();
 
-            using var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
+            var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
             {
                 HostingScheme = HostingScheme.HttpAndHttps
             });
@@ -149,14 +134,11 @@ message HelloReply {
             string url1 = "http://localhost:9091/";
             string url2 = "http://localhost:9092/";
             string url3 = "https://localhost:9443/";
-            string urlGrpc = "grpc://localhost:9093/";
-            string urlGrpcSSL = "grpcs://localhost:9094/";
 
             server = WireMockServer.Start(new WireMockServerSettings
             {
-                // CorsPolicyOptions = CorsPolicyOptions.AllowAll,
                 AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1, url2, url3, urlGrpc, urlGrpcSSL },
+                Urls = new[] { url1, url2, url3 },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
                 SaveUnmatchedRequests = true,
@@ -189,91 +171,17 @@ message HelloReply {
             //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");
 
             // server.AllowPartialMapping();
-
-#if PROTOBUF
-            var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" });
-            server
-                .Given(Request.Create()
-                    .UsingPost()
-                    .WithHttpVersion("2")
-                    .WithPath("/grpc/greet.Greeter/SayHello")
-                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloRequest", protoBufJsonMatcher)
-                )
-                .RespondWith(Response.Create()
-                    .WithHeader("Content-Type", "application/grpc")
-                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloReply",
-                        new
-                        {
-                            message = "hello {{request.BodyAsJson.name}}"
-                        }
-                    )
-                    .WithTrailingHeader("grpc-status", "0")
-                    .WithTransformer()
-                );
-
-            server
-                .Given(Request.Create()
-                    .UsingPost()
-                    .WithHttpVersion("2")
-                    .WithPath("/grpc2/greet.Greeter/SayHello")
-                    .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
-                )
-                .WithProtoDefinition(ProtoDefinition)
-                .RespondWith(Response.Create()
-                    .WithHeader("Content-Type", "application/grpc")
-                    .WithBodyAsProtoBuf("greet.HelloReply",
-                        new
-                        {
-                            message = "hello {{request.BodyAsJson.name}}"
-                        }
-                    )
-                    .WithTrailingHeader("grpc-status", "0")
-                    .WithTransformer()
-                );
-
-            server
-                .AddProtoDefinition("my-greeter", ProtoDefinition)
-                .Given(Request.Create()
-                    .UsingPost()
-                    .WithPath("/grpc3/greet.Greeter/SayHello")
-                    .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
-                )
-                .WithProtoDefinition("my-greeter")
-                .RespondWith(Response.Create()
-                    .WithHeader("Content-Type", "application/grpc")
-                    .WithBodyAsProtoBuf("greet.HelloReply",
-                        new
-                        {
-                            message = "hello {{request.BodyAsJson.name}}"
-                        }
-                    )
-                    .WithTrailingHeader("grpc-status", "0")
-                    .WithTransformer()
-                );
-#endif
-
 #if GRAPHQL
             var customScalars = new Dictionary<string, Type> { { "MyCustomScalar", typeof(int) } };
             server
                 .Given(Request.Create()
                     .WithPath("/graphql")
                     .UsingPost()
-                    .WithBodyAsGraphQL(TestSchema, customScalars)
+                    .WithGraphQLSchema(TestSchema, customScalars)
                 )
                 .RespondWith(Response.Create()
                     .WithBody("GraphQL is ok")
                 );
-
-            //server
-            //    .AddGraphQLSchema("my-graphql", TestSchema, customScalars)
-            //    .Given(Request.Create()
-            //        .WithPath("/graphql2")
-            //        .UsingPost()
-            //    )
-            //    .WithGraphQLSchema("my-graphql")
-            //    .RespondWith(Response.Create()
-            //        .WithBody("GraphQL is ok")
-            //    );
 #endif
 
 #if MIMEKIT
@@ -428,8 +336,8 @@ message HelloReply {
                         Url = "http://localhost:9999",
                         ReplaceSettings = new ProxyUrlReplaceSettings
                         {
-                            OldValue = "old",
+                           OldValue = "old",
-                            NewValue = "new"
+                           NewValue = "new"
                         }
                     })
                 );

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

@@ -98,9 +98,4 @@ public class MappingModel
     /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
     /// </summary>
     public double? Probability { get; set; }
-
-    /// <summary>
-    /// The Grpc ProtoDefinition which is used for this mapping (request and response). [Optional]
-    /// </summary>
-    public string? ProtoDefinition { get; set; }
 }

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

@@ -48,7 +48,7 @@ public class MatcherModel
     /// </summary>
     public string? MatchOperator { get; set; }
 
-    #region JsonMatcher, JsonPartialMatcher and JsonPartialWildcardMatcher
+    #region JsonPartialMatcher and JsonPartialWildcardMatcher
     /// <summary>
     /// Support Regex.
     /// </summary>
@@ -70,22 +70,13 @@ public class MatcherModel
     /// ContentTransferEncoding Matcher (base64)
     /// </summary>
     public MatcherModel? ContentTransferEncodingMatcher { get; set; }
-    #endregion
 
-    #region MimePartMatcher + ProtoBufMatcher
     /// <summary>
     /// Content Matcher
     /// </summary>
     public MatcherModel? ContentMatcher { get; set; }
     #endregion
 
-    #region ProtoBufMatcher
-    /// <summary>
-    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
-    public string? ProtoBufMessageType { get; set; }
-    #endregion
-
     #region XPathMatcher
     /// <summary>
     /// Array of namespace prefix and uri. (optional)
@@ -95,7 +86,7 @@ public class MatcherModel
 
     #region GraphQLMatcher
     /// <summary>
-    /// Mapping of custom GraphQL Scalar name to ClrType. (optional)
+    /// Mapping of custom GraphQL Scalar name to ClrType.  (optional)
     /// </summary>
     public IDictionary<string, Type>? CustomScalars { get; set; }
     #endregion

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

@@ -28,11 +28,6 @@ public class RequestModel
     /// </summary>
     public string[]? Methods { get; set; }
 
-    /// <summary>
-    /// The HTTP Version
-    /// </summary>
-    public string? HttpVersion { get; set; }
-
     /// <summary>
     /// Reject on match for Methods.
     /// </summary>

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

@@ -35,7 +35,7 @@ public class ResponseModel
     public bool? BodyAsJsonIndented { get; set; }
 
     /// <summary>
-    /// Gets or sets the body (as byte array).
+    /// Gets or sets the body (as bytearray).
     /// </summary>
     public byte[]? BodyAsBytes { get; set; }
 
@@ -84,11 +84,6 @@ public class ResponseModel
     /// </summary>
     public string? HeadersRaw { get; set; }
 
-    /// <summary>
-    /// Gets or sets the Trailing Headers.
-    /// </summary>
-    public IDictionary<string, object>? TrailingHeaders { get; set; }
-
     /// <summary>
     /// Gets or sets the delay in milliseconds.
     /// </summary>
@@ -128,16 +123,4 @@ public class ResponseModel
     /// Gets or sets the WebProxy settings.
     /// </summary>
     public WebProxyModel? WebProxy { get; set; }
-
-    #region ProtoBuf
-    /// <summary>
-    /// Gets or sets the proto definition.
-    /// </summary>
-    public string? ProtoDefinition { get; set; }
-
-    /// <summary>
-    /// Gets or sets the full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
-    public string? ProtoBufMessageType { get; set; }
-    #endregion
 }

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs

@@ -55,11 +55,6 @@ public class LogRequestModel
     /// </summary>
     public string Method { get; set; }
 
-    /// <summary>
-    /// The HTTP Version.
-    /// </summary>
-    public string HttpVersion { get; set; } = null!;
-
     /// <summary>
     /// The Headers.
     /// </summary>

src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Types;
 
@@ -116,11 +114,6 @@ public class SettingsModel
     /// </summary>
     public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 
-    /// <summary>
-    /// A list of Grpc ProtoDefinitions which can be used.
-    /// </summary>
-    public Dictionary<string, string>? ProtoDefinitions { get; set; }
-
 #if NETSTANDARD1_3_OR_GREATER || NET461
     /// <summary>
     /// Server client certificate mode

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -63,11 +63,6 @@ public interface IRequestMessage
     /// </summary>
     string Method { get; }
 
-    /// <summary>
-    /// Gets the HTTP Version.
-    /// </summary>
-    string HttpVersion { get; }
-
     /// <summary>
     /// Gets the headers.
     /// </summary>
@@ -99,27 +94,23 @@ public interface IRequestMessage
     IBodyData? BodyData { get; }
 
     /// <summary>
-    /// The original body as string.
+    /// The original body as string. Convenience getter for Handlebars and WireMockAssertions.
-    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     string? Body { get; }
 
     /// <summary>
-    /// The body (as JSON object).
+    /// The body (as JSON object). Convenience getter for Handlebars and WireMockAssertions.
-    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     object? BodyAsJson { get; }
 
     /// <summary>
-    /// The body (as bytearray).
+    /// The body (as bytearray). Convenience getter for Handlebars and WireMockAssertions.
-    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     byte[]? BodyAsBytes { get; }
 
 #if MIMEKIT
     /// <summary>
-    /// The original body as MimeMessage.
+    /// The original body as MimeMessage. Convenience getter for Handlebars and WireMockAssertions.
-    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     object? BodyAsMimeMessage { get; }
 #endif

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -40,16 +40,11 @@ public interface IResponseMessage
     /// </summary>
     IDictionary<string, WireMockList<string>>? Headers { get; }
 
-    /// <summary>
-    /// Gets the trailing headers.
-    /// </summary>
-    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; }
-
     /// <summary>
     /// Gets or sets the status code.
     /// </summary>
     object? StatusCode { get; }
-
+    
     /// <summary>
     /// Adds the header.
     /// </summary>
@@ -57,24 +52,10 @@ public interface IResponseMessage
     /// <param name="value">The value.</param>
     void AddHeader(string name, string value);
 
-    /// <summary>
-    /// Adds the trailing header.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="values">The values.</param>
-    void AddHeader(string name, params string[] values);
-
-    /// <summary>
-    /// Adds the trailing header.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="value">The value.</param>
-    void AddTrailingHeader(string name, string value);
-
     /// <summary>
     /// Adds the header.
     /// </summary>
     /// <param name="name">The name.</param>
     /// <param name="values">The values.</param>
-    void AddTrailingHeader(string name, params string[] values);
+    void AddHeader(string name, params string[] values);
 }

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

@@ -1,10 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
-using WireMock.Models;
 using WireMock.Types;
 
-// ReSharper disable once CheckNamespace
 namespace WireMock.Util;
 
 /// <summary>
@@ -13,7 +10,7 @@ namespace WireMock.Util;
 public interface IBodyData
 {
     /// <summary>
-    /// The body (as byte array).
+    /// The body (as bytearray).
     /// </summary>
     byte[]? BodyAsBytes { get; set; }
 
@@ -29,7 +26,6 @@ public interface IBodyData
 
     /// <summary>
     /// The body (as JSON object).
-    /// Also used for ProtoBuf.
     /// </summary>
     object? BodyAsJson { get; set; }
 
@@ -72,16 +68,4 @@ public interface IBodyData
     /// Defines if this BodyData is the result of a dynamically created response-string. (
     /// </summary>
     public string? IsFuncUsed { get; set; }
-
-    #region ProtoBuf
-    /// <summary>
-    /// Gets or sets the proto definition.
-    /// </summary>
-    public Func<IdOrText>? ProtoDefinition { get; set; }
-
-    /// <summary>
-    /// Gets or sets the full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
-    public string? ProtoBufMessageType { get; set; }
-    #endregion
 }

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

@@ -1,33 +0,0 @@
-namespace WireMock.Models;
-
-/// <summary>
-/// A structure defining an (optional) Id and a Text.
-/// </summary>
-public readonly struct IdOrText
-{
-    /// <summary>
-    /// The Id [optional].
-    /// </summary>
-    public string? Id { get; }
-
-    /// <summary>
-    /// The Text.
-    /// </summary>
-    public string Text { get; }
-
-    /// <summary>
-    /// When Id is defined, return the Id, else the Text.
-    /// </summary>
-    public string Value => Id ?? Text;
-
-    /// <summary>
-    /// Create a IdOrText
-    /// </summary>
-    /// <param name="id">The Id [optional]</param>
-    /// <param name="text">The Text.</param>
-    public IdOrText(string? id, string text)
-    {
-        Id = id;
-        Text = text;
-    }
-}

src/WireMock.Net.Abstractions/Types/BodyType.cs

@@ -38,10 +38,5 @@ public enum BodyType
     /// <summary>
     /// Body is a String which is x-www-form-urlencoded.
     /// </summary>
-    FormUrlEncoded,
+    FormUrlEncoded
-
-    /// <summary>
-    /// Body is a ProtoBuf Byte array
-    /// </summary>
-    ProtoBuf
 }

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -31,7 +31,7 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
+        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>

src/WireMock.Net.FluentAssertions/Assertions/WireMockANumberOfCallsAssertions.cs

@@ -2,34 +2,22 @@ using Stef.Validation;
 using WireMock.Server;
 
 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.FluentAssertions
-
-/// <summary>
-/// Provides assertion methods to verify the number of calls made to a WireMock server.
-/// This class is used in the context of FluentAssertions.
-/// </summary>
-public class WireMockANumberOfCallsAssertions
 {
-    private readonly IWireMockServer _server;
+    public class WireMockANumberOfCallsAssertions
-    private readonly int _callsCount;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockANumberOfCallsAssertions"/> class.
-    /// </summary>
-    /// <param name="server">The WireMock server to assert against.</param>
-    /// <param name="callsCount">The expected number of calls to assert.</param>
-    public WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount)
     {
-        _server = Guard.NotNull(server);
+        private readonly IWireMockServer _server;
-        _callsCount = callsCount;
+        private readonly int _callsCount;
-    }
 
-    /// <summary>
+        public WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount)
-    /// Returns an instance of <see cref="WireMockAssertions"/> which can be used to assert the expected number of calls.
+        {
-    /// </summary>
+            _server = Guard.NotNull(server);
-    /// <returns>A <see cref="WireMockAssertions"/> instance for asserting the number of calls to the server.</returns>
+            _callsCount = callsCount;
-    public WireMockAssertions Calls()
+        }
-    {
+
-        return new WireMockAssertions(_server, _callsCount);
+        public WireMockAssertions Calls()
+        {
+            return new WireMockAssertions(_server, _callsCount);
+        }
     }
 }

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

@@ -1,60 +0,0 @@
-#pragma warning disable CS1591
-using System;
-
-// ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
-
-public partial class WireMockAssertions
-{
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
-                absoluteUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => absoluteUrl,
-                requests => requests.Select(request => request.AbsoluteUrl)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
-                url
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => url,
-                requests => requests.Select(request => request.Url)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
-    }
-}

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

@@ -1,33 +0,0 @@
-#pragma warning disable CS1591
-using System;
-
-// ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
-
-public partial class WireMockAssertions
-{
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
-                clientIP
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
-                _ => clientIP, requests => requests.Select(request => request.ClientIP)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
-    }
-}

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

@@ -58,8 +58,8 @@ public partial class WireMockAssertions
 
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
+            .Given(() => _requestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
                 method
@@ -72,7 +72,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(request => request.Method)
             );
 
-        FilterRequestMessages(filter);
+        _requestMessages = filter(_requestMessages).ToList();
 
         return new AndConstraint<WireMockAssertions>(this);
     }

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

@@ -1,12 +1,7 @@
 #pragma warning disable CS1591
 using System;
 using System.Collections.Generic;
-using AnyOfTypes;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using WireMock.Extensions;
 using WireMock.Matchers;
-using WireMock.Models;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
@@ -14,7 +9,7 @@ namespace WireMock.FluentAssertions;
 public partial class WireMockAssertions
 {
     private const string MessageFormatNoCalls = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but no calls were made.";
-    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body/bodies {1}.";
+    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body {1}.";
 
     [CustomAssertion]
     public AndConstraint<WireMockAssertions> WithBody(string body, string because = "", params object[] becauseArgs)
@@ -49,11 +44,11 @@ public partial class WireMockAssertions
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IValueMatcher matcher, string because = "", params object[] becauseArgs)
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
 
-        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
+        return ExecuteAssertionWithBodyAsJsonValueMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
     }
 
     [CustomAssertion]
@@ -61,7 +56,7 @@ public partial class WireMockAssertions
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsBytes, matcher);
 
-        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
+        return ExecuteAssertionWithBodyAsBytesExactObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
     }
 
     private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyStringMatcher(
@@ -75,27 +70,27 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
+            .Given(() => _requestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                FormatBody(matcher.GetPatterns())
+                matcher.GetPatterns()
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => FormatBody(matcher.GetPatterns()),
+                _ => matcher.GetPatterns(),
-                requests => FormatBodies(requests.Select(expression))
+                requests => requests.Select(expression)
             );
 
-        FilterRequestMessages(filter);
+        _requestMessages = filter(_requestMessages).ToList();
 
         return new AndConstraint<WireMockAssertions>(this);
     }
 
-    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsIObjectMatcher(
+    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsJsonValueMatcher(
-        IObjectMatcher matcher,
+        IValueMatcher matcher,
         string because,
         object[] becauseArgs,
         Func<IReadOnlyList<IRequestMessage>, bool> condition,
@@ -105,41 +100,52 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
+            .Given(() => _requestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                FormatBody(matcher.Value)
+                matcher.Value
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => FormatBody(matcher.Value),
+                _ => matcher.Value,
-                requests => FormatBodies(requests.Select(expression))
+                requests => requests.Select(expression)
             );
 
-        FilterRequestMessages(filter);
+        _requestMessages = filter(_requestMessages).ToList();
 
         return new AndConstraint<WireMockAssertions>(this);
     }
 
-    private static string? FormatBody(object? body)
+    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsBytesExactObjectMatcher(
+        ExactObjectMatcher matcher,
+        string because,
+        object[] becauseArgs,
+        Func<IReadOnlyList<IRequestMessage>, bool> condition,
+        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter,
+        Func<IRequestMessage, object?> expression
+    )
     {
-        return body switch
+        Execute.Assertion
-        {
+            .BecauseOf(because, becauseArgs)
-            null => null,
+            .Given(() => _requestMessages)
-            string str => str,
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
+            .FailWith(
-            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
+                MessageFormatNoCalls,
-            JToken jToken => jToken.ToString(Formatting.None),
+                matcher.ValueAsObject ?? matcher.ValueAsBytes
-            _ => JToken.FromObject(body).ToString(Formatting.None)
+            )
-        };
+            .Then
-    }
+            .ForCondition(condition)
+            .FailWith(
+                MessageFormat,
+                _ => matcher.ValueAsObject ?? matcher.ValueAsBytes,
+                requests => requests.Select(expression)
+            );
 
-    private static string? FormatBodies(IEnumerable<object?> bodies)
+        _requestMessages = filter(_requestMessages).ToList();
-    {
+
-        var valueAsArray = bodies as object[] ?? bodies.ToArray();
+        return new AndConstraint<WireMockAssertions>(this);
-        return valueAsArray.Length == 1 ? FormatBody(valueAsArray.First()) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
     }
 }

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

@@ -1,157 +0,0 @@
-#pragma warning disable CS1591
-using System.Collections.Generic;
-using WireMock.Types;
-
-// ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
-
-public partial class WireMockAssertions
-{
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request =>
-        {
-            return request.Headers?.Any(h => h.Key == expectedKey) == true;
-        });
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with Header {0}{reason}.",
-                expectedKey
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with Header {0}{reason}, but didn't find it among the calls with Header(s) {1}.",
-                _ => expectedKey,
-                requests => requests.Select(request => request.Headers)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, expectedKey);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request =>
-        {
-            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
-
-            var matchingHeaderValues = headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
-
-            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
-            {
-                return matchingHeaderValues[0] == expectedValues[0];
-            }
-
-            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
-            return expectedValues.Any(trimmedHeaderValues.Contains);
-        });
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}.",
-                expectedKey,
-                expectedValues
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}, but didn't find it among the calls with Header(s) {2}.",
-                _ => expectedKey,
-                _ => expectedValues,
-                requests => requests.Select(request => request.Headers)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request =>
-        {
-            return request.Headers?.Any(h => h.Key == unexpectedKey) != true;
-        });
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}.",
-                unexpectedKey
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}, but found it among the calls with Header(s) {1}.",
-                _ => unexpectedKey,
-                requests => requests.Select(request => request.Headers)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request =>
-        {
-            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
-
-            var matchingHeaderValues = headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
-
-            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
-            {
-                return matchingHeaderValues[0] != expectedValues[0];
-            }
-
-            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
-            return !expectedValues.Any(trimmedHeaderValues.Contains);
-        });
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}.",
-                unexpectedKey,
-                expectedValues
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}, but found it among the calls with Header(s) {2}.",
-                _ => unexpectedKey,
-                _ => expectedValues,
-                requests => requests.Select(request => request.Headers)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-}

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

@@ -1,34 +0,0 @@
-#pragma warning disable CS1591
-using System;
-
-// ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
-
-public partial class WireMockAssertions
-{
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => RequestMessages)
-            .ForCondition(requests => CallsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
-                proxyUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
-                _ => proxyUrl,
-                requests => requests.Select(request => request.ProxyUrl)
-            );
-
-        FilterRequestMessages(filter);
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
-    }
-}

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

@@ -3,42 +3,220 @@ using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;
+using WireMock.Types;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
 public partial class WireMockAssertions
 {
-    public const string Any = "*";
+    private const string Any = "*";
-
+    private readonly int? _callsCount;
-    public int? CallsCount { get; }
+    private IReadOnlyList<IRequestMessage> _requestMessages;
-    public IReadOnlyList<IRequestMessage> RequestMessages { get; private set; }
+    private readonly IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;
 
     public WireMockAssertions(IWireMockServer subject, int? callsCount)
     {
-        CallsCount = callsCount;
+        _callsCount = callsCount;
-        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        _requestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        _headers = _requestMessages.SelectMany(req => req.Headers).ToList();
     }
 
-    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+                absoluteUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl)
+            );
+
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
+                url
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => url,
+                requests => requests.Select(request => request.Url)
+            );
+
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
+                proxyUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
+                _ => proxyUrl,
+                requests => requests.Select(request => request.ProxyUrl)
+            );
+
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
+                clientIP
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
+                _ => clientIP, requests => requests.Select(request => request.ClientIP)
+            );
+
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
+    {
+        using (new AssertionScope("headers from requests sent"))
+        {
+            _headers.Select(h => h.Key).Should().Contain(expectedKey, because, becauseArgs);
+        }
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
+        {
+            var matchingHeaderValues = _headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray())
+                .ToArray();
+
+            if (expectedValues.Length == 1)
+            {
+                matchingHeaderValues.Should().Contain(expectedValues.First(), because, becauseArgs);
+            }
+            else
+            {
+                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
+                foreach (var expectedValue in expectedValues)
+                {
+                    trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);
+                }
+            }
+        }
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
+    {
+        using (new AssertionScope("headers from requests sent"))
+        {
+            _headers.Select(h => h.Key).Should().NotContain(unexpectedKey, because, becauseArgs);
+        }
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        using (new AssertionScope($"header \"{unexpectedKey}\" from requests sent with value(s)"))
+        {
+            var matchingHeaderValues = _headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1)
+            {
+                matchingHeaderValues.Should().NotContain(expectedValues.First(), because, becauseArgs);
+            }
+            else
+            {
+                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
+                foreach (var expectedValue in expectedValues)
+                {
+                    trimmedHeaderValues.Should().NotContain(expectedValue, because, becauseArgs);
+                }
+            }
+        }
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
     {
         Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();
 
-        return (filter, requests => (CallsCount is null && filter(requests).Any()) || CallsCount == filter(requests).Count);
+        return (filter, requests => (_callsCount is null && filter(requests).Any()) || _callsCount == filter(requests).Count);
     }
 
-    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
+    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
 
-    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
+    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
-
-    public void FilterRequestMessages(Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter)
-    {
-        RequestMessages = filter(RequestMessages).ToList();
-    }
 }

src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs

@@ -2,49 +2,50 @@ using FluentAssertions.Primitives;
 using WireMock.Server;
 
 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.FluentAssertions
-
-/// <summary>
-/// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
-/// </summary>
-public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
 {
     /// <summary>
-    /// Create a WireMockReceivedAssertions. 
+    /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
     /// </summary>
-    /// <param name="server">The <see cref="IWireMockServer"/>.</param>
+    public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
-    public WireMockReceivedAssertions(IWireMockServer server) : base(server)
     {
-    }
+        /// <summary>
+        /// Create a WireMockReceivedAssertions. 
+        /// </summary>
+        /// <param name="server">The <see cref="IWireMockServer"/>.</param>
+        public WireMockReceivedAssertions(IWireMockServer server) : base(server)
+        {
+        }
 
-    /// <summary>
+        /// <summary>
-    /// Asserts if <see cref="IWireMockServer"/> has received no calls.
+        /// Asserts if <see cref="IWireMockServer"/> has received no calls.
-    /// </summary>
+        /// </summary>
-    /// <returns><see cref="WireMockAssertions"/></returns>
+        /// <returns><see cref="WireMockAssertions"/></returns>
-    public WireMockAssertions HaveReceivedNoCalls()
+        public WireMockAssertions HaveReceivedNoCalls()
-    {
+        {
-        return new WireMockAssertions(Subject, 0);
+            return new WireMockAssertions(Subject, 0);
-    }
+        }
 
-    /// <summary>
+        /// <summary>
-    /// Asserts if <see cref="IWireMockServer"/> has received a call.
+        /// Asserts if <see cref="IWireMockServer"/> has received a call.
-    /// </summary>
+        /// </summary>
-    /// <returns><see cref="WireMockAssertions"/></returns>
+        /// <returns><see cref="WireMockAssertions"/></returns>
-    public WireMockAssertions HaveReceivedACall()
+        public WireMockAssertions HaveReceivedACall()
-    {
+        {
-        return new WireMockAssertions(Subject, null);
+            return new WireMockAssertions(Subject, null);
-    }
+        }
 
-    /// <summary>
+        /// <summary>
-    /// Asserts if <see cref="IWireMockServer"/> has received n-calls.
+        /// Asserts if <see cref="IWireMockServer"/> has received n-calls.
-    /// </summary>
+        /// </summary>
-    /// <param name="callsCount"></param>
+        /// <param name="callsCount"></param>
-    /// <returns><see cref="WireMockANumberOfCallsAssertions"/></returns>
+        /// <returns><see cref="WireMockANumberOfCallsAssertions"/></returns>
-    public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
+        public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
-    {
+        {
-        return new WireMockANumberOfCallsAssertions(Subject, callsCount);
+            return new WireMockANumberOfCallsAssertions(Subject, callsCount);
-    }
+        }
 
-    /// <inheritdoc />
+        /// <inheritdoc />
-    protected override string Identifier => "wiremockserver";
+        protected override string Identifier => "wiremockserver";
+    }
 }

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

@@ -33,9 +33,6 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
-    /// <inheritdoc />
-    public object Value { get; }
-
     private readonly AnyOf<string, StringPattern>[] _patterns;
 
     /// <summary>
@@ -57,7 +54,6 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
-        Value = patterns;
     }
 
     public MatchResult IsMatch(string? input)
@@ -164,34 +160,34 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
             }
 
 #elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER)
-        Assembly assembly;
+            Assembly assembly;
-        try
+            try
-        {
+            {
-            assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
+                assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
-        }
+            }
-        catch (Exception ex)
+            catch (Exception ex)
-        {
+            {
-            throw new WireMockException($"CSharpCodeMatcher: Unable to compile code `{source}` for WireMock.CodeHelper", ex);
+                throw new WireMockException($"CSharpCodeMatcher: Unable to compile code `{source}` for WireMock.CodeHelper", ex);
-        }
+            }
 
-        dynamic script;
+            dynamic script;
-        try
+            try
-        {
+            {
-            script = CSScripting.ReflectionExtensions.CreateObject(assembly, "*");
+                script = CSScripting.ReflectionExtensions.CreateObject(assembly, "*");
-        }
+            }
-        catch (Exception ex)
+            catch (Exception ex)
-        {
+            {
-            throw new WireMockException("CSharpCodeMatcher: Unable to create object from assembly", ex);
+                throw new WireMockException("CSharpCodeMatcher: Unable to create object from assembly", ex);
-        }
+            }
 
-        try
+            try
-        {
+            {
-            result = script.IsMatch(inputValue);
+                result = script.IsMatch(inputValue);
-        }
+            }
-        catch (Exception ex)
+            catch (Exception ex)
-        {
+            {
-            throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
+                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");
 #endif

src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj

@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="CS-Script" Version="4.8.13" />
+    <PackageReference Include="CS-Script" Version="4.4.2" />
   </ItemGroup>
 
 </Project>

src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs

@@ -11,47 +11,47 @@ public interface IWireMockOpenApiParserExampleValues
     /// <summary>
     /// An example value for a Boolean.
     /// </summary>
-    bool Boolean { get; }
+    bool Boolean { get; set; }
 
     /// <summary>
     /// An example value for an Integer.
     /// </summary>
-    int Integer { get; }
+    int Integer { get; set; }
 
     /// <summary>
     /// An example value for a Float.
     /// </summary>
-    float Float { get; }
+    float Float { get; set; }
 
     /// <summary>
     /// An example value for a Double.
     /// </summary>
-    double Double { get; }
+    double Double { get; set; }
 
     /// <summary>
     /// An example value for a Date.
     /// </summary>
-    Func<DateTime> Date { get; }
+    Func<DateTime> Date { get; set; }
 
     /// <summary>
     /// An example value for a DateTime.
     /// </summary>
-    Func<DateTime> DateTime { get; }
+    Func<DateTime> DateTime { get; set; }
 
     /// <summary>
     /// An example value for Bytes.
     /// </summary>
-    byte[] Bytes { get; }
+    byte[] Bytes { get; set; }
 
     /// <summary>
     /// An example value for a Object.
     /// </summary>
-    object Object { get; }
+    object Object { get; set; }
 
     /// <summary>
     /// An example value for a String.
     /// </summary>
-    string String { get; }
+    string String { get; set; }
 
     /// <summary>
     /// OpenApi Schema to generate dynamic examples more accurate

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs

@@ -11,31 +11,31 @@ namespace WireMock.Net.OpenApiParser.Settings;
 public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
 {
     /// <inheritdoc />
-    public virtual bool Boolean => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true;
+    public virtual bool Boolean { get => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; set { } }
 
     /// <inheritdoc />
-    public virtual int Integer => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42;
+    public virtual int Integer { get => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; set { } }
 
     /// <inheritdoc />
-    public virtual float Float => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f;
+    public virtual float Float { get => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; set { } }
 
     /// <inheritdoc />
-    public virtual double Double => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d;
+    public virtual double Double { get => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; set { } }
 
     /// <inheritdoc />
-    public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } }
+    public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
 
     /// <inheritdoc />
-    public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } }
+    public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
 
     /// <inheritdoc />
-    public virtual byte[] Bytes => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate();
+    public virtual byte[] Bytes { get => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); set { } }
 
     /// <inheritdoc />
-    public virtual object Object => "example-object";
+    public virtual object Object { get; set; } = "example-object";
 
     /// <inheritdoc />
-    public virtual string String => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string";
+    public virtual string String { get => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; set { } }
 
     /// <inheritdoc />
     public virtual OpenApiSchema? Schema { get; set; }

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs

@@ -9,31 +9,31 @@ namespace WireMock.Net.OpenApiParser.Settings;
 public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleValues
 {
     /// <inheritdoc />
-    public virtual bool Boolean => true;
+    public virtual bool Boolean { get; set; } = true;
 
     /// <inheritdoc />
-    public virtual int Integer => 42;
+    public virtual int Integer { get; set; } = 42;
 
     /// <inheritdoc />
-    public virtual float Float => 4.2f;
+    public virtual float Float { get; set; } = 4.2f;
 
     /// <inheritdoc />
-    public virtual double Double => 4.2d;
+    public virtual double Double { get; set; } = 4.2d;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> Date { get; } = () => System.DateTime.UtcNow.Date;
+    public virtual Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> DateTime { get; } = () => System.DateTime.UtcNow;
+    public virtual Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
 
     /// <inheritdoc />
-    public virtual byte[] Bytes { get; } = { 48, 49, 50 };
+    public virtual byte[] Bytes { get; set; } = { 48, 49, 50 };
 
     /// <inheritdoc />
-    public virtual object Object => "example-object";
+    public virtual object Object { get; set; } = "example-object";
 
     /// <inheritdoc />
-    public virtual string String => "example-string";
+    public virtual string String { get; set; } = "example-string";
 
     /// <inheritdoc />
     public virtual OpenApiSchema? Schema { get; set; } = new();

src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs

@@ -21,7 +21,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
         { true, new ContainerInfo("sheyenrath/wiremock.net-windows:latest", @"c:\app\__admin\mappings") }
     };
 
-    private const string DefaultLogger = "WireMockConsoleLogger";
+    private const string DefaultLogger = "WireMockNoNewLinesConsoleLogger";
 
     private readonly Lazy<Task<bool>> _isWindowsAsLazy = new(async () =>
     {
@@ -157,7 +157,7 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
         return builder
             .WithPortBinding(WireMockContainer.ContainerPort, true)
             .WithCommand($"--WireMockLogger {DefaultLogger}")
-            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("By Stef Heyenrath"));
+            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("WireMock.Net server running"));
     }
 
     /// <inheritdoc />

src/WireMock.Net/Extensions/AnyOfExtensions.cs

@@ -5,36 +5,18 @@ using WireMock.Models;
 
 namespace WireMock.Extensions;
 
-/// <summary>
+internal static class AnyOfExtensions
-/// Some extensions for AnyOf.
-/// </summary>
-public static class AnyOfExtensions
 {
-    /// <summary>
-    /// Gets the pattern.
-    /// </summary>
-    /// <param name="value">AnyOf type</param>
-    /// <returns>string value</returns>
     public static string GetPattern(this AnyOf<string, StringPattern> value)
     {
         return value.IsFirst ? value.First : value.Second.Pattern;
     }
 
-    /// <summary>
-    /// Converts a string-patterns to AnyOf patterns.
-    /// </summary>
-    /// <param name="patterns">The string patterns</param>
-    /// <returns>The AnyOf patterns</returns>
     public static AnyOf<string, StringPattern>[] ToAnyOfPatterns(this IEnumerable<string> patterns)
     {
         return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
     }
 
-    /// <summary>
-    /// Converts a string-pattern to AnyOf pattern.
-    /// </summary>
-    /// <param name="pattern">The string pattern</param>
-    /// <returns>The AnyOf pattern</returns>
     public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
     {
         return new AnyOf<string, StringPattern>(pattern);

src/WireMock.Net/IMapping.cs

@@ -69,12 +69,12 @@ public interface IMapping
     int? StateTimes { get; }
 
     /// <summary>
-    /// The RequestMatcher.
+    /// The Request matcher.
     /// </summary>
     IRequestMatcher RequestMatcher { get; }
 
     /// <summary>
-    /// The ResponseProvider.
+    /// The Provider.
     /// </summary>
     IResponseProvider Provider { get; }
 
@@ -136,11 +136,6 @@ public interface IMapping
     /// </summary>
     double? Probability { get; }
 
-    /// <summary>
-    /// The Grpc ProtoDefinition which is used for this mapping (request and response). [Optional]
-    /// </summary>
-    IdOrText? ProtoDefinition { get; }
-
     /// <summary>
     /// ProvideResponseAsync
     /// </summary>
@@ -155,44 +150,4 @@ public interface IMapping
     /// <param name="nextState">The Next State.</param>
     /// <returns>The <see cref="IRequestMatchResult"/>.</returns>
     IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState);
-
+}
-    /// <summary>
-    /// Define the scenario.
-    /// </summary>
-    /// <param name="scenario">The scenario.</param>
-    /// <returns>The <see cref="IMapping"/>.</returns>
-    IMapping WithScenario(string scenario);
-
-    /// <summary>
-    /// Define the probability when this request should be matched. [Optional]
-    /// </summary>
-    /// <param name="probability">The probability.</param>
-    /// <returns>The <see cref="IMapping"/>.</returns>
-    IMapping WithProbability(double probability);
-
-    /// <summary>
-    /// Define a Grpc ProtoDefinition which is used for this mapping (request and response).
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <returns>The <see cref="IMapping"/>.</returns>
-    IMapping WithProtoDefinition(IdOrText protoDefinition);
-}
-
-/*
-    executionConditionState">State in which the current mapping can occur. [Optional]
-    nextState">The next state which will occur after the current mapping execution. [Optional]
-    stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]
-    webhooks">The Webhooks. [Optional]
-    useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]
-    timeSettings">The TimeSettings. [Optional]
-    data">The data object. [Optional]
-    
- 
-    string? executionConditionState,
-    string? nextState,
-    int? stateTimes,
-    IWebhook[]? webhooks,
-    bool? useWebhooksFireAndForget,
-    ITimeSettings? timeSettings,
-    object? data,
-*/

src/WireMock.Net/Logging/WireMockConsoleLogger.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System;
+using Newtonsoft.Json;
 using WireMock.Admin.Requests;
 
 namespace WireMock.Logging;
@@ -10,58 +10,65 @@ namespace WireMock.Logging;
 /// <seealso cref="IWireMockLogger" />
 public class WireMockConsoleLogger : IWireMockLogger
 {
+    private const string NewlineWindows = "\r\n";
+    private const string NewlineUnix = "\n";
+
+    private readonly bool _removeNewLines;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="WireMockConsoleLogger"/> class.
     /// </summary>
-    public WireMockConsoleLogger()
+    public WireMockConsoleLogger(bool removeNewLines = false)
     {
+        _removeNewLines = removeNewLines;
+
         Console.OutputEncoding = System.Text.Encoding.UTF8;
     }
 
-    /// <see cref="IWireMockLogger.Debug"/>
+    /// <inheritdoc />
     public void Debug(string formatString, params object[] args)
     {
-        Console.WriteLine(Format("Debug", formatString, args));
+        WriteLine(Format("Debug", formatString, args));
     }
 
-    /// <see cref="IWireMockLogger.Info"/>
+    /// <inheritdoc />
     public void Info(string formatString, params object[] args)
     {
-        Console.WriteLine(Format("Info", formatString, args));
+        WriteLine(Format("Info", formatString, args));
     }
 
-    /// <see cref="IWireMockLogger.Warn"/>
+    /// <inheritdoc />
     public void Warn(string formatString, params object[] args)
     {
-        Console.WriteLine(Format("Warn", formatString, args));
+        WriteLine(Format("Warn", formatString, args));
     }
 
-    /// <see cref="IWireMockLogger.Error(string, object[])"/>
+    /// <inheritdoc />
     public void Error(string formatString, params object[] args)
     {
-        Console.WriteLine(Format("Error", formatString, args));
+        WriteLine(Format("Error", formatString, args));
     }
 
-    /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+    /// <inheritdoc />
     public void Error(string formatString, Exception exception)
     {
-        Console.WriteLine(Format("Error", formatString, exception.Message));
+        WriteLine(Format("Error", formatString, exception.Message));
 
         if (exception is AggregateException ae)
         {
             ae.Handle(ex =>
             {
-                Console.WriteLine(Format("Error", "Exception {0}", ex.Message));
+                WriteLine(Format("Error", "Exception {0}", ex.Message));
                 return true;
             });
         }
     }
 
-    /// <see cref="IWireMockLogger.DebugRequestResponse"/>
+    /// <inheritdoc />
     public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
     {
         string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-        Console.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+        WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
     }
 
     private static string Format(string level, string formatString, params object[] args)
@@ -70,4 +77,13 @@ public class WireMockConsoleLogger : IWireMockLogger
 
         return $"{DateTime.UtcNow} [{level}] : {message}";
     }
+
+    /// <summary>
+    /// Writes the specified string value, followed by the current line terminator, to the console.
+    /// </summary>
+    /// <param name="value">The value to write.</param>
+    private void WriteLine(string value)
+    {
+        Console.WriteLine(!_removeNewLines ? value : value.Replace(NewlineWindows, string.Empty).Replace(NewlineUnix, string.Empty));
+    }
 }

src/WireMock.Net/Mapping.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Stef.Validation;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.ResponseProviders;
@@ -32,7 +31,7 @@ public class Mapping : IMapping
     public int Priority { get; }
 
     /// <inheritdoc />
-    public string? Scenario { get; private set; }
+    public string? Scenario { get; }
 
     /// <inheritdoc />
     public string? ExecutionConditionState { get; }
@@ -77,10 +76,7 @@ public class Mapping : IMapping
     public object? Data { get; }
 
     /// <inheritdoc />
-    public double? Probability { get; private set; }
+    public double? Probability { get; }
-
-    /// <inheritdoc />
-    public IdOrText? ProtoDefinition { get; private set; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Mapping"/> class.
@@ -102,8 +98,8 @@ public class Mapping : IMapping
     /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     /// <param name="data">The data object. [Optional]</param>
-    public Mapping
+    /// <param name="probability">Define the probability when this request should be matched. [Optional]</param>
-    (
+    public Mapping(
         Guid guid,
         DateTime updatedAt,
         string? title,
@@ -120,8 +116,8 @@ public class Mapping : IMapping
         IWebhook[]? webhooks,
         bool? useWebhooksFireAndForget,
         ITimeSettings? timeSettings,
-        object? data
+        object? data,
-    )
+        double? probability)
     {
         Guid = guid;
         UpdatedAt = updatedAt;
@@ -140,6 +136,7 @@ public class Mapping : IMapping
         UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
         Data = data;
+        Probability = probability;
     }
 
     /// <inheritdoc />
@@ -171,25 +168,4 @@ public class Mapping : IMapping
 
         return result;
     }
-
-    /// <inheritdoc />
-    public IMapping WithProbability(double probability)
-    {
-        Probability = Guard.NotNull(probability);
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IMapping WithScenario(string scenario)
-    {
-        Scenario = Guard.NotNullOrWhiteSpace(scenario);
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IMapping WithProtoDefinition(IdOrText protoDefinition)
-    {
-        ProtoDefinition = protoDefinition;
-        return this;
-    }
 }

src/WireMock.Net/MappingBuilder.cs

@@ -6,8 +6,6 @@ using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
 using WireMock.Owin;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Server;
 using WireMock.Settings;
@@ -148,15 +146,6 @@ public class MappingBuilder : IMappingBuilder
         {
             _mappingToFileSaver.SaveMappingToFile(mapping);
         }
-
-        // Link this mapping to the Request
-        ((Request)mapping.RequestMatcher).Mapping = mapping;
-
-        // Link this mapping to the Response
-        if (mapping.Provider is Response response)
-        {
-            response.Mapping = mapping;
-        }
     }
 
     private static string ToJson(object value)

src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs

@@ -10,15 +10,20 @@ namespace WireMock.Matchers;
 /// </summary>
 public abstract class AbstractJsonPartialMatcher : JsonMatcher
 {
+    /// <summary>
+    /// Support Regex
+    /// </summary>
+    public bool Regex { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) :
+    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
-        base(value, ignoreCase, regex)
     {
+        Regex = regex;
     }
 
     /// <summary>
@@ -27,9 +32,9 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) :
+    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
-        base(value, ignoreCase, regex)
     {
+        Regex = regex;
     }
 
     /// <summary>
@@ -39,15 +44,15 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) :
+    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) : base(matchBehaviour, value, ignoreCase)
-        base(matchBehaviour, value, ignoreCase, regex)
     {
+        Regex = regex;
     }
 
     /// <inheritdoc />
-    protected override bool IsMatch(JToken value, JToken? input)
+    protected override bool IsMatch(JToken? value, JToken? input)
     {
-        if (value == input)
+        if (value == null || value == input)
         {
             return true;
         }
@@ -67,7 +72,7 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
             ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) ||
             (value.Type == JTokenType.String && input.Type == JTokenType.Guid)))
         {
-            return IsMatch(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
+            return IsMatch(value.ToString(), input.ToString());
         }
 
         if (input == null || value.Type != input.Type)

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -17,15 +17,6 @@ public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param> 
-    /// <param name="value">The string value.</param>
-    public ExactMatcher(MatchBehaviour matchBehaviour, string value) : this(matchBehaviour, true, MatchOperator.Or, new AnyOf<string, StringPattern>(value))
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
     /// </summary>

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -9,8 +9,15 @@ namespace WireMock.Matchers;
 /// <seealso cref="IObjectMatcher" />
 public class ExactObjectMatcher : IObjectMatcher
 {
-    /// <inheritdoc />
+    /// <summary>
-    public object Value { get; }
+    /// Gets the value as object.
+    /// </summary>
+    public object? ValueAsObject { get; }
+
+    /// <summary>
+    /// Gets the value as byte[].
+    /// </summary>
+    public byte[]? ValueAsBytes { get; }
 
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
@@ -30,7 +37,7 @@ public class ExactObjectMatcher : IObjectMatcher
     /// <param name="value">The value.</param>
     public ExactObjectMatcher(MatchBehaviour matchBehaviour, object value)
     {
-        Value = Guard.NotNull(value);
+        ValueAsObject = Guard.NotNull(value);
         MatchBehaviour = matchBehaviour;
     }
 
@@ -49,21 +56,21 @@ public class ExactObjectMatcher : IObjectMatcher
     /// <param name="value">The value.</param>
     public ExactObjectMatcher(MatchBehaviour matchBehaviour, byte[] value)
     {
-        Value = Guard.NotNull(value);
+        ValueAsBytes = Guard.NotNull(value);
         MatchBehaviour = matchBehaviour;
     }
 
     /// <inheritdoc />
     public MatchResult IsMatch(object? input)
     {
-        bool equals;
+        bool equals = false;
-        if (Value is byte[] valueAsBytes && input is byte[] inputAsBytes)
+        if (ValueAsObject != null)
         {
-            equals = valueAsBytes.SequenceEqual(inputAsBytes);
+            equals = Equals(ValueAsObject, input);
         }
-        else
+        else if (input != null)
         {
-            equals = Equals(Value, input);
+            equals = ValueAsBytes?.SequenceEqual((byte[])input) == true;
         }
 
         return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(equals));

src/WireMock.Net/Matchers/IBytesMatcher.cs

@@ -1,18 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// IBytesMatcher
-/// </summary>
-public interface IBytesMatcher : IMatcher
-{
-    /// <summary>
-    /// Determines whether the specified input is match.
-    /// </summary>
-    /// <param name="input">The input byte array.</param>
-    /// <param name="cancellationToken">The CancellationToken [optional].</param>
-    /// <returns>MatchResult</returns>
-    Task<MatchResult> IsMatchAsync(byte[]? input, CancellationToken cancellationToken = default);
-}

src/WireMock.Net/Matchers/IDecodeMatcher.cs

@@ -1,18 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// IDecodeBytesMatcher
-/// </summary>
-public interface IDecodeBytesMatcher
-{
-    /// <summary>
-    /// Decode byte array to an object.
-    /// </summary>
-    /// <param name="input">The byte array</param>
-    /// <param name="cancellationToken">The CancellationToken [optional].</param>
-    /// <returns>object</returns>
-    Task<object?> DecodeAsync(byte[]? input, CancellationToken cancellationToken = default);
-}

src/WireMock.Net/Matchers/IJsonMatcher.cs

@@ -1,9 +0,0 @@
-namespace WireMock.Matchers;
-
-/// <summary>
-/// IJsonMatcher
-/// <seealso cref="IObjectMatcher"/> and <seealso cref="IIgnoreCaseMatcher"/>.
-/// </summary>
-public interface IJsonMatcher : IObjectMatcher, IIgnoreCaseMatcher
-{
-}

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -5,12 +5,6 @@ namespace WireMock.Matchers;
 /// </summary>
 public interface IObjectMatcher : IMatcher
 {
-    /// <summary>
-    /// Gets the value (can be a string or an object).
-    /// </summary>
-    /// <returns>Value</returns>
-    object Value { get; }
-
     /// <summary>
     /// Determines whether the specified input is match.
     /// </summary>

src/WireMock.Net/Matchers/IProtoBufMatcher.cs

@@ -1,8 +0,0 @@
-namespace WireMock.Matchers;
-
-/// <summary>
-/// IProtoBufMatcher
-/// </summary>
-public interface IProtoBufMatcher : IDecodeBytesMatcher, IBytesMatcher
-{
-}

src/WireMock.Net/Matchers/IValueMatcher.cs

@@ -0,0 +1,14 @@
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IValueMatcher
+/// </summary>
+/// <seealso cref="IObjectMatcher" />
+public interface IValueMatcher : IObjectMatcher
+{
+    /// <summary>
+    /// Gets the value (can be a string or an object).
+    /// </summary>
+    /// <returns>Value</returns>
+    object Value { get; }
+}

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -11,7 +11,7 @@ namespace WireMock.Matchers;
 /// <summary>
 /// JsonPathMatcher
 /// </summary>
-/// <seealso cref="IStringMatcher" />
+/// <seealso cref="IMatcher" />
 /// <seealso cref="IObjectMatcher" />
 public class JsonPathMatcher : IStringMatcher, IObjectMatcher
 {
@@ -20,9 +20,6 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
-    /// <inheritdoc />
-    public object Value { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
     /// </summary>
@@ -55,7 +52,6 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
-        Value = patterns;
     }
 
     /// <inheritdoc />
@@ -123,7 +119,7 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
         // The SelectToken method can accept a string path to a child token ( i.e. "Manufacturers[0].Products[0].Price").
         // In that case it will return a JValue (some type) which does not implement the IEnumerable interface.
         var values = _patterns.Select(pattern => array.SelectToken(pattern.GetPattern()) != null).ToArray();
-
+        
         return MatchScores.ToScore(values, MatchOperator);
     }
 

src/WireMock.Net/Matchers/JmesPathMatcher.cs

@@ -16,9 +16,6 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher
 {
     private readonly AnyOf<string, StringPattern>[] _patterns;
 
-    /// <inheritdoc />
-    public object Value { get; }
-
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
@@ -62,7 +59,6 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
-        Value = patterns;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -1,22 +1,21 @@
 using System;
-using System.Collections.Generic;
+using System.Collections;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Util;
-using JsonUtils = WireMock.Util.JsonUtils;
 
 namespace WireMock.Matchers;
 
 /// <summary>
 /// JsonMatcher
 /// </summary>
-public class JsonMatcher : IJsonMatcher
+public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
 {
     /// <inheritdoc />
-    public virtual string Name => nameof(JsonMatcher);
+    public virtual string Name => "JsonMatcher";
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IValueMatcher.Value"/>
     public object Value { get; }
 
     /// <inheritdoc />
@@ -25,11 +24,6 @@ public class JsonMatcher : IJsonMatcher
     /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
     public bool IgnoreCase { get; }
 
-    /// <summary>
-    /// Support Regex
-    /// </summary>
-    public bool Regex { get; }
-
     private readonly JToken _valueAsJToken;
     private readonly Func<JToken, JToken> _jTokenConverter;
 
@@ -38,8 +32,7 @@ public class JsonMatcher : IJsonMatcher
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
-    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
     {
     }
 
@@ -48,8 +41,7 @@ public class JsonMatcher : IJsonMatcher
     /// </summary>
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
-    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
     {
     }
 
@@ -59,17 +51,15 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false)
-    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
     {
         Guard.NotNull(value);
 
         MatchBehaviour = matchBehaviour;
         IgnoreCase = ignoreCase;
-        Regex = regex;
 
         Value = value;
-        _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
+        _valueAsJToken = ConvertValueToJToken(value);
         _jTokenConverter = ignoreCase ? Rename : jToken => jToken;
     }
 
@@ -84,7 +74,7 @@ public class JsonMatcher : IJsonMatcher
         {
             try
             {
-                var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
+                var inputAsJToken = ConvertValueToJToken(input);
 
                 var match = IsMatch(_jTokenConverter(_valueAsJToken), _jTokenConverter(inputAsJToken));
                 score = MatchScores.ToScore(match);
@@ -104,78 +94,27 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="value">Matcher value</param>
     /// <param name="input">Input value</param>
     /// <returns></returns>
-    protected virtual bool IsMatch(JToken value, JToken? input)
+    protected virtual bool IsMatch(JToken value, JToken input)
     {
-        // If equal, return true.
+        return JToken.DeepEquals(value, input);
-        if (input == value)
+    }
+
+    private static JToken ConvertValueToJToken(object value)
+    {
+        // Check if JToken, string, IEnumerable or object
+        switch (value)
         {
-            return true;
+            case JToken tokenValue:
-        }
+                return tokenValue;
 
-        // If input is null, return false.
+            case string stringValue:
-        if (input == null)
+                return JsonUtils.Parse(stringValue);
-        {
-            return false;
-        }
 
-        // If using Regex and the value is a string, use the MatchRegex method.
+            case IEnumerable enumerableValue:
-        if (Regex && value.Type == JTokenType.String)
+                return JArray.FromObject(enumerableValue);
-        {
-            var valueAsString = value.ToString();
-
-            var (valid, result) = RegexUtils.MatchRegex(valueAsString, input.ToString());
-            if (valid)
-            {
-                return result;
-            }
-        }
-
-        // If the value is a Guid and the input is a string, or vice versa, convert them to strings and compare the string values.
-        if ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) || (value.Type == JTokenType.String && input.Type == JTokenType.Guid))
-        {
-            return JToken.DeepEquals(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
-        }
-
-        switch (value.Type)
-        {
-            // If the value is an object, compare all properties.
-            case JTokenType.Object:
-                var valueProperties = value.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-                var inputProperties = input.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-
-                // If the number of properties is different, return false.
-                if (valueProperties.Count != inputProperties.Count)
-                {
-                    return false;
-                }
-
-                // Compare all properties. The input must match all properties of the value.
-                foreach (var pair in valueProperties)
-                {
-                    if (!IsMatch(pair.Value, inputProperties[pair.Key]))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-
-            // If the value is an array, compare all elements.
-            case JTokenType.Array:
-                var valueArray = value.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-                var inputArray = input.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-
-                // If the number of elements is different, return false.
-                if (valueArray.Length != inputArray.Length)
-                {
-                    return false;
-                }
-
-                return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
 
             default:
-                // Use JToken.DeepEquals() for all other types.
+                return JObject.FromObject(value);
-                return JToken.DeepEquals(value, input);
         }
     }
 

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -22,9 +22,6 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
-    /// <inheritdoc />
-    public object Value { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
     /// </summary>
@@ -64,7 +61,6 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
-        Value = patterns;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -23,11 +23,4 @@ internal static class MatchBehaviourHelper
 
         return match <= MatchScores.Tolerance ? MatchScores.Perfect : MatchScores.Mismatch;
     }
-
-    internal static MatchResult Convert(MatchBehaviour matchBehaviour, MatchResult result)
-    {
-        return matchBehaviour == MatchBehaviour.AcceptOnMatch ?
-            result :
-            new MatchResult(Convert(matchBehaviour, result.Score), result.Exception);
-    }
 }

src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs

@@ -17,9 +17,6 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
-    /// <inheritdoc />
-    public object Value { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="NotNullOrEmptyMatcher"/> class.
     /// </summary>
@@ -27,7 +24,6 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
     public NotNullOrEmptyMatcher(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
         MatchBehaviour = matchBehaviour;
-        Value = string.Empty;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/ProtoBufMatcher.cs

@@ -1,114 +0,0 @@
-#if PROTOBUF
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using ProtoBufJsonConverter;
-using ProtoBufJsonConverter.Models;
-using Stef.Validation;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// Grpc ProtoBuf Matcher
-/// </summary>
-/// <inheritdoc cref="IProtoBufMatcher"/>
-public class ProtoBufMatcher : IProtoBufMatcher
-{
-    /// <inheritdoc />
-    public string Name => nameof(ProtoBufMatcher);
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <summary>
-    /// The Func to define The proto definition as text.
-    /// </summary>
-    public Func<IdOrText> ProtoDefinition { get; }
-
-    /// <summary>
-    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
-    public string MessageType { get; }
-
-    /// <summary>
-    /// The Matcher to use (optional).
-    /// </summary>
-    public IObjectMatcher? Matcher { get; }
-
-    private static readonly Converter ProtoBufToJsonConverter = SingletonFactory<Converter>.GetInstance();
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ProtoBufMatcher"/> class.
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <param name="matcher">The optional jsonMatcher to use to match the ProtoBuf as (json) object.</param>
-    public ProtoBufMatcher(
-        Func<IdOrText> protoDefinition,
-        string messageType,
-        MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
-        IObjectMatcher? matcher = null
-    )
-    {
-        ProtoDefinition = Guard.NotNull(protoDefinition);
-        MessageType = Guard.NotNullOrWhiteSpace(messageType);
-        Matcher = matcher;
-        MatchBehaviour = matchBehaviour;
-    }
-
-    /// <inheritdoc />
-    public async Task<MatchResult> IsMatchAsync(byte[]? input, CancellationToken cancellationToken = default)
-    {
-        var result = new MatchResult();
-
-        if (input != null)
-        {
-            try
-            {
-                var instance = await DecodeAsync(input, true, cancellationToken).ConfigureAwait(false);
-
-                result = Matcher?.IsMatch(instance) ?? new MatchResult(MatchScores.Perfect);
-            }
-            catch (Exception e)
-            {
-                result = new MatchResult(MatchScores.Mismatch, e);
-            }
-        }
-
-        return MatchBehaviourHelper.Convert(MatchBehaviour, result);
-    }
-
-    /// <inheritdoc />
-    public Task<object?> DecodeAsync(byte[]? input, CancellationToken cancellationToken = default)
-    {
-        return DecodeAsync(input, false, cancellationToken);
-    }
-
-    private async Task<object?> DecodeAsync(byte[]? input, bool throwException, CancellationToken cancellationToken)
-    {
-        if (input == null)
-        {
-            return null;
-        }
-
-        var request = new ConvertToObjectRequest(ProtoDefinition().Text, MessageType, input);
-
-        try
-        {
-            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken).ConfigureAwait(false);
-        }
-        catch
-        {
-            if (throwException)
-            {
-                throw;
-            }
-
-            return null;
-        }
-    }
-}
-#endif

src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs

@@ -26,8 +26,10 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
     /// <param name="type">The CompositeMatcherType type (Defaults to 'And')</param>
     protected RequestMessageCompositeMatcher(IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And)
     {
-        RequestMatchers = Guard.NotNull(requestMatchers);
+        Guard.NotNull(requestMatchers);
+
         _type = type;
+        RequestMatchers = requestMatchers;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/Request/RequestMessageGraphQLMatcher.cs

@@ -26,7 +26,7 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="schema">The schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. [optional]</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
     public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, string schema, IDictionary<string, Type>? customScalars = null) :
         this(CreateMatcherArray(matchBehaviour, schema, customScalars))
     {
@@ -38,7 +38,7 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="schema">The schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. [optional]</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
     public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars = null) :
         this(CreateMatcherArray(matchBehaviour, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema>(schema), customScalars))
     {
@@ -94,7 +94,8 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
 #if GRAPHQL
     private static IMatcher[] CreateMatcherArray(
         MatchBehaviour matchBehaviour,
-        AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema> schema,
+        AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern,
+        GraphQL.Types.ISchema> schema,
         IDictionary<string, Type>? customScalars
     )
     {

src/WireMock.Net/Matchers/Request/RequestMessageHttpVersionMatcher.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using Stef.Validation;
-
-namespace WireMock.Matchers.Request;
-
-/// <summary>
-/// The request HTTP Version matcher.
-/// </summary>
-public class RequestMessageHttpVersionMatcher : IRequestMatcher
-{
-    /// <summary>
-    /// The matcher.
-    /// </summary>
-    public IStringMatcher? Matcher { get; }
-
-    /// <summary>
-    /// The func.
-    /// </summary>
-    public Func<string, bool>? Func { get; }
-
-    /// <summary>
-    /// The <see cref="MatchBehaviour"/>
-    /// </summary>
-    public MatchBehaviour Behaviour { get; }
-
-    /// <summary>
-    /// The HTTP Version
-    /// </summary>
-    public string? HttpVersion { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RequestMessageHttpVersionMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="httpVersion">The HTTP Version.</param>
-    public RequestMessageHttpVersionMatcher(MatchBehaviour matchBehaviour, string httpVersion) :
-        this(matchBehaviour, new ExactMatcher(matchBehaviour, httpVersion))
-    {
-        HttpVersion = httpVersion;
-        Behaviour = matchBehaviour;
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="matcher">The matcher.</param>
-    public RequestMessageHttpVersionMatcher(MatchBehaviour matchBehaviour, IStringMatcher matcher)
-    {
-        Matcher = Guard.NotNull(matcher);
-        Behaviour = matchBehaviour;
-        HttpVersion = matcher.GetPatterns().FirstOrDefault();
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
-    /// </summary>
-    /// <param name="func">The function.</param>
-    public RequestMessageHttpVersionMatcher(Func<string, bool> func)
-    {
-        Func = Guard.NotNull(func);
-    }
-
-    /// <inheritdoc />
-    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-    {
-        var (score, exception) = GetMatchResult(requestMessage).Expand();
-        return requestMatchResult.AddScore(GetType(), score, exception);
-    }
-
-    private MatchResult GetMatchResult(IRequestMessage requestMessage)
-    {
-        if (Matcher != null)
-        {
-            return Matcher.IsMatch(requestMessage.HttpVersion);
-        }
-
-        if (Func != null)
-        {
-            return MatchScores.ToScore(Func(requestMessage.HttpVersion));
-        }
-
-        return default;
-    }
-}

src/WireMock.Net/Matchers/Request/RequestMessageProtoBufMatcher.cs

@@ -1,43 +0,0 @@
-using System;
-using WireMock.Models;
-
-namespace WireMock.Matchers.Request;
-
-/// <summary>
-/// The request body Grpc ProtoBuf matcher.
-/// </summary>
-public class RequestMessageProtoBufMatcher : IRequestMatcher
-{
-    /// <summary>
-    /// The ProtoBufMatcher.
-    /// </summary>
-    public IProtoBufMatcher? Matcher { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RequestMessageProtoBufMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <param name="protoDefinition">The Func to define The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The optional matcher to use to match the ProtoBuf as (json) object.</param>
-    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<IdOrText> protoDefinition, string messageType, IObjectMatcher? matcher = null)
-    {
-#if PROTOBUF
-        Matcher = new ProtoBufMatcher(protoDefinition, messageType, matchBehaviour, matcher);
-#else
-        throw new System.NotSupportedException("The ProtoBufMatcher can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#endif
-    }
-
-    /// <inheritdoc />
-    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-    {
-        var (score, exception) = GetMatchResult(requestMessage).Expand();
-        return requestMatchResult.AddScore(GetType(), score, exception);
-    }
-
-    private MatchResult GetMatchResult(IRequestMessage requestMessage)
-    {
-        return Matcher?.IsMatchAsync(requestMessage.BodyAsBytes).GetAwaiter().GetResult() ?? default;
-    }
-}

src/WireMock.Net/Models/BodyData.cs

@@ -1,10 +1,7 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
-using WireMock.Models;
 using WireMock.Types;
 
-// ReSharper disable once CheckNamespace
 namespace WireMock.Util;
 
 /// <summary>
@@ -12,7 +9,7 @@ namespace WireMock.Util;
 /// </summary>
 public class BodyData : IBodyData
 {
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.Encoding" />
     public Encoding? Encoding { get; set; }
 
     /// <inheritdoc />
@@ -21,38 +18,30 @@ public class BodyData : IBodyData
     /// <inheritdoc />
     public IDictionary<string, string>? BodyAsFormUrlEncoded { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.BodyAsJson" />
     public object? BodyAsJson { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.BodyAsBytes" />
     public byte[]? BodyAsBytes { get; set; }
-    
+
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.BodyAsJsonIndented" />
     public bool? BodyAsJsonIndented { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.BodyAsFile" />
     public string? BodyAsFile { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.BodyAsFileIsCached" />
     public bool? BodyAsFileIsCached { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.DetectedBodyType" />
     public BodyType? DetectedBodyType { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IBodyData.DetectedBodyTypeFromContentType" />
     public BodyType? DetectedBodyTypeFromContentType { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IRequestMessage.DetectedCompression" />
     public string? DetectedCompression { get; set; }
 
     /// <inheritdoc />
     public string? IsFuncUsed { get; set; }
-
-    #region ProtoBuf
-    /// <inheritdoc />
-    public Func<IdOrText>? ProtoDefinition { get; set; }
-
-    /// <inheritdoc />
-    public string? ProtoBufMessageType { get; set; }
-    #endregion
 }

src/WireMock.Net/Models/GraphQLSchemaDetails.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using AnyOfTypes;
-using Newtonsoft.Json;
-
-namespace WireMock.Models;
-
-/// <summary>
-/// GraphQLSchemaDetails
-/// </summary>
-public class GraphQLSchemaDetails
-{
-    /// <summary>
-    /// The GraphQL schema as a string.
-    /// </summary>
-    public string? SchemaAsString { get; set; }
-
-    /// <summary>
-    /// The GraphQL schema as a StringPattern.
-    /// </summary>
-    public StringPattern? SchemaAsStringPattern { get; set; }
-
-#if GRAPHQL
-    /// <summary>
-    /// The GraphQL schema as a <seealso cref="GraphQL.Types.ISchema"/>.
-    /// </summary>
-    public GraphQL.Types.ISchema? SchemaAsISchema { get; set; }
-
-    /// <summary>
-    /// The GraphQL Schema.
-    /// </summary>
-    [JsonIgnore]
-    public AnyOf<string, StringPattern, GraphQL.Types.ISchema>? Schema
-    {
-        get
-        {
-            if (SchemaAsString != null)
-            {
-                return SchemaAsString;
-            }
-
-            if (SchemaAsStringPattern != null)
-            {
-                return SchemaAsStringPattern;
-            }
-
-            if (SchemaAsISchema != null)
-            {
-                return new AnyOf<string, StringPattern, GraphQL.Types.ISchema>(SchemaAsISchema);
-            }
-
-            return null;
-        }
-    }
-#endif
-
-    /// <summary>
-    /// The custom Scalars to define for this schema.
-    /// </summary>
-    public IDictionary<string, Type>? CustomScalars { get; set; }
-}

src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs

@@ -46,18 +46,6 @@ namespace WireMock.Owin
                                 options.ClientCertificateValidation = (_, _, _) => true;
                             }
                         });
-
-                        if (urlDetail.IsHttp2)
-                        {
-                            listenOptions.Protocols = HttpProtocols.Http2;
-                        }
-                    });
-                }
-                else if (urlDetail.IsHttp2)
-                {
-                    kestrelOptions.ListenAnyIP(urlDetail.Port, listenOptions =>
-                    {
-                        listenOptions.Protocols = HttpProtocols.Http2;
                     });
                 }
                 else

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -14,174 +14,171 @@ using WireMock.Owin.Mappers;
 using WireMock.Services;
 using WireMock.Util;
 
-namespace WireMock.Owin;
+namespace WireMock.Owin
-
-internal partial class AspNetCoreSelfHost : IOwinSelfHost
 {
-    private const string CorsPolicyName = "WireMock.Net - Policy";
+    internal partial class AspNetCoreSelfHost : IOwinSelfHost
-
-    private readonly CancellationTokenSource _cts = new();
-    private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
-    private readonly IWireMockLogger _logger;
-    private readonly HostUrlOptions _urlOptions;
-
-    private Exception _runningException;
-    private IWebHost _host;
-
-    public bool IsStarted { get; private set; }
-
-    public List<string> Urls { get; } = new();
-
-    public List<int> Ports { get; } = new();
-
-    public Exception RunningException => _runningException;
-
-    public AspNetCoreSelfHost(IWireMockMiddlewareOptions wireMockMiddlewareOptions, HostUrlOptions urlOptions)
     {
-        Guard.NotNull(wireMockMiddlewareOptions);
+        private const string CorsPolicyName = "WireMock.Net - Policy";
-        Guard.NotNull(urlOptions);
 
-        _logger = wireMockMiddlewareOptions.Logger ?? new WireMockConsoleLogger();
+        private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+        private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
+        private readonly IWireMockLogger _logger;
+        private readonly HostUrlOptions _urlOptions;
 
-        _wireMockMiddlewareOptions = wireMockMiddlewareOptions;
+        private Exception _runningException;
-        _urlOptions = urlOptions;
+        private IWebHost _host;
-    }
 
-    public Task StartAsync()
+        public bool IsStarted { get; private set; }
-    {
-        var builder = new WebHostBuilder();
 
-        // Workaround for https://github.com/WireMock-Net/WireMock.Net/issues/292
+        public List<string> Urls { get; } = new();
-        // On some platforms, AppContext.BaseDirectory is null, which causes WebHostBuilder to fail if ContentRoot is not
+
-        // specified (even though we don't actually use that base path mechanism, since we have our own way of configuring
+        public List<int> Ports { get; } = new();
-        // a filesystem handler).
+
-        if (string.IsNullOrEmpty(AppContext.BaseDirectory))
+        public Exception RunningException => _runningException;
+
+        public AspNetCoreSelfHost(IWireMockMiddlewareOptions wireMockMiddlewareOptions, HostUrlOptions urlOptions)
         {
-            builder.UseContentRoot(Directory.GetCurrentDirectory());
+            Guard.NotNull(wireMockMiddlewareOptions);
+            Guard.NotNull(urlOptions);
+
+            _logger = wireMockMiddlewareOptions.Logger ?? new WireMockConsoleLogger();
+
+            _wireMockMiddlewareOptions = wireMockMiddlewareOptions;
+            _urlOptions = urlOptions;
         }
 
-        _host = builder
+        public Task StartAsync()
-            .UseSetting("suppressStatusMessages", "True") // https://andrewlock.net/suppressing-the-startup-and-shutdown-messages-in-asp-net-core/
+        {
-            .ConfigureAppConfigurationUsingEnvironmentVariables()
+            var builder = new WebHostBuilder();
-            .ConfigureServices(services =>
+
+            // Workaround for https://github.com/WireMock-Net/WireMock.Net/issues/292
+            // On some platforms, AppContext.BaseDirectory is null, which causes WebHostBuilder to fail if ContentRoot is not
+            // specified (even though we don't actually use that base path mechanism, since we have our own way of configuring
+            // a filesystem handler).
+            if (string.IsNullOrEmpty(AppContext.BaseDirectory))
             {
-                services.AddSingleton(_wireMockMiddlewareOptions);
+                builder.UseContentRoot(Directory.GetCurrentDirectory());
-                services.AddSingleton<IMappingMatcher, MappingMatcher>();
+            }
-                services.AddSingleton<IRandomizerDoubleBetween0And1, RandomizerDoubleBetween0And1>();
+
-                services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
+            _host = builder
-                services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
+                .UseSetting("suppressStatusMessages", "True") // https://andrewlock.net/suppressing-the-startup-and-shutdown-messages-in-asp-net-core/
-                services.AddSingleton<IGuidUtils, GuidUtils>();
+                .ConfigureAppConfigurationUsingEnvironmentVariables()
+                .ConfigureServices(services =>
+                {
+                    services.AddSingleton(_wireMockMiddlewareOptions);
+                    services.AddSingleton<IMappingMatcher, MappingMatcher>();
+                    services.AddSingleton<IRandomizerDoubleBetween0And1, RandomizerDoubleBetween0And1>();
+                    services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
+                    services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
+                    services.AddSingleton<IGuidUtils, GuidUtils>();
 
 #if NETCOREAPP3_1 || NET5_0_OR_GREATER
-                AddCors(services);
+                    AddCors(services);
 #endif
-                _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
+                    _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
-            })
+                })
-            .Configure(appBuilder =>
+                .Configure(appBuilder =>
-            {
+                {
-                appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
+                    appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
 
 #if NETCOREAPP3_1 || NET5_0_OR_GREATER
-                UseCors(appBuilder);
+                    UseCors(appBuilder);
 #endif
-                _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
+                    _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
 
-                appBuilder.UseMiddleware<WireMockMiddleware>();
+                    appBuilder.UseMiddleware<WireMockMiddleware>();
 
-                _wireMockMiddlewareOptions.PostWireMockMiddlewareInit?.Invoke(appBuilder);
+                    _wireMockMiddlewareOptions.PostWireMockMiddlewareInit?.Invoke(appBuilder);
-            })
+                })
-            .UseKestrel(options =>
+                .UseKestrel(options =>
-            {
+                {
-                SetKestrelOptionsLimits(options);
+                    SetKestrelOptionsLimits(options);
 
-                SetHttpsAndUrls(options, _wireMockMiddlewareOptions, _urlOptions.GetDetails());
+                    SetHttpsAndUrls(options, _wireMockMiddlewareOptions, _urlOptions.GetDetails());
-            })
+                })
-            .ConfigureKestrelServerOptions()
+                .ConfigureKestrelServerOptions()
 
 #if NETSTANDARD1_3
-            .UseUrls(_urlOptions.GetDetails().Select(u => u.Url).ToArray())
+                .UseUrls(_urlOptions.GetDetails().Select(u => u.Url).ToArray())
 #endif
-            .Build();
+                .Build();
 
-        return RunHost(_cts.Token);
+            return RunHost(_cts.Token);
-    }
+        }
 
         private Task RunHost(CancellationToken token)
         {
             try
             {
-#if NETCOREAPP3_1 || NET5_0_OR_GREATER
-                var appLifetime = _host.Services.GetRequiredService<Microsoft.Extensions.Hosting.IHostApplicationLifetime>();
-#else
                 var appLifetime = _host.Services.GetRequiredService<IApplicationLifetime>();
-#endif
                 appLifetime.ApplicationStarted.Register(() =>
                 {
                     var addresses = _host.ServerFeatures
-                        .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()!
+                        .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()
                         .Addresses;
 
-                    foreach (var address in addresses)
+                    foreach (string address in addresses)
                     {
                         Urls.Add(address.Replace("0.0.0.0", "localhost").Replace("[::]", "localhost"));
 
-                        PortUtils.TryExtract(address, out _, out _, out _, out _, out var port);
+                        PortUtils.TryExtract(address, out _, out _, out _, out int port);
                         Ports.Add(port);
                     }
 
-                IsStarted = true;
+                    IsStarted = true;
-            });
+                });
 
 #if NETSTANDARD1_3
-            _logger.Info("Server using netstandard1.3");
+                _logger.Info("Server using netstandard1.3");
 #elif NETSTANDARD2_0
-            _logger.Info("Server using netstandard2.0");
+                _logger.Info("Server using netstandard2.0");
 #elif NETSTANDARD2_1
-            _logger.Info("Server using netstandard2.1");
+                _logger.Info("Server using netstandard2.1");
 #elif NETCOREAPP3_1
-            _logger.Info("Server using .NET Core App 3.1");
+                _logger.Info("Server using .NET Core App 3.1");
 #elif NET5_0
-            _logger.Info("Server using .NET 5.0");
+                _logger.Info("Server using .NET 5.0");
 #elif NET6_0
-            _logger.Info("Server using .NET 6.0");
+                _logger.Info("Server using .NET 6.0");
 #elif NET7_0
-            _logger.Info("Server using .NET 7.0");
+                _logger.Info("Server using .NET 7.0");
 #elif NET8_0
-            _logger.Info("Server using .NET 8.0");
+                _logger.Info("Server using .NET 8.0");
 #elif NET46
-            _logger.Info("Server using .NET Framework 4.6.1 or higher");
+                _logger.Info("Server using .NET Framework 4.6.1 or higher");
 #endif
 
 #if NETSTANDARD1_3
-            return Task.Run(() =>
+                return Task.Run(() =>
-            {
+                {
-                _host.Run(token);
+                    _host.Run(token);
-            });
+                });
 #else
-            return _host.RunAsync(token);
+                return _host.RunAsync(token);
 #endif
+            }
+            catch (Exception e)
+            {
+                _runningException = e;
+                _logger.Error(e.ToString());
+
+                IsStarted = false;
+
+                return Task.CompletedTask;
+            }
         }
-        catch (Exception e)
+
+        public Task StopAsync()
         {
-            _runningException = e;
+            _cts.Cancel();
-            _logger.Error(e.ToString());
 
             IsStarted = false;
-
-            return Task.CompletedTask;
-        }
-    }
-
-    public Task StopAsync()
-    {
-        _cts.Cancel();
-
-        IsStarted = false;
 #if NETSTANDARD1_3
-        return Task.CompletedTask;
+            return Task.FromResult(true);
 #else
-        return _host.StopAsync();
+            return _host.StopAsync();
 #endif
+        }
     }
 }
 #endif

src/WireMock.Net/Owin/HostUrlDetails.cs

@@ -7,8 +7,6 @@ internal struct HostUrlDetails
 {
     public bool IsHttps { get; set; }
 
-    public bool IsHttp2 { get; set; }
-
     public string Url { get; set; }
         
     public string Scheme { get; set; }

src/WireMock.Net/Owin/HostUrlOptions.cs

@@ -14,8 +14,6 @@ internal class HostUrlOptions
 
     public HostingScheme HostingScheme { get; set; }
 
-    public bool? UseHttp2 { get; set; }
-
     public IReadOnlyList<HostUrlDetails> GetDetails()
     {
         var list = new List<HostUrlDetails>();
@@ -25,25 +23,25 @@ internal class HostUrlOptions
             {
                 var port = Port > 0 ? Port.Value : FindFreeTcpPort();
                 var scheme = HostingScheme == HostingScheme.Https ? "https" : "http";
-                list.Add(new HostUrlDetails { IsHttps = HostingScheme == HostingScheme.Https, IsHttp2 = UseHttp2 == true, Url = $"{scheme}://{Localhost}:{port}", Scheme = scheme, Host = Localhost, Port = port });
+                list.Add(new HostUrlDetails { IsHttps = HostingScheme == HostingScheme.Https, Url = $"{scheme}://{Localhost}:{port}", Scheme = scheme, Host = Localhost, Port = port });
             }
 
             if (HostingScheme == HostingScheme.HttpAndHttps)
             {
                 var httpPort = Port > 0 ? Port.Value : FindFreeTcpPort();
-                list.Add(new HostUrlDetails { IsHttps = false, IsHttp2 = UseHttp2 == true, Url = $"http://{Localhost}:{httpPort}", Scheme = "http", Host = Localhost, Port = httpPort });
+                list.Add(new HostUrlDetails { IsHttps = false, Url = $"http://{Localhost}:{httpPort}", Scheme = "http", Host = Localhost, Port = httpPort });
 
                 var httpsPort = FindFreeTcpPort(); // In this scenario, always get a free port for https.
-                list.Add(new HostUrlDetails { IsHttps = true, IsHttp2 = UseHttp2 == true, Url = $"https://{Localhost}:{httpsPort}", Scheme = "https", Host = Localhost, Port = httpsPort });
+                list.Add(new HostUrlDetails { IsHttps = true, Url = $"https://{Localhost}:{httpsPort}", Scheme = "https", Host = Localhost, Port = httpsPort });
             }
         }
         else
         {
-            foreach (var url in Urls)
+            foreach (string url in Urls)
             {
-                if (PortUtils.TryExtract(url, out var isHttps, out var isGrpc, out var protocol, out var host, out var port))
+                if (PortUtils.TryExtract(url, out var isHttps, out var protocol, out var host, out var port))
                 {
-                    list.Add(new HostUrlDetails { IsHttps = isHttps, IsHttp2 = isGrpc, Url = url, Scheme = protocol, Host = host, Port = port });
+                    list.Add(new HostUrlDetails { IsHttps = isHttps, Url = url, Scheme = protocol, Host = host, Port = port });
                 }
             }
         }

src/WireMock.Net/Owin/Mappers/IOwinResponseMapper.cs

@@ -5,17 +5,18 @@ using IResponse = Microsoft.Owin.IOwinResponse;
 using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
 #endif
 
-namespace WireMock.Owin.Mappers;
+namespace WireMock.Owin.Mappers
-
-/// <summary>
-/// IOwinResponseMapper
-/// </summary>
-internal interface IOwinResponseMapper
 {
     /// <summary>
-    /// Map ResponseMessage to IResponse.
+    /// IOwinResponseMapper
     /// </summary>
-    /// <param name="responseMessage">The ResponseMessage</param>
+    internal interface IOwinResponseMapper
-    /// <param name="response">The OwinResponse/HttpResponse</param>
+    {
-    Task MapAsync(IResponseMessage? responseMessage, IResponse response);
+        /// <summary>
-}
+        /// Map ResponseMessage to IResponse.
+        /// </summary>
+        /// <param name="responseMessage">The ResponseMessage</param>
+        /// <param name="response">The OwinResponse/HttpResponse</param>
+        Task MapAsync(IResponseMessage? responseMessage, IResponse response);
+    }
+}

src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs

@@ -8,102 +8,103 @@ using WireMock.Util;
 #if !USE_ASPNETCORE
 using IRequest = Microsoft.Owin.IOwinRequest;
 #else
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
 #endif
 
-namespace WireMock.Owin.Mappers;
+namespace WireMock.Owin.Mappers
-
-/// <summary>
-/// OwinRequestMapper
-/// </summary>
-internal class OwinRequestMapper : IOwinRequestMapper
 {
-    /// <inheritdoc />
+    /// <summary>
-    public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
+    /// OwinRequestMapper
+    /// </summary>
+    internal class OwinRequestMapper : IOwinRequestMapper
     {
-        var (urlDetails, clientIP) = ParseRequest(request);
+        /// <inheritdoc cref="IOwinRequestMapper.MapAsync"/>
-
+        public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
-        var method = request.Method;
-        var httpVersion = HttpVersionParser.Parse(request.Protocol);
-
-        var headers = new Dictionary<string, string[]>();
-        IEnumerable<string>? contentEncodingHeader = null;
-        foreach (var header in request.Headers)
         {
-            headers.Add(header.Key, header.Value!);
+            var (urlDetails, clientIP) = ParseRequest(request);
 
-            if (string.Equals(header.Key, HttpKnownHeaderNames.ContentEncoding, StringComparison.OrdinalIgnoreCase))
+            string method = request.Method;
+
+            var headers = new Dictionary<string, string[]>();
+            IEnumerable<string>? contentEncodingHeader = null;
+            foreach (var header in request.Headers)
             {
-                contentEncodingHeader = header.Value;
+                headers.Add(header.Key, header.Value!);
+
+                if (string.Equals(header.Key, HttpKnownHeaderNames.ContentEncoding, StringComparison.OrdinalIgnoreCase))
+                {
+                    contentEncodingHeader = header.Value;
+                }
             }
-        }
 
-        var cookies = new Dictionary<string, string>();
+            var cookies = new Dictionary<string, string>();
-        if (request.Cookies.Any())
+            if (request.Cookies.Any())
-        {
-            foreach (var cookie in request.Cookies)
             {
-                cookies.Add(cookie.Key, cookie.Value);
+                cookies = new Dictionary<string, string>();
+                foreach (var cookie in request.Cookies)
+                {
+                    cookies.Add(cookie.Key, cookie.Value);
+                }
             }
-        }
 
-        IBodyData? body = null;
+            IBodyData? body = null;
-        if (request.Body != null && BodyParser.ShouldParseBody(method, options.AllowBodyForAllHttpMethods == true))
+            if (request.Body != null && BodyParser.ShouldParseBody(method, options.AllowBodyForAllHttpMethods == true))
-        {
-            var bodyParserSettings = new BodyParserSettings
             {
-                Stream = request.Body,
+                var bodyParserSettings = new BodyParserSettings
-                ContentType = request.ContentType,
+                {
-                DeserializeJson = !options.DisableJsonBodyParsing.GetValueOrDefault(false),
+                    Stream = request.Body,
-                ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
+                    ContentType = request.ContentType,
-                DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false)
+                    DeserializeJson = !options.DisableJsonBodyParsing.GetValueOrDefault(false),
-            };
+                    ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
+                    DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false)
+                };
 
-            body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+                body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
-        }
+            }
 
-        return new RequestMessage(
+            return new RequestMessage(
-            options,
+                options,
-            urlDetails,
+                urlDetails,
-            method,
+                method,
-            clientIP,
+                clientIP,
-            body,
+                body,
-            headers,
+                headers,
-            cookies,
+                cookies
-            httpVersion
 #if USE_ASPNETCORE
-            , await request.HttpContext.Connection.GetClientCertificateAsync()
+                , await request.HttpContext.Connection.GetClientCertificateAsync()
 #endif
-            )
+                )
-        {
+            {
-            DateTime = DateTime.UtcNow
+                DateTime = DateTime.UtcNow
-        };
+            };
-    }
+        }
 
-    private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
+        private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
-    {
+        {
 #if !USE_ASPNETCORE
-        var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
+            var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
-        var clientIP = request.RemoteIpAddress;
+            var clientIP = request.RemoteIpAddress;
 #else
-        var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);
+            var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);
 
-        var connection = request.HttpContext.Connection;
+            var connection = request.HttpContext.Connection;
-        string clientIP;
+            string clientIP;
-        if (connection.RemoteIpAddress is null)
+            if (connection.RemoteIpAddress is null)
-        {
+            {
-            clientIP = string.Empty;
+                clientIP = string.Empty;
-        }
+            }
-        else if (connection.RemoteIpAddress.IsIPv4MappedToIPv6)
+            else if (connection.RemoteIpAddress.IsIPv4MappedToIPv6)
-        {
+            {
-            clientIP = connection.RemoteIpAddress.MapToIPv4().ToString();
+                clientIP = connection.RemoteIpAddress.MapToIPv4().ToString();
-        }
+            }
-        else
+            else
-        {
+            {
-            clientIP = connection.RemoteIpAddress.ToString();
+                clientIP = connection.RemoteIpAddress.ToString();
-        }
+            }
 #endif
-        return (urlDetails, clientIP);
+            return (urlDetails, clientIP);
+        }
     }
 }

src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs

@@ -13,8 +13,6 @@ using WireMock.Http;
 using WireMock.ResponseBuilders;
 using WireMock.Types;
 using Stef.Validation;
-using WireMock.Util;
-
 #if !USE_ASPNETCORE
 using IResponse = Microsoft.Owin.IOwinResponse;
 #else
@@ -64,11 +62,11 @@ namespace WireMock.Owin.Mappers
             switch (responseMessage.FaultType)
             {
                 case FaultType.EMPTY_RESPONSE:
-                    bytes = IsFault(responseMessage) ? EmptyArray<byte>.Value : await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
+                    bytes = IsFault(responseMessage) ? EmptyArray<byte>.Value : GetNormalBody(responseMessage);
                     break;
 
                 case FaultType.MALFORMED_RESPONSE_CHUNK:
-                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false) ?? EmptyArray<byte>.Value;
+                    bytes = GetNormalBody(responseMessage) ?? EmptyArray<byte>.Value;
                     if (IsFault(responseMessage))
                     {
                         bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
@@ -76,18 +74,18 @@ namespace WireMock.Owin.Mappers
                     break;
 
                 default:
-                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
+                    bytes = GetNormalBody(responseMessage);
                     break;
             }
 
             var statusCodeType = responseMessage.StatusCode?.GetType();
             switch (statusCodeType)
             {
-                case { } when statusCodeType == typeof(int) || statusCodeType == typeof(int?) || statusCodeType.GetTypeInfo().IsEnum:
+                case { } typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
                     response.StatusCode = MapStatusCode((int)responseMessage.StatusCode!);
                     break;
 
-                case { } when statusCodeType == typeof(string):
+                case { } typeAsString when typeAsString == typeof(string):
                     // Note: this case will also match on null 
                     int.TryParse(responseMessage.StatusCode as string, out var result);
                     response.StatusCode = MapStatusCode(result);
@@ -110,8 +108,6 @@ namespace WireMock.Owin.Mappers
                     _options.Logger.Warn("Error writing response body. Exception : {0}", ex);
                 }
             }
-
-            SetResponseTrailingHeaders(responseMessage, response);
         }
 
         private int MapStatusCode(int code)
@@ -129,7 +125,7 @@ namespace WireMock.Owin.Mappers
             return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
         }
 
-        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
+        private byte[]? GetNormalBody(IResponseMessage responseMessage)
         {
             switch (responseMessage.BodyData?.DetectedBodyType)
             {
@@ -142,12 +138,6 @@ namespace WireMock.Owin.Mappers
                     var jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
                     return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
 
-#if PROTOBUF
-                case BodyType.ProtoBuf:
-                    var protoDefinition = responseMessage.BodyData.ProtoDefinition?.Invoke().Text;
-                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinition, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson).ConfigureAwait(false);
-#endif
-
                 case BodyType.Bytes:
                     return responseMessage.BodyData.BodyAsBytes;
 
@@ -167,17 +157,16 @@ namespace WireMock.Owin.Mappers
                 new[]
                 {
                     DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)
-                }
+                });
-            );
 
             // Set other headers
             foreach (var item in responseMessage.Headers!)
             {
                 var headerName = item.Key;
                 var value = item.Value;
-                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
+                if (ResponseHeadersToFix.ContainsKey(headerName))
                 {
-                    action?.Invoke(response, value);
+                    ResponseHeadersToFix[headerName]?.Invoke(response, value);
                 }
                 else
                 {
@@ -190,34 +179,6 @@ namespace WireMock.Owin.Mappers
             }
         }
 
-        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, IResponse response)
-        {
-            if (responseMessage.TrailingHeaders == null)
-            {
-                return;
-            }
-
-#if TRAILINGHEADERS
-            foreach (var item in responseMessage.TrailingHeaders)
-            {
-                var headerName = item.Key;
-                var value = item.Value;
-                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
-                {
-                    action?.Invoke(response, value);
-                }
-                else
-                {
-                    // Check if this trailing header can be added to the response
-                    if (response.SupportsTrailers() && !HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
-                    {
-                        response.AppendTrailer(headerName, new Microsoft.Extensions.Primitives.StringValues(value.ToArray()));
-                    }
-                }
-            }
-#endif
-        }
-
         private static void AppendResponseHeader(IResponse response, string headerName, string[] values)
         {
 #if !USE_ASPNETCORE

src/WireMock.Net/Plugin/PluginLoader.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace WireMock.Plugin;
+
+internal static class PluginLoader
+{
+    private static readonly ConcurrentDictionary<Type, Type> Assemblies = new();
+
+    public static T Load<T>(params object[] args) where T : class
+    {
+        var foundType = Assemblies.GetOrAdd(typeof(T), (type) =>
+        {
+            var files = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.dll");
+
+            Type? pluginType = null;
+            foreach (var file in files)
+            {
+                try
+                {
+                    var assembly = Assembly.Load(new AssemblyName
+                    {
+                        Name = Path.GetFileNameWithoutExtension(file)
+                    });
+
+                    pluginType = GetImplementationTypeByInterface<T>(assembly);
+                    if (pluginType != null)
+                    {
+                        break;
+                    }
+                }
+                catch
+                {
+                    // no-op: just try next .dll
+                }
+            }
+
+            if (pluginType != null)
+            {
+                return pluginType;
+            }
+
+            throw new DllNotFoundException($"No dll found which implements type '{type}'");
+        });
+
+        return (T)Activator.CreateInstance(foundType, args);
+    }
+
+    private static Type? GetImplementationTypeByInterface<T>(Assembly assembly)
+    {
+        return assembly.GetTypes().FirstOrDefault(t => typeof(T).IsAssignableFrom(t) && !t.GetTypeInfo().IsInterface);
+    }
+}

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -9,7 +9,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The BodyRequestBuilder interface.
 /// </summary>
-public interface IBodyRequestBuilder : IProtoBufRequestBuilder
+public interface IBodyRequestBuilder : IGraphQLRequestBuilder
 {
     /// <summary>
     /// WithBody: IMatcher

src/WireMock.Net/RequestBuilders/IGraphQLRequestBuilder.cs

@@ -26,23 +26,6 @@ public interface IGraphQLRequestBuilder : IMultiPartRequestBuilder
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a string.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
 #if GRAPHQL
     /// <summary>
     /// WithGraphQLSchema: The GraphQL schema as a ISchema.
@@ -60,22 +43,5 @@ public interface IGraphQLRequestBuilder : IMultiPartRequestBuilder
     /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
-    /// </summary>
-    /// <param name="schema">The GraphQL schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
-    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 #endif
 }

src/WireMock.Net/RequestBuilders/IHttpVersionBuilder.cs

@@ -1,18 +0,0 @@
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The HttpVersionBuilder interface.
-/// </summary>
-public interface IHttpVersionBuilder : IRequestMatcher
-{
-    /// <summary>
-    /// WithHttpVersion
-    /// </summary>
-    /// <param name="version">The HTTP Version to match.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithHttpVersion(string version, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-}

src/WireMock.Net/RequestBuilders/IMultiPartRequestBuilder.cs

@@ -6,7 +6,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The MultiPartRequestBuilder interface.
 /// </summary>
-public interface IMultiPartRequestBuilder : IHttpVersionBuilder
+public interface IMultiPartRequestBuilder : IRequestMatcher
 {
     /// <summary>
     /// WithMultiPart: IMatcher

src/WireMock.Net/RequestBuilders/IProtoBufRequestBuilder.cs

@@ -1,45 +0,0 @@
-using WireMock.Matchers;
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The ProtoBufRequestBuilder interface.
-/// </summary>
-public interface IProtoBufRequestBuilder : IGraphQLRequestBuilder
-{
-    /// <summary>
-    /// WithGrpcProto
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithGrpcProto
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithGrpcProto
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithGrpcProto
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-}

src/WireMock.Net/RequestBuilders/Request.ClientIP.cs

@@ -23,17 +23,17 @@ public partial class Request
     }
 
     /// <inheritdoc />
-    public IRequestBuilder WithClientIP(params string[] clientIPs)
+    public IRequestBuilder WithClientIP(params string[] paths)
     {
-        return WithClientIP(MatchOperator.Or, clientIPs);
+        return WithClientIP(MatchOperator.Or, paths);
     }
 
     /// <inheritdoc />
-    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] clientIPs)
+    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] paths)
     {
-        Guard.NotNullOrEmpty(clientIPs);
+        Guard.NotNullOrEmpty(paths);
 
-        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, clientIPs));
+        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, paths));
         return this;
     }
 

src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs

@@ -1,31 +0,0 @@
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new (null, protoDefinition), messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new(null, protoDefinition), messageType, matcher));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType, matcher));
-    }
-}

src/WireMock.Net/RequestBuilders/Request.WithGraphQL.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+        return this;
+    }
+
+#if GRAPHQL
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+        return this;
+    }
+#endif
+}

src/WireMock.Net/RequestBuilders/Request.WithGraphQLSchema.cs

@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-    }
-
-#if GRAPHQL
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-    }
-#endif
-}

src/WireMock.Net/RequestBuilders/Request.WithHttpVersion.cs

@@ -1,13 +0,0 @@
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithHttpVersion(string version, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageHttpVersionMatcher(matchBehaviour, version));
-    }
-}

src/WireMock.Net/RequestBuilders/Request.cs

@@ -16,11 +16,6 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
     private readonly IList<IRequestMatcher> _requestMatchers;
 
-    /// <summary>
-    /// The link back to the Mapping.
-    /// </summary>
-    public IMapping Mapping { get; set; } = null!;
-
     /// <summary>
     /// Creates this instance.
     /// </summary>
@@ -68,15 +63,4 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
     {
         return _requestMatchers.OfType<T>().FirstOrDefault(func);
     }
-
-    private IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
-    {
-        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
-        {
-            _requestMatchers.Remove(existing);
-        }
-
-        _requestMatchers.Add(requestMatcher);
-        return this;
-    }
 }

src/WireMock.Net/RequestMessage.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using Newtonsoft.Json;
 #if USE_ASPNETCORE
 using System.Security.Cryptography.X509Certificates;
 #endif
@@ -50,9 +51,6 @@ public class RequestMessage : IRequestMessage
     /// <inheritdoc />
     public string Method { get; }
 
-    /// <inheritdoc />
-    public string HttpVersion { get; }
-
     /// <inheritdoc />
     public IDictionary<string, WireMockList<string>>? Headers { get; }
 
@@ -75,14 +73,14 @@ public class RequestMessage : IRequestMessage
     public string? Body { get; }
 
     /// <inheritdoc />
-    public object? BodyAsJson { get; set; }
+    public object? BodyAsJson { get; }
 
     /// <inheritdoc />
     public byte[]? BodyAsBytes { get; }
 
 #if MIMEKIT
     /// <inheritdoc />
-    [Newtonsoft.Json.JsonIgnore] // Issue 1001
+    [JsonIgnore] // Issue 1001
     public object? BodyAsMimeMessage { get; }
 #endif
 
@@ -127,13 +125,11 @@ public class RequestMessage : IRequestMessage
 
     internal RequestMessage(
         IWireMockMiddlewareOptions? options,
-        UrlDetails urlDetails,
+        UrlDetails urlDetails, string method,
-        string method,
         string clientIP,
         IBodyData? bodyData = null,
         IDictionary<string, string[]>? headers = null,
-        IDictionary<string, string>? cookies = null,
+        IDictionary<string, string>? cookies = null
-        string httpVersion = "1.1"
 #if USE_ASPNETCORE
         , X509Certificate2? clientCertificate = null
 #endif
@@ -156,7 +152,6 @@ public class RequestMessage : IRequestMessage
         AbsolutePathSegments = AbsolutePath.Split('/').Skip(1).ToArray();
 
         Method = method;
-        HttpVersion = httpVersion;
         ClientIP = clientIP;
 
         BodyData = bodyData;

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -91,50 +91,18 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
     /// WithBody : Create a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
     /// </summary>
     /// <param name="body">The body.</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/>.</param>
+    /// <param name="converter">The JsonConverter.</param>
     /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBody(object body, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
+    IResponseBuilder WithBody(object body, IJsonConverter converter, JsonConverterOptions? options = null);
 
     /// <summary>
     /// WithBody : Create a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
     /// </summary>
     /// <param name="body">The body.</param>
     /// <param name="encoding">The body encoding, can be <c>null</c>.</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/>.</param>
+    /// <param name="converter">The JsonConverter.</param>
     /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
+    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter converter, JsonConverterOptions? options = null);
-
-    /// <summary>
-    /// WithBody : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
-
-    /// <summary>
-    /// WithBody : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
 }

src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs

@@ -9,7 +9,7 @@ namespace WireMock.ResponseBuilders;
 public interface IHeadersResponseBuilder : IBodyResponseBuilder
 {
     /// <summary>
-    /// The WithHeader.
+    /// The with header.
     /// </summary>
     /// <param name="name">The name.</param>
     /// <param name="values">The values.</param>
@@ -17,52 +17,23 @@ public interface IHeadersResponseBuilder : IBodyResponseBuilder
     IResponseBuilder WithHeader(string name, params string[] values);
 
     /// <summary>
-    /// The WithHeaders.
+    /// The with headers.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, string> headers);
 
     /// <summary>
-    /// The WithHeaders.
+    /// The with headers.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, string[]> headers);
 
     /// <summary>
-    /// The WithHeaders.
+    /// The with headers.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers);
-
-    /// <summary>
-    /// The WithTrailingHeader.
-    /// </summary>
-    /// <param name="name">The name.</param>
-    /// <param name="values">The values.</param>
-    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithTrailingHeader(string name, params string[] values);
-
-    /// <summary>
-    /// The WithTrailingHeaders.
-    /// </summary>
-    /// <param name="headers">The headers.</param>
-    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithTrailingHeaders(IDictionary<string, string> headers);
-
-    /// <summary>
-    /// The WithTrailingHeaders.
-    /// </summary>
-    /// <param name="headers">The headers.</param>
-    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithTrailingHeaders(IDictionary<string, string[]> headers);
-
-    /// <summary>
-    /// The WithTrailingHeaders.
-    /// </summary>
-    /// <param name="headers">The headers.</param>
-    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithTrailingHeaders(IDictionary<string, WireMockList<string>> headers);
 }

src/WireMock.Net/ResponseBuilders/Response.WithBody.cs

@@ -3,7 +3,6 @@ using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using Stef.Validation;
-using WireMock.Exceptions;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -186,79 +185,25 @@ public partial class Response
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithBody(object body, IJsonConverter jsonConverter, JsonConverterOptions? options = null)
+    public IResponseBuilder WithBody(object body, IJsonConverter converter, JsonConverterOptions? options = null)
     {
-        return WithBody(body, null, jsonConverter, options);
+        return WithBody(body, null, converter, options);
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null)
+    public IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter converter, JsonConverterOptions? options = null)
     {
         Guard.NotNull(body);
-        Guard.NotNull(jsonConverter);
+        Guard.NotNull(converter);
 
         ResponseMessage.BodyDestination = null;
         ResponseMessage.BodyData = new BodyData
         {
             Encoding = encoding,
             DetectedBodyType = BodyType.String,
-            BodyAsString = jsonConverter.Serialize(body, options)
+            BodyAsString = converter.Serialize(body, options)
         };
 
         return this;
     }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrWhiteSpace(protoDefinition);
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => new (null, protoDefinition),
-            ProtoBufMessageType = messageType
-        };
-#endif
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => Mapping.ProtoDefinition ?? throw new WireMockException("ProtoDefinition cannot be resolved. You probably forgot to call .WithProtoDefinition(...) on the mapping."),
-            ProtoBufMessageType = messageType
-        };
-#endif
-        return this;
-    }
 }

src/WireMock.Net/ResponseBuilders/Response.WithHeaders.cs

@@ -1,101 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Stef.Validation;
-using WireMock.Types;
-
-namespace WireMock.ResponseBuilders;
-
-public partial class Response
-{
-    /// <inheritdoc />
-    public IResponseBuilder WithHeader(string name, params string[] values)
-    {
-        Guard.NotNull(name);
-
-        ResponseMessage.AddHeader(name, values);
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers;
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithTrailingHeader(string name, params string[] values)
-    {
-#if !TRAILINGHEADERS
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-
-        Guard.NotNull(name);
-
-        ResponseMessage.AddTrailingHeader(name, values);
-        return this;
-#endif
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithTrailingHeaders(IDictionary<string, string> headers)
-    {
-#if !TRAILINGHEADERS
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-
-        Guard.NotNull(headers);
-
-        ResponseMessage.TrailingHeaders = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-#endif
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithTrailingHeaders(IDictionary<string, string[]> headers)
-    {
-#if !TRAILINGHEADERS
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-
-        Guard.NotNull(headers);
-
-        ResponseMessage.TrailingHeaders = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-#endif
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithTrailingHeaders(IDictionary<string, WireMockList<string>> headers)
-    {
-#if !TRAILINGHEADERS
-        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-
-        Guard.NotNull(headers);
-
-        ResponseMessage.TrailingHeaders = headers;
-        return this;
-#endif
-    }
-}

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -1,20 +1,19 @@
 // This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Stef.Validation;
-using WireMock.Matchers.Request;
 using WireMock.Proxy;
-using WireMock.RequestBuilders;
 using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Transformers.Handlebars;
 using WireMock.Transformers.Scriban;
 using WireMock.Types;
-using WireMock.Util;
 
 namespace WireMock.ResponseBuilders;
 
@@ -27,11 +26,6 @@ public partial class Response : IResponseBuilder
 
     private TimeSpan? _delay;
 
-    /// <summary>
-    /// The link back to the mapping.
-    /// </summary>
-    public IMapping Mapping { get; set; } = null!;
-
     /// <summary>
     /// The minimum random delay in milliseconds.
     /// </summary>
@@ -118,7 +112,7 @@ public partial class Response : IResponseBuilder
     {
         ResponseMessage = responseMessage;
     }
-
+    
     /// <inheritdoc cref="IStatusCodeResponseBuilder.WithStatusCode(int)"/>
     [PublicAPI]
     public IResponseBuilder WithStatusCode(int code)
@@ -162,6 +156,42 @@ public partial class Response : IResponseBuilder
         return WithStatusCode((int)HttpStatusCode.NotFound);
     }
 
+    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeader(string, string[])"/>
+    public IResponseBuilder WithHeader(string name, params string[] values)
+    {
+        Guard.NotNull(name);
+
+        ResponseMessage.AddHeader(name, values);
+        return this;
+    }
+
+    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string})"/>
+    public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+    }
+
+    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string[]})"/>
+    public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+    }
+
+    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, WireMockList{string}})"/>
+    public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers;
+        return this;
+    }
+
     /// <inheritdoc cref="ITransformResponseBuilder.WithTransformer(bool)"/>
     public IResponseBuilder WithTransformer(bool transformContentFromBodyAsFile)
     {
@@ -274,30 +304,10 @@ public partial class Response : IResponseBuilder
             {
                 responseMessage.Headers = ResponseMessage.Headers;
             }
-
-            // Copy TrailingHeaders from ResponseMessage (if defined)
-            if (ResponseMessage.TrailingHeaders?.Count > 0)
-            {
-                responseMessage.TrailingHeaders = ResponseMessage.TrailingHeaders;
-            }
         }
 
         if (UseTransformer)
         {
-            // Check if the body matcher is a RequestMessageProtoBufMatcher and try to to decode the byte-array to a BodyAsJson.
-            if (mapping.RequestMatcher is Request requestMatcher && requestMessage is RequestMessage request)
-            {
-                var protoBufMatcher = requestMatcher.GetRequestMessageMatcher<RequestMessageProtoBufMatcher>()?.Matcher;
-                if (protoBufMatcher != null)
-                {
-                    var decoded = await protoBufMatcher.DecodeAsync(request.BodyData?.BodyAsBytes).ConfigureAwait(false);
-                    if (decoded != null)
-                    {
-                        request.BodyAsJson = JsonUtils.ConvertValueToJToken(decoded);
-                    }
-                }
-            }
-
             ITransformer responseMessageTransformer;
             switch (TransformerType)
             {

src/WireMock.Net/ResponseMessage.cs

@@ -14,12 +14,9 @@ namespace WireMock;
 /// </summary>
 public class ResponseMessage : IResponseMessage
 {
-    /// <inheritdoc />
+    /// <inheritdoc cref="IResponseMessage.Headers" />
     public IDictionary<string, WireMockList<string>>? Headers { get; set; } = new Dictionary<string, WireMockList<string>>();
 
-    /// <inheritdoc />
-    public IDictionary<string, WireMockList<string>>? TrailingHeaders { get; set; } = new Dictionary<string, WireMockList<string>>();
-
     /// <inheritdoc cref="IResponseMessage.StatusCode" />
     public object? StatusCode { get; set; }
 
@@ -38,43 +35,23 @@ public class ResponseMessage : IResponseMessage
     /// <inheritdoc cref="IResponseMessage.FaultPercentage" />
     public double? FaultPercentage { get; set; }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IResponseMessage.AddHeader(string, string)" />
     public void AddHeader(string name, string value)
     {
         Headers ??= new Dictionary<string, WireMockList<string>>();
         Headers.Add(name, value);
     }
 
-    /// <inheritdoc />
+    /// <inheritdoc cref="IResponseMessage.AddHeader(string, string[])" />
     public void AddHeader(string name, params string[] values)
     {
         Guard.NotNullOrEmpty(values);
 
         Headers ??= new Dictionary<string, WireMockList<string>>();
-        var newHeaderValues = Headers.TryGetValue(name, out var existingValues)
+        var newHeaderValues = Headers.TryGetValue(name, out WireMockList<string>? existingValues)
             ? values.Union(existingValues).ToArray()
             : values;
 
         Headers[name] = newHeaderValues;
     }
-
-    /// <inheritdoc />
-    public void AddTrailingHeader(string name, string value)
-    {
-        TrailingHeaders ??= new Dictionary<string, WireMockList<string>>();
-        TrailingHeaders.Add(name, value);
-    }
-
-    /// <inheritdoc />
-    public void AddTrailingHeader(string name, params string[] values)
-    {
-        Guard.NotNullOrEmpty(values);
-
-        TrailingHeaders ??= new Dictionary<string, WireMockList<string>>();
-        var newHeaderValues = TrailingHeaders.TryGetValue(name, out var existingValues)
-            ? values.Union(existingValues).ToArray()
-            : values;
-
-        TrailingHeaders[name] = newHeaderValues;
-    }
 }

src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Stef.Validation;
 using WireMock.Settings;
 
 namespace WireMock.ResponseProviders;
@@ -11,7 +10,7 @@ internal class DynamicAsyncResponseProvider : IResponseProvider
 
     public DynamicAsyncResponseProvider(Func<IRequestMessage, Task<IResponseMessage>> responseMessageFunc)
     {
-        _responseMessageFunc = Guard.NotNull(responseMessageFunc);
+        _responseMessageFunc = responseMessageFunc;
     }
 
     public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings)

src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Stef.Validation;
 using WireMock.Settings;
 
 namespace WireMock.ResponseProviders;
@@ -11,7 +10,7 @@ internal class DynamicResponseProvider : IResponseProvider
 
     public DynamicResponseProvider(Func<IRequestMessage, IResponseMessage> responseMessageFunc)
     {
-        _responseMessageFunc = Guard.NotNull(responseMessageFunc);
+        _responseMessageFunc = responseMessageFunc;
     }
 
     public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings)

src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Stef.Validation;
 using WireMock.Settings;
 
 namespace WireMock.ResponseProviders;
@@ -12,8 +11,8 @@ internal class ProxyAsyncResponseProvider : IResponseProvider
 
     public ProxyAsyncResponseProvider(Func<IRequestMessage, WireMockServerSettings, Task<IResponseMessage>> responseMessageFunc, WireMockServerSettings settings)
     {
-        _responseMessageFunc = Guard.NotNull(responseMessageFunc);
+        _responseMessageFunc = responseMessageFunc;
-        _settings = Guard.NotNull(settings);
+        _settings = settings;
     }
 
     public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings)

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -32,7 +32,6 @@ internal class LogEntryMapper
             ProxyUrl = logEntry.RequestMessage.ProxyUrl,
             Query = logEntry.RequestMessage.Query,
             Method = logEntry.RequestMessage.Method,
-            HttpVersion = logEntry.RequestMessage.HttpVersion,
             Headers = logEntry.RequestMessage.Headers,
             Cookies = logEntry.RequestMessage.Cookies
         };

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -14,6 +14,7 @@ using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -47,10 +48,8 @@ internal class MappingConverter
         var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
         var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
         var requestMessageBodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
-        var requestMessageHttpVersionMatcher = request.GetRequestMessageMatcher<RequestMessageHttpVersionMatcher>();
         var requestMessageGraphQLMatcher = request.GetRequestMessageMatcher<RequestMessageGraphQLMatcher>();
         var requestMessageMultiPartMatcher = request.GetRequestMessageMatcher<RequestMessageMultiPartMatcher>();
-        var requestMessageProtoBufMatcher = request.GetRequestMessageMatcher<RequestMessageProtoBufMatcher>();
 
         var sb = new StringBuilder();
 
@@ -109,11 +108,6 @@ internal class MappingConverter
             sb.AppendLine($"        .WithCookie(\"{cookieMatcher.Name}\", {ToValueArguments(GetStringArray(cookieMatcher.Matchers!))}, true)");
         }
 
-        if (requestMessageHttpVersionMatcher?.HttpVersion != null)
-        {
-            sb.AppendLine($"        .WithHttpVersion({requestMessageHttpVersionMatcher.HttpVersion})");
-        }
-
 #if GRAPHQL
         if (requestMessageGraphQLMatcher is { Matchers: { } })
         {
@@ -134,13 +128,6 @@ internal class MappingConverter
         }
 #endif
 
-#if PROTOBUF
-        if (requestMessageProtoBufMatcher is { Matcher: { } })
-        {
-            sb.AppendLine("        // .WithBodyAsProtoBuf() is not yet supported");
-        }
-#endif
-
         if (requestMessageBodyMatcher is { Matchers: { } })
         {
             if (requestMessageBodyMatcher.Matchers.OfType<WildcardMatcher>().FirstOrDefault() is { } wildcardMatcher && wildcardMatcher.GetPatterns().Any())
@@ -195,14 +182,6 @@ internal class MappingConverter
             }
         }
 
-        if (response.ResponseMessage.TrailingHeaders is { })
-        {
-            foreach (var header in response.ResponseMessage.TrailingHeaders)
-            {
-                sb.AppendLine($"        .WithTrailingHeader(\"{header.Key}\", {ToValueArguments(header.Value.ToArray())})");
-            }
-        }
-
         if (response.ResponseMessage.BodyData is { } bodyData)
         {
             switch (response.ResponseMessage.BodyData.DetectedBodyType)
@@ -211,7 +190,6 @@ internal class MappingConverter
                 case BodyType.FormUrlEncoded:
                     sb.AppendLine($"        .WithBody({ToCSharpStringLiteral(bodyData.BodyAsString)})");
                     break;
-
                 case BodyType.Json:
                     if (bodyData.BodyAsJson is string bodyStringValue)
                     {
@@ -261,8 +239,6 @@ internal class MappingConverter
         var bodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
         var graphQLMatcher = request.GetRequestMessageMatcher<RequestMessageGraphQLMatcher>();
         var multiPartMatcher = request.GetRequestMessageMatcher<RequestMessageMultiPartMatcher>();
-        var protoBufMatcher = request.GetRequestMessageMatcher<RequestMessageProtoBufMatcher>();
-        var httpVersionMatcher = request.GetRequestMessageMatcher<RequestMessageHttpVersionMatcher>();
 
         var mappingModel = new MappingModel
         {
@@ -277,7 +253,6 @@ internal class MappingConverter
             WhenStateIs = mapping.ExecutionConditionState,
             SetStateTo = mapping.NextState,
             Data = mapping.Data,
-            ProtoDefinition = mapping.ProtoDefinition?.Value,
             Probability = mapping.Probability,
             Request = new RequestModel
             {
@@ -315,11 +290,6 @@ internal class MappingConverter
             mappingModel.Request.MethodsMatchOperator = methodMatcher.Methods.Length > 1 ? methodMatcher.MatchOperator.ToString() : null;
         }
 
-        if (httpVersionMatcher?.HttpVersion != null)
-        {
-            mappingModel.Request.HttpVersion = httpVersionMatcher.HttpVersion;
-        }
-
         if (clientIPMatcher is { Matchers: { } })
         {
             var clientIPMatchers = _mapper.Map(clientIPMatcher.Matchers);
@@ -359,7 +329,7 @@ internal class MappingConverter
             mappingModel.Response.Delay = (int?)(response.Delay == Timeout.InfiniteTimeSpan ? TimeSpan.MaxValue.TotalMilliseconds : response.Delay?.TotalMilliseconds);
         }
 
-        var nonNullableWebHooks = mapping.Webhooks?.ToArray() ?? EmptyArray<IWebhook>.Value;
+        var nonNullableWebHooks = mapping.Webhooks?.Where(wh => wh != null).ToArray() ?? EmptyArray<IWebhook>.Value;
         if (nonNullableWebHooks.Length == 1)
         {
             mappingModel.Webhook = WebhookMapper.Map(nonNullableWebHooks[0]);
@@ -369,40 +339,20 @@ internal class MappingConverter
             mappingModel.Webhooks = mapping.Webhooks.Select(WebhookMapper.Map).ToArray();
         }
 
-        var bodyMatchers =
+        var bodyMatchers = multiPartMatcher?.Matchers ?? graphQLMatcher?.Matchers ?? bodyMatcher?.Matchers;
-            protoBufMatcher?.Matcher != null ? new[] { protoBufMatcher.Matcher } : null ??
+        var matchOperator = multiPartMatcher?.MatchOperator ?? graphQLMatcher?.MatchOperator ?? bodyMatcher?.MatchOperator;
-            multiPartMatcher?.Matchers ??
-            graphQLMatcher?.Matchers ??
-            bodyMatcher?.Matchers;
 
-        var matchOperator =
+        if (bodyMatchers != null && matchOperator != null)
-            multiPartMatcher?.MatchOperator ??
-            graphQLMatcher?.MatchOperator ??
-            bodyMatcher?.MatchOperator ??
-            MatchOperator.Or;
-
-        if (bodyMatchers != null)
         {
-            void AfterMap(MatcherModel matcherModel)
-            {
-#if PROTOBUF
-                // In case the ProtoDefinition is defined at the Mapping level, clear the Pattern at the Matcher level
-                if (bodyMatchers?.OfType<ProtoBufMatcher>().Any() == true && mappingModel.ProtoDefinition != null)
-                {
-                    matcherModel.Pattern = null;
-                }
-#endif
-            }
-
             mappingModel.Request.Body = new BodyModel();
 
             if (bodyMatchers.Length == 1)
             {
-                mappingModel.Request.Body.Matcher = _mapper.Map(bodyMatchers[0], AfterMap);
+                mappingModel.Request.Body.Matcher = _mapper.Map(bodyMatchers[0]);
             }
             else if (bodyMatchers.Length > 1)
             {
-                mappingModel.Request.Body.Matchers = _mapper.Map(bodyMatchers, AfterMap);
+                mappingModel.Request.Body.Matchers = _mapper.Map(bodyMatchers);
                 mappingModel.Request.Body.MatchOperator = matchOperator.ToString();
             }
         }
@@ -440,11 +390,6 @@ internal class MappingConverter
                 mappingModel.Response.Headers = MapHeaders(response.ResponseMessage.Headers);
             }
 
-            if (response.ResponseMessage.TrailingHeaders is { Count: > 0 })
-            {
-                mappingModel.Response.TrailingHeaders = MapHeaders(response.ResponseMessage.TrailingHeaders);
-            }
-
             if (response.UseTransformer)
             {
                 mappingModel.Response.UseTransformer = response.UseTransformer;
@@ -457,7 +402,43 @@ internal class MappingConverter
                 mappingModel.Response.UseTransformerForBodyAsFile = response.UseTransformerForBodyAsFile;
             }
 
-            MapResponse(response, mappingModel);
+            if (response.ResponseMessage.BodyData != null)
+            {
+                switch (response.ResponseMessage.BodyData?.DetectedBodyType)
+                {
+                    case BodyType.String:
+                    case BodyType.FormUrlEncoded:
+                        mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
+                        break;
+
+                    case BodyType.Json:
+                        mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
+                        if (response.ResponseMessage.BodyData.BodyAsJsonIndented == true)
+                        {
+                            mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
+                        }
+                        break;
+
+                    case BodyType.Bytes:
+                        mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyData.BodyAsBytes;
+                        break;
+
+                    case BodyType.File:
+                        mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyData.BodyAsFile;
+                        mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyData.BodyAsFileIsCached;
+                        break;
+                }
+
+                if (response.ResponseMessage.BodyData?.Encoding != null && response.ResponseMessage.BodyData.Encoding.WebName != "utf-8")
+                {
+                    mappingModel.Response.BodyEncoding = new EncodingModel
+                    {
+                        EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
+                        CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
+                        WebName = response.ResponseMessage.BodyData.Encoding.WebName
+                    };
+                }
+            }
 
             if (response.ResponseMessage.FaultType != FaultType.NONE)
             {
@@ -472,61 +453,6 @@ internal class MappingConverter
         return mappingModel;
     }
 
-    private static void MapResponse(Response response, MappingModel mappingModel)
-    {
-        if (response.ResponseMessage.BodyData == null)
-        {
-            return;
-        }
-
-        switch (response.ResponseMessage.BodyData?.DetectedBodyType)
-        {
-            case BodyType.String:
-            case BodyType.FormUrlEncoded:
-                mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
-                break;
-
-            case BodyType.Json:
-                mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
-                if (response.ResponseMessage.BodyData.BodyAsJsonIndented == true)
-                {
-                    mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
-                }
-                break;
-
-            case BodyType.ProtoBuf:
-                // If the ProtoDefinition is not defined at the MappingModel, get the ProtoDefinition from the ResponseMessage.
-                if (mappingModel.ProtoDefinition == null)
-                {
-                    mappingModel.Response.ProtoDefinition = response.ResponseMessage.BodyData.ProtoDefinition?.Invoke().Value;
-                }
-
-                mappingModel.Response.ProtoBufMessageType = response.ResponseMessage.BodyData.ProtoBufMessageType;
-                mappingModel.Response.BodyAsBytes = null;
-                mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
-                break;
-
-            case BodyType.Bytes:
-                mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyData.BodyAsBytes;
-                break;
-
-            case BodyType.File:
-                mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyData.BodyAsFile;
-                mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyData.BodyAsFileIsCached;
-                break;
-        }
-
-        if (response.ResponseMessage.BodyData?.Encoding != null && response.ResponseMessage.BodyData.Encoding.WebName != "utf-8")
-        {
-            mappingModel.Response.BodyEncoding = new EncodingModel
-            {
-                EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
-                CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
-                WebName = response.ResponseMessage.BodyData.Encoding.WebName
-            };
-        }
-    }
-
     private static string GetString(IStringMatcher stringMatcher)
     {
         return stringMatcher.GetPatterns().Select(p => ToCSharpStringLiteral(p.GetPattern())).First();

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -8,6 +8,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Extensions;
 using WireMock.Matchers;
 using WireMock.Models;
+using WireMock.Plugin;
 using WireMock.Settings;
 using WireMock.Util;
 
@@ -24,25 +25,29 @@ internal class MatcherMapper
 
     public IMatcher[]? Map(IEnumerable<MatcherModel>? matchers)
     {
-        return matchers?.Select(Map).OfType<IMatcher>().ToArray();
+        if (matchers == null)
+        {
+            return null;
+        }
+        return matchers.Select(Map).Where(m => m != null).ToArray()!;
     }
 
-    public IMatcher? Map(MatcherModel? matcherModel)
+    public IMatcher? Map(MatcherModel? matcher)
     {
-        if (matcherModel == null)
+        if (matcher == null)
         {
             return null;
         }
 
-        string[] parts = matcherModel.Name.Split('.');
+        string[] parts = matcher.Name.Split('.');
         string matcherName = parts[0];
         string? matcherType = parts.Length > 1 ? parts[1] : null;
-        var stringPatterns = ParseStringPatterns(matcherModel);
+        var stringPatterns = ParseStringPatterns(matcher);
-        var matchBehaviour = matcherModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+        var matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
-        var matchOperator = StringUtils.ParseMatchOperator(matcherModel.MatchOperator);
+        var matchOperator = StringUtils.ParseMatchOperator(matcher.MatchOperator);
-        bool ignoreCase = matcherModel.IgnoreCase == true;
+        bool ignoreCase = matcher.IgnoreCase == true;
         bool useRegexExtended = _settings.UseRegexExtended == true;
-        bool useRegex = matcherModel.Regex == true;
+        bool useRegex = matcher.Regex == true;
 
         switch (matcherName)
         {
@@ -52,7 +57,7 @@ internal class MatcherMapper
             case "CSharpCodeMatcher":
                 if (_settings.AllowCSharpCodeMatcher == true)
                 {
-                    return TypeLoader.Load<ICSharpCodeMatcher>(matchBehaviour, matchOperator, stringPatterns);
+                    return PluginLoader.Load<ICSharpCodeMatcher>(matchBehaviour, matchOperator, stringPatterns);
                 }
 
                 throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because WireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
@@ -67,31 +72,26 @@ internal class MatcherMapper
                 return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0]);
 #if GRAPHQL
             case nameof(GraphQLMatcher):
-                return new GraphQLMatcher(stringPatterns[0].GetPattern(), matcherModel.CustomScalars, matchBehaviour, matchOperator);
+                return new GraphQLMatcher(stringPatterns[0].GetPattern(), matcher.CustomScalars, matchBehaviour, matchOperator);
 #endif
 
 #if MIMEKIT
             case nameof(MimePartMatcher):
-                return CreateMimePartMatcher(matchBehaviour, matcherModel);
+                return CreateMimePartMatcher(matchBehaviour, matcher);
-#endif
-
-#if PROTOBUF
-            case nameof(ProtoBufMatcher):
-                return CreateProtoBufMatcher(matchBehaviour, stringPatterns[0].GetPattern(), matcherModel);
 #endif
             case nameof(RegexMatcher):
                 return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, useRegexExtended, matchOperator);
 
             case nameof(JsonMatcher):
-                var valueForJsonMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                var valueForJsonMatcher = matcher.Pattern ?? matcher.Patterns;
-                return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase, useRegex);
+                return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase);
 
             case nameof(JsonPartialMatcher):
-                var valueForJsonPartialMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                var valueForJsonPartialMatcher = matcher.Pattern ?? matcher.Patterns;
                 return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher!, ignoreCase, useRegex);
 
             case nameof(JsonPartialWildcardMatcher):
-                var valueForJsonPartialWildcardMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                var valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns;
                 return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher!, ignoreCase, useRegex);
 
             case nameof(JsonPathMatcher):
@@ -101,7 +101,7 @@ internal class MatcherMapper
                 return new JmesPathMatcher(matchBehaviour, matchOperator, stringPatterns);
 
             case nameof(XPathMatcher):
-                return new XPathMatcher(matchBehaviour, matchOperator, matcherModel.XmlNamespaceMap, stringPatterns);
+                return new XPathMatcher(matchBehaviour, matchOperator, matcher.XmlNamespaceMap, stringPatterns);
 
             case nameof(WildcardMatcher):
                 return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, matchOperator);
@@ -121,19 +121,19 @@ internal class MatcherMapper
             default:
                 if (_settings.CustomMatcherMappings != null && _settings.CustomMatcherMappings.ContainsKey(matcherName))
                 {
-                    return _settings.CustomMatcherMappings[matcherName](matcherModel);
+                    return _settings.CustomMatcherMappings[matcherName](matcher);
                 }
 
                 throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
         }
     }
 
-    public MatcherModel[]? Map(IEnumerable<IMatcher>? matchers, Action<MatcherModel>? afterMap = null)
+    public MatcherModel[]? Map(IEnumerable<IMatcher>? matchers)
     {
-        return matchers?.Select(m => Map(m, afterMap)).OfType<MatcherModel>().ToArray();
+        return matchers?.Where(m => m != null).Select(Map).ToArray();
     }
 
-    public MatcherModel? Map(IMatcher? matcher, Action<MatcherModel>? afterMap = null)
+    public MatcherModel? Map(IMatcher? matcher)
     {
         if (matcher == null)
         {
@@ -152,8 +152,12 @@ internal class MatcherMapper
 
         switch (matcher)
         {
-            case JsonMatcher jsonMatcher:
+            case JsonPartialMatcher jsonPartialMatcher:
-                model.Regex = jsonMatcher.Regex;
+                model.Regex = jsonPartialMatcher.Regex;
+                break;
+
+            case JsonPartialWildcardMatcher jsonPartialWildcardMatcher:
+                model.Regex = jsonPartialWildcardMatcher.Regex;
                 break;
 
             case XPathMatcher xpathMatcher:
@@ -190,9 +194,14 @@ internal class MatcherMapper
                 }
                 break;
 
-            // If the matcher is a IObjectMatcher, get the value (can be string or object or byte[]).
+            // If the matcher is a IValueMatcher, get the value (can be string or object).
-            case IObjectMatcher objectMatcher:
+            case IValueMatcher valueMatcher:
-                model.Pattern = objectMatcher.Value;
+                model.Pattern = valueMatcher.Value;
+                break;
+
+            // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
+            case ExactObjectMatcher exactObjectMatcher:
+                model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
                 break;
 
 #if MIMEKIT
@@ -203,18 +212,8 @@ internal class MatcherMapper
                 model.ContentTypeMatcher = Map(mimePartMatcher.ContentTypeMatcher);
                 break;
 #endif
-
-#if PROTOBUF
-            case ProtoBufMatcher protoBufMatcher:
-                model.Pattern = protoBufMatcher.ProtoDefinition().Value;
-                model.ProtoBufMessageType = protoBufMatcher.MessageType;
-                model.ContentMatcher = Map(protoBufMatcher.Matcher);
-                break;
-#endif
         }
 
-        afterMap?.Invoke(model);
-
         return model;
     }
 
@@ -261,7 +260,7 @@ internal class MatcherMapper
     }
 
 #if MIMEKIT
-    private MimePartMatcher CreateMimePartMatcher(MatchBehaviour matchBehaviour, MatcherModel matcher)
+    private MimePartMatcher CreateMimePartMatcher(MatchBehaviour matchBehaviour, MatcherModel? matcher)
     {
         var contentTypeMatcher = Map(matcher?.ContentTypeMatcher) as IStringMatcher;
         var contentDispositionMatcher = Map(matcher?.ContentDispositionMatcher) as IStringMatcher;
@@ -271,28 +270,4 @@ internal class MatcherMapper
         return new MimePartMatcher(matchBehaviour, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher);
     }
 #endif
-
-#if PROTOBUF
-    private ProtoBufMatcher CreateProtoBufMatcher(MatchBehaviour? matchBehaviour, string protoDefinitionOrId, MatcherModel matcher)
-    {
-        var objectMatcher = Map(matcher.ContentMatcher) as IObjectMatcher;
-
-        IdOrText protoDefinition;
-        if (_settings.ProtoDefinitions?.TryGetValue(protoDefinitionOrId, out var protoDefinitionFromSettings) == true)
-        {
-            protoDefinition = new(protoDefinitionOrId, protoDefinitionFromSettings);
-        }
-        else
-        {
-            protoDefinition = new(null, protoDefinitionOrId);
-        }
-
-        return new ProtoBufMatcher(
-            () => protoDefinition,
-            matcher!.ProtoBufMessageType!,
-            matchBehaviour ?? MatchBehaviour.AcceptOnMatch,
-            objectMatcher
-        );
-    }
-#endif
 }