1.5.1

* Update WireMock.Org.Abstractions and WireMock.Org.RestClient

* .

* rename

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.5.1 (08 July 2022)
+- [#762](https://github.com/WireMock-Net/WireMock.Net/pull/762) - Bump Newtonsoft.Json from 11.0.2 to 13.0.1 in /examples/WireMock.Net.WebApplication.NETCore2 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#763](https://github.com/WireMock-Net/WireMock.Net/pull/763) - Bump Newtonsoft.Json from 6.0.1 to 13.0.1 in /examples/WireMock.Net.Client.Net472 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#765](https://github.com/WireMock-Net/WireMock.Net/pull/765) - Update WireMock.Org.Abstractions and WireMock.Org.RestClient [feature] contributed by [StefH](https://github.com/StefH)
+- [#766](https://github.com/WireMock-Net/WireMock.Net/pull/766) - Bump Microsoft.AspNetCore.Http from 2.1.1 to 2.1.22 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#767](https://github.com/WireMock-Net/WireMock.Net/pull/767) - Rename (WireMock.Pact.Models.V2)-Request to PactRequest and -Response to PactResponse [feature] contributed by [StefH](https://github.com/StefH)
+- [#764](https://github.com/WireMock-Net/WireMock.Net/issues/764) - Wrong mapping of method GetAdminMappingsAsync from IWireMockOrgApi [bug]
+
+# 1.5.0 (09 June 2022)
+- [#755](https://github.com/WireMock-Net/WireMock.Net/pull/755) - Add MatchOperator "Or", "And" and "Average" for patterns [feature] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.43 (21 May 2022)
 - [#757](https://github.com/WireMock-Net/WireMock.Net/pull/757) - Log correct exception message when handling aggregate exceptions contributed by [siewers](https://github.com/siewers)
 - [#759](https://github.com/WireMock-Net/WireMock.Net/pull/759) - Add WireMock.Net.xUnit project [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.43</VersionPrefix>
+        <VersionPrefix>1.5.1</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.4.43
+SET version=1.5.1
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,7 +1,9 @@
-# 1.4.43 (21 May 2022)
-- #757 Log correct exception message when handling aggregate exceptions
-- #759 Add WireMock.Net.xUnit project [feature]
-- #756 WireMockConsoleLogger aggregate exception handling bug? [bug]
-- #758 Add support for logging to an xUnit ITestOutputHelper [feature]
+# 1.5.1 (08 July 2022)
+- #762 Bump Newtonsoft.Json from 11.0.2 to 13.0.1 in /examples/WireMock.Net.WebApplication.NETCore2 [dependencies]
+- #763 Bump Newtonsoft.Json from 6.0.1 to 13.0.1 in /examples/WireMock.Net.Client.Net472 [dependencies]
+- #765 Update WireMock.Org.Abstractions and WireMock.Org.RestClient [feature]
+- #766 Bump Microsoft.AspNetCore.Http from 2.1.1 to 2.1.22 in /examples/WireMock.Net.StandAlone.Net461 [dependencies]
+- #767 Rename (WireMock.Pact.Models.V2)-Request to PactRequest and -Response to PactResponse [feature]
+- #764 Wrong mapping of method GetAdminMappingsAsync from IWireMockOrgApi [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Client.Net472/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Brutal.Dev.StrongNameSigner" version="2.7.1" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="RestEase" version="1.4.10" targetFramework="net472" />
   <package id="WireMock.Net.Abstractions" version="1.2.0" targetFramework="net472" />
   <package id="WireMock.Net.RestClient" version="1.2.0" targetFramework="net472" />

examples/WireMock.Net.Client/WireMock.Net.Client.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestEase" Version="1.5.6" />
+    <PackageReference Include="RestEase" Version="1.5.7" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -79,7 +79,7 @@ namespace WireMock.Net.ConsoleApplication
 
             // server.AllowPartialMapping();
 
-            server.Given(Request.Create().WithPath("/mypath").UsingPost())
+            server.Given(Request.Create().WithPath(MatchOperator.Or, "/mypath", "/mypath1", "/mypath2").UsingPost())
                 .RespondWith(Response.Create()
                         .WithHeader("Content-Type", "application/json")
                         .WithBodyAsJson("{{JsonPath.SelectToken request.body \"..name\"}}")

examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj

@@ -204,8 +204,8 @@
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
-    <Reference Include="RestEase, Version=1.5.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.5.5\lib\net45\RestEase.dll</HintPath>
+    <Reference Include="RestEase, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.5.7\lib\net452\RestEase.dll</HintPath>
     </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>

examples/WireMock.Net.StandAlone.Net461/packages.config

@@ -15,7 +15,7 @@
   <package id="Microsoft.AspNetCore.Hosting" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http" version="2.1.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http" version="2.1.22" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.Http.Extensions" version="2.1.1" targetFramework="net461" />
   <package id="Microsoft.AspNetCore.Http.Features" version="2.1.1" targetFramework="net461" />
@@ -59,7 +59,7 @@
   <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Owin" version="1.0" targetFramework="net461" />
-  <package id="RestEase" version="1.5.5" targetFramework="net461" />
+  <package id="RestEase" version="1.5.7" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />

examples/WireMock.Net.WebApplication.NETCore2/WireMock.Net.WebApplication.NETCore2.csproj

@@ -12,7 +12,7 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">

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

@@ -1,19 +1,27 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Body Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class BodyModel
 {
     /// <summary>
-    /// Body Model
+    /// Gets or sets the matcher.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class BodyModel
-    {
-        /// <summary>
-        /// Gets or sets the matcher.
-        /// </summary>
-        public MatcherModel? Matcher { get; set; }
+    public MatcherModel? Matcher { get; set; }
 
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public MatcherModel[]? Matchers { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the matchers.
+    /// </summary>
+    public MatcherModel[]? Matchers { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
 }

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

@@ -1,14 +1,22 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// ClientIPModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ClientIPModel
 {
     /// <summary>
-    /// ClientIPModel
+    /// Gets or sets the matchers.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class ClientIPModel
-    {
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public MatcherModel[] Matchers { get; set; }
-    }
+    public MatcherModel[]? Matchers { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
 }

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

@@ -1,31 +1,39 @@
 using System.Collections.Generic;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Header Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class HeaderModel
 {
     /// <summary>
-    /// Header Model
+    /// Gets or sets the name.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class HeaderModel
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; } = null!;
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public IList<MatcherModel>? Matchers { get; set; }
+    /// <summary>
+    /// Gets or sets the matchers.
+    /// </summary>
+    public IList<MatcherModel>? Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ignore case.
-        /// </summary>
-        public bool? IgnoreCase { get; set; }
+    /// <summary>
+    /// Gets or sets the ignore case.
+    /// </summary>
+    public bool? IgnoreCase { get; set; }
 
-        /// <summary>
-        /// Reject on match.
-        /// </summary>
-        public bool? RejectOnMatch { get; set; }
-    }
+    /// <summary>
+    /// Reject on match.
+    /// </summary>
+    public bool? RejectOnMatch { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
 }

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

@@ -1,78 +1,77 @@
 using System;
 using WireMock.Models;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// MappingModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class MappingModel
 {
     /// <summary>
-    /// MappingModel
+    /// Gets or sets the unique identifier.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class MappingModel
-    {
-        /// <summary>
-        /// Gets or sets the unique identifier.
-        /// </summary>
-        public Guid? Guid { get; set; }
+    public Guid? Guid { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TimeSettings when which this mapping should be used.
-        /// </summary>
-        public TimeSettingsModel TimeSettings { get; set; }
+    /// <summary>
+    /// Gets or sets the TimeSettings when which this mapping should be used.
+    /// </summary>
+    public TimeSettingsModel? TimeSettings { get; set; }
 
-        /// <summary>
-        /// The unique title.
-        /// </summary>
-        public string Title { get; set; }
+    /// <summary>
+    /// The unique title.
+    /// </summary>
+    public string? Title { get; set; }
 
-        /// <summary>
-        /// The description.
-        /// </summary>
-        public string Description { get; set; }
+    /// <summary>
+    /// The description.
+    /// </summary>
+    public string? Description { get; set; }
 
-        /// <summary>
-        /// The priority. (A low value means higher priority.)
-        /// </summary>
-        public int? Priority { get; set; }
+    /// <summary>
+    /// The priority. (A low value means higher priority.)
+    /// </summary>
+    public int? Priority { get; set; }
 
-        /// <summary>
-        /// The Scenario.
-        /// </summary>
-        public string Scenario { get; set; }
+    /// <summary>
+    /// The Scenario.
+    /// </summary>
+    public string? Scenario { get; set; }
 
-        /// <summary>
-        /// Execution state condition for the current mapping.
-        /// </summary>
-        public string WhenStateIs { get; set; }
+    /// <summary>
+    /// Execution state condition for the current mapping.
+    /// </summary>
+    public string? WhenStateIs { get; set; }
 
-        /// <summary>
-        /// The next state which will be signaled after the current mapping execution.
-        /// In case the value is null state will not be changed.
-        /// </summary>
-        public string SetStateTo { get; set; }
+    /// <summary>
+    /// The next state which will be signaled after the current mapping execution.
+    /// In case the value is null state will not be changed.
+    /// </summary>
+    public string? SetStateTo { get; set; }
 
-        /// <summary>
-        /// The request model.
-        /// </summary>
-        public RequestModel Request { get; set; }
+    /// <summary>
+    /// The request model.
+    /// </summary>
+    public RequestModel Request { get; set; }
 
-        /// <summary>
-        /// The response model.
-        /// </summary>
-        public ResponseModel Response { get; set; }
+    /// <summary>
+    /// The response model.
+    /// </summary>
+    public ResponseModel Response { get; set; }
 
-        /// <summary>
-        /// Saves this mapping as a static mapping file.
-        /// </summary>
-        public bool? SaveToFile { get; set; }
+    /// <summary>
+    /// Saves this mapping as a static mapping file.
+    /// </summary>
+    public bool? SaveToFile { get; set; }
 
-        /// <summary>
-        /// The Webhook.
-        /// </summary>
-        public WebhookModel Webhook { get; set; }
+    /// <summary>
+    /// The Webhook.
+    /// </summary>
+    public WebhookModel? Webhook { get; set; }
 
-        /// <summary>
-        /// The Webhooks.
-        /// </summary>
-        public WebhookModel[] Webhooks { get; set; }
-    }
+    /// <summary>
+    /// The Webhooks.
+    /// </summary>
+    public WebhookModel[]? Webhooks { get; set; }
 }

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

@@ -35,5 +35,14 @@ namespace WireMock.Admin.Mappings
         /// Reject on match.
         /// </summary>
         public bool? RejectOnMatch { get; set; }
+
+        /// <summary>
+        /// The Operator to use when multiple patterns are defined. Optional.
+        /// - null      = Same as "or".
+        /// - "or"      = Only one pattern should match.
+        /// - "and"     = All patterns should match.
+        /// - "average" = The average value from all patterns.
+        /// </summary>
+        public string? MatchOperator { get; set; }
     }
 }

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

@@ -1,14 +1,22 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// PathModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class PathModel
 {
     /// <summary>
-    /// PathModel
+    /// Gets or sets the matchers.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class PathModel
-    {
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public MatcherModel[]? Matchers { get; set; }
-    }
+    public MatcherModel[]? Matchers { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
 }

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

@@ -28,6 +28,20 @@ public class RequestModel
     /// </summary>
     public string[]? Methods { get; set; }
 
+    /// <summary>
+    /// Reject on match for Methods.
+    /// </summary>
+    public bool? MethodsRejectOnMatch { get; set; }
+
+    /// <summary>
+    /// The Operator to use when Methods are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one method should match.
+    /// - "and"     = All methods should match.
+    /// - "average" = The average value from all methods.
+    /// </summary>
+    public string? MethodsMatchOperator { get; set; }
+
     /// <summary>
     /// Gets or sets the Headers.
     /// </summary>

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

@@ -1,14 +1,22 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// UrlModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class UrlModel
 {
     /// <summary>
-    /// UrlModel
+    /// Gets or sets the matchers.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class UrlModel
-    {
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public MatcherModel[] Matchers { get; set; }
-    }
-}
+    public MatcherModel[]? Matchers { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
+}

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -3,136 +3,135 @@ using System.Collections.Generic;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock
+namespace WireMock;
+
+/// <summary>
+/// IRequestMessage
+/// </summary>
+public interface IRequestMessage
 {
     /// <summary>
-    /// IRequestMessage
+    /// Gets the Client IP Address.
     /// </summary>
-    public interface IRequestMessage
-    {
-        /// <summary>
-        /// Gets the Client IP Address.
-        /// </summary>
-        string ClientIP { get; }
+    string ClientIP { get; }
 
-        /// <summary>
-        /// Gets the url (relative).
-        /// </summary>
-        string Url { get; }
+    /// <summary>
+    /// Gets the url (relative).
+    /// </summary>
+    string Url { get; }
 
-        /// <summary>
-        /// Gets the AbsoluteUrl.
-        /// </summary>
-        string AbsoluteUrl { get; }
+    /// <summary>
+    /// Gets the AbsoluteUrl.
+    /// </summary>
+    string AbsoluteUrl { get; }
 
-        /// <summary>
-        /// The ProxyUrl (if a proxy is used).
-        /// </summary>
-        string ProxyUrl { get; set; }
+    /// <summary>
+    /// The ProxyUrl (if a proxy is used).
+    /// </summary>
+    string ProxyUrl { get; set; }
 
-        /// <summary>
-        /// Gets the DateTime.
-        /// </summary>
-        DateTime DateTime { get; }
+    /// <summary>
+    /// Gets the DateTime.
+    /// </summary>
+    DateTime DateTime { get; }
 
-        /// <summary>
-        /// Gets the path (relative).
-        /// </summary>
-        string Path { get; }
+    /// <summary>
+    /// Gets the path (relative).
+    /// </summary>
+    string Path { get; }
 
-        /// <summary>
-        /// Gets the AbsolutePath.
-        /// </summary>
-        string AbsolutePath { get; }
+    /// <summary>
+    /// Gets the AbsolutePath.
+    /// </summary>
+    string AbsolutePath { get; }
 
-        /// <summary>
-        /// Gets the path segments.
-        /// </summary>
-        string[] PathSegments { get; }
+    /// <summary>
+    /// Gets the path segments.
+    /// </summary>
+    string[] PathSegments { get; }
 
-        /// <summary>
-        /// Gets the absolute path segments.
-        /// </summary>
-        string[] AbsolutePathSegments { get; }
+    /// <summary>
+    /// Gets the absolute path segments.
+    /// </summary>
+    string[] AbsolutePathSegments { get; }
 
-        /// <summary>
-        /// Gets the method.
-        /// </summary>
-        string Method { get; }
+    /// <summary>
+    /// Gets the method.
+    /// </summary>
+    string Method { get; }
 
-        /// <summary>
-        /// Gets the headers.
-        /// </summary>
-        IDictionary<string, WireMockList<string>> Headers { get; }
+    /// <summary>
+    /// Gets the headers.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? Headers { get; }
 
-        /// <summary>
-        /// Gets the cookies.
-        /// </summary>
-        IDictionary<string, string> Cookies { get; }
+    /// <summary>
+    /// Gets the cookies.
+    /// </summary>
+    IDictionary<string, string>? Cookies { get; }
 
-        /// <summary>
-        /// Gets the query.
-        /// </summary>
-        IDictionary<string, WireMockList<string>> Query { get; }
+    /// <summary>
+    /// Gets the query.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? Query { get; }
 
-        /// <summary>
-        /// Gets the raw query.
-        /// </summary>
-        string RawQuery { get; }
+    /// <summary>
+    /// Gets the raw query.
+    /// </summary>
+    string RawQuery { get; }
 
-        /// <summary>
-        /// The body.
-        /// </summary>
-        IBodyData? BodyData { get; }
+    /// <summary>
+    /// The body.
+    /// </summary>
+    IBodyData? BodyData { get; }
 
-        /// <summary>
-        /// The original body as string. Convenience getter for Handlebars.
-        /// </summary>
-        string Body { get; }
+    /// <summary>
+    /// The original body as string. Convenience getter for Handlebars.
+    /// </summary>
+    string Body { get; }
 
-        /// <summary>
-        /// The body (as JSON object). Convenience getter for Handlebars.
-        /// </summary>
-        object BodyAsJson { get; }
+    /// <summary>
+    /// The body (as JSON object). Convenience getter for Handlebars.
+    /// </summary>
+    object BodyAsJson { get; }
 
-        /// <summary>
-        /// The body (as bytearray). Convenience getter for Handlebars.
-        /// </summary>
-        byte[] BodyAsBytes { get; }
+    /// <summary>
+    /// The body (as bytearray). Convenience getter for Handlebars.
+    /// </summary>
+    byte[] BodyAsBytes { get; }
 
-        /// <summary>
-        /// The detected body type. Convenience getter for Handlebars.
-        /// </summary>
-        string DetectedBodyType { get; }
+    /// <summary>
+    /// The detected body type. Convenience getter for Handlebars.
+    /// </summary>
+    string DetectedBodyType { get; }
 
-        /// <summary>
-        /// The detected body type from the Content-Type header. Convenience getter for Handlebars.
-        /// </summary>
-        string DetectedBodyTypeFromContentType { get; }
+    /// <summary>
+    /// The detected body type from the Content-Type header. Convenience getter for Handlebars.
+    /// </summary>
+    string DetectedBodyTypeFromContentType { get; }
 
-        /// <summary>
-        /// The detected compression from the Content-Encoding header. Convenience getter for Handlebars.
-        /// </summary>
-        string DetectedCompression { get; }
+    /// <summary>
+    /// The detected compression from the Content-Encoding header. Convenience getter for Handlebars.
+    /// </summary>
+    string DetectedCompression { get; }
 
-        /// <summary>
-        /// Gets the Host
-        /// </summary>
-        string Host { get; }
+    /// <summary>
+    /// Gets the Host
+    /// </summary>
+    string Host { get; }
 
-        /// <summary>
-        /// Gets the protocol
-        /// </summary>
-        string Protocol { get; }
+    /// <summary>
+    /// Gets the protocol
+    /// </summary>
+    string Protocol { get; }
 
-        /// <summary>
-        /// Gets the port
-        /// </summary>
-        int Port { get; }
+    /// <summary>
+    /// Gets the port
+    /// </summary>
+    int Port { get; }
 
-        /// <summary>
-        /// Gets the origin
-        /// </summary>
-        string Origin { get; }
-    }
+    /// <summary>
+    /// Gets the origin
+    /// </summary>
+    string Origin { get; }
 }

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -38,7 +38,7 @@ namespace WireMock
         /// <summary>
         /// Gets the headers.
         /// </summary>
-        IDictionary<string, WireMockList<string>> Headers { get; }
+        IDictionary<string, WireMockList<string>>? Headers { get; }
 
         /// <summary>
         /// Gets or sets the status code.

src/WireMock.Net.Abstractions/Matchers/Request/IRequestMatcher.cs

@@ -15,6 +15,6 @@ namespace WireMock.Matchers.Request
         /// <returns>
         /// A value between 0.0 - 1.0 of the similarity.
         /// </returns>
-        double GetMatchingScore([NotNull] IRequestMessage requestMessage, [NotNull] IRequestMatchResult requestMatchResult);
+        double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult);
     }
 }

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

@@ -22,12 +22,12 @@ namespace WireMock.Models
         /// <summary>
         /// The Headers to send.
         /// </summary>
-        IDictionary<string, WireMockList<string>> Headers { get; }
+        IDictionary<string, WireMockList<string>>? Headers { get; }
 
         /// <summary>
         /// The body to send.
         /// </summary>
-        IBodyData BodyData { get; set; }
+        IBodyData? BodyData { get; set; }
 
         /// <summary>
         /// Use Transformer.

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

@@ -35,7 +35,7 @@
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
         <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.4.4">
+        <PackageReference Include="FluentBuilder" Version="0.4.9">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

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

@@ -3,138 +3,137 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
+using Stef.Validation;
 using WireMock.Exceptions;
 using WireMock.Extensions;
 using WireMock.Models;
-using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// CSharpCode / CS-Script Matcher
+/// </summary>
+/// <inheritdoc cref="ICSharpCodeMatcher"/>
+internal class CSharpCodeMatcher : ICSharpCodeMatcher
 {
-    /// <summary>
-    /// CSharpCode / CS-Script Matcher
-    /// </summary>
-    /// <inheritdoc cref="ICSharpCodeMatcher"/>
-    internal class CSharpCodeMatcher : ICSharpCodeMatcher
+    private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";
+
+    private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";
+
+    private readonly string[] _usings =
     {
-        private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";
+        "System",
+        "System.Linq",
+        "System.Collections.Generic",
+        "Microsoft.CSharp",
+        "Newtonsoft.Json.Linq"
+    };
 
-        private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";
+    public MatchBehaviour MatchBehaviour { get; }
 
-        private readonly string[] _usings =
-        {
-            "System",
-            "System.Linq",
-            "System.Collections.Generic",
-            "Microsoft.CSharp",
-            "Newtonsoft.Json.Linq"
-        };
-
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        private readonly AnyOf<string, StringPattern>[] _patterns;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public CSharpCodeMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public CSharpCodeMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public CSharpCodeMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        ThrowException = false;
+        MatchOperator = matchOperator;
+    }
+
+    public double IsMatch(string input)
+    {
+        return IsMatchInternal(input);
+    }
+
+    public double IsMatch(object? input)
+    {
+        return IsMatchInternal(input);
+    }
+
+    public double IsMatchInternal(object? input)
+    {
+        double match = MatchScores.Mismatch;
+
+        if (input != null)
         {
+            match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern.GetPattern())).ToArray(), MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="patterns">The patterns.</param>
-        public CSharpCodeMatcher(MatchBehaviour matchBehaviour, [NotNull] params AnyOf<string, StringPattern>[] patterns)
-        {
-            Guard.NotNull(patterns, nameof(patterns));
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
 
-            MatchBehaviour = matchBehaviour;
-            ThrowException = false;
-            _patterns = patterns;
-        }
+    private bool IsMatch(dynamic input, string pattern)
+    {
+        bool isMatchWithString = input is string;
+        var inputValue = isMatchWithString ? input : JObject.FromObject(input);
+        string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
 
-        public double IsMatch(string input)
-        {
-            return IsMatchInternal(input);
-        }
-
-        public double IsMatch(object input)
-        {
-            return IsMatchInternal(input);
-        }
-
-        public double IsMatchInternal(object input)
-        {
-            double match = MatchScores.Mismatch;
-
-            if (input != null)
-            {
-                match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern.GetPattern())));
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        private bool IsMatch(dynamic input, string pattern)
-        {
-            bool isMatchWithString = input is string;
-            var inputValue = isMatchWithString ? input : JObject.FromObject(input);
-            string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
-
-            object result = null;
+        object? result;
 
 #if (NET451 || NET452)
-            var compilerParams = new System.CodeDom.Compiler.CompilerParameters
+        var compilerParams = new System.CodeDom.Compiler.CompilerParameters
+        {
+            GenerateInMemory = true,
+            GenerateExecutable = false,
+            ReferencedAssemblies =
             {
-                GenerateInMemory = true,
-                GenerateExecutable = false,
-                ReferencedAssemblies =
-                {
-                    "System.dll",
-                    "System.Core.dll",
-                    "Microsoft.CSharp.dll",
-                    "Newtonsoft.Json.dll"
-                }
-            };
-
-            using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
-            {
-                var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
-
-                if (compilerResults.Errors.Count != 0)
-                {
-                    var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
-                    throw new WireMockException(string.Join(", ", errors));
-                }
-
-                object helper = compilerResults.CompiledAssembly.CreateInstance("CodeHelper");
-                if (helper == null)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
-                }
-
-                var methodInfo = helper.GetType().GetMethod("IsMatch");
-                if (methodInfo == null)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
-                }
-
-                try
-                {
-                    result = methodInfo.Invoke(helper, new[] { inputValue });
-                }
-                catch (Exception ex)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
-                }
+                "System.dll",
+                "System.Core.dll",
+                "Microsoft.CSharp.dll",
+                "Newtonsoft.Json.dll"
             }
+        };
+
+        using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
+        {
+            var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
+
+            if (compilerResults.Errors.Count != 0)
+            {
+                var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
+                throw new WireMockException(string.Join(", ", errors));
+            }
+
+            var helper = compilerResults.CompiledAssembly?.CreateInstance("CodeHelper");
+            if (helper == null)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
+            }
+
+            var methodInfo = helper.GetType().GetMethod("IsMatch");
+            if (methodInfo == null)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
+            }
+
+            try
+            {
+                result = methodInfo.Invoke(helper, new[] { inputValue });
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
+            }
+        }
 #elif (NET46 || NET461)
             dynamic script;
             try
@@ -169,11 +168,7 @@ namespace WireMock.Matchers
             dynamic script;
             try
             {
-//#if NETSTANDARD2_0
-//                script = csscript.GenericExtensions.CreateObject(assembly, "*");
-//#else
                 script = CSScripting.ReflectionExtensions.CreateObject(assembly, "*");
-//#endif
             }
             catch (Exception ex)
             {
@@ -191,38 +186,40 @@ namespace WireMock.Matchers
 #else
             throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
 #endif
-            try
-            {
-                return (bool)result;
-            }
-            catch
-            {
-                throw new WireMockException($"Unable to cast result '{result}' to bool");
-            }
-        }
-
-        private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
+        try
         {
-            string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
-
-            var stringBuilder = new StringBuilder();
-            foreach (string @using in _usings)
-            {
-                stringBuilder.AppendLine($"using {@using};");
-            }
-            stringBuilder.AppendLine();
-            stringBuilder.AppendFormat(template, pattern);
-
-            return stringBuilder.ToString();
+            return (bool)result;
         }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
+        catch
         {
-            return _patterns;
+            throw new WireMockException($"Unable to cast result '{result}' to bool");
         }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "CSharpCodeMatcher";
     }
+
+    private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
+    {
+        string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
+
+        var stringBuilder = new StringBuilder();
+        foreach (string @using in _usings)
+        {
+            stringBuilder.AppendLine($"using {@using};");
+        }
+        stringBuilder.AppendLine();
+        stringBuilder.AppendFormat(template, pattern);
+
+        return stringBuilder.ToString();
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "CSharpCodeMatcher";
 }

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

@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="RestEase" Version="1.5.6" />
+    <PackageReference Include="RestEase" Version="1.5.7" />
   </ItemGroup>
 
   <ItemGroup>

src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs

@@ -39,6 +39,8 @@ namespace WireMock.Authentication
             return new AnyOf<string, StringPattern>[0];
         }
 
+        public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
         public double IsMatch(string input)
         {
             var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);

src/WireMock.Net/Http/HttpClientBuilder.cs

@@ -3,64 +3,63 @@ using System.Net.Http;
 using WireMock.HttpsCertificate;
 using WireMock.Settings;
 
-namespace WireMock.Http
+namespace WireMock.Http;
+
+internal static class HttpClientBuilder
 {
-    internal static class HttpClientBuilder
+    public static HttpClient Build(HttpClientSettings settings)
     {
-        public static HttpClient Build(HttpClientSettings settings)
-        {
 #if NETSTANDARD || NETCOREAPP3_1 || NET5_0 || NET6_0
-            var handler = new HttpClientHandler
-            {
-                CheckCertificateRevocationList = false,
-                SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-            };
+        var handler = new HttpClientHandler
+        {
+            CheckCertificateRevocationList = false,
+            SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+        };
 #elif NET46
-            var handler = new HttpClientHandler
-            {
-                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-            };
+        var handler = new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+        };
 #else
-            var handler = new WebRequestHandler
-            {
-                ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-            };
+        var handler = new WebRequestHandler
+        {
+            ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
+            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+        };
 #endif
 
-            if (!string.IsNullOrEmpty(settings.ClientX509Certificate2ThumbprintOrSubjectName))
+        if (!string.IsNullOrEmpty(settings.ClientX509Certificate2ThumbprintOrSubjectName))
+        {
+            handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+
+            var x509Certificate2 = CertificateLoader.LoadCertificate(settings.ClientX509Certificate2ThumbprintOrSubjectName);
+            handler.ClientCertificates.Add(x509Certificate2);
+        }
+
+        handler.AllowAutoRedirect = settings.AllowAutoRedirect == true;
+
+        // If UseCookies enabled, httpClient ignores Cookie header
+        handler.UseCookies = false;
+
+        if (settings.WebProxySettings != null)
+        {
+            handler.UseProxy = true;
+
+            handler.Proxy = new WebProxy(settings.WebProxySettings.Address);
+            if (settings.WebProxySettings.UserName != null && settings.WebProxySettings.Password != null)
             {
-                handler.ClientCertificateOptions = ClientCertificateOption.Manual;
-
-                var x509Certificate2 = CertificateLoader.LoadCertificate(settings.ClientX509Certificate2ThumbprintOrSubjectName);
-                handler.ClientCertificates.Add(x509Certificate2);
-            }
-
-            handler.AllowAutoRedirect = settings.AllowAutoRedirect == true;
-
-            // If UseCookies enabled, httpClient ignores Cookie header
-            handler.UseCookies = false;
-
-            if (settings.WebProxySettings != null)
-            {
-                handler.UseProxy = true;
-
-                handler.Proxy = new WebProxy(settings.WebProxySettings.Address);
-                if (settings.WebProxySettings.UserName != null && settings.WebProxySettings.Password != null)
-                {
-                    handler.Proxy.Credentials = new NetworkCredential(settings.WebProxySettings.UserName, settings.WebProxySettings.Password);
-                }
+                handler.Proxy.Credentials = new NetworkCredential(settings.WebProxySettings.UserName, settings.WebProxySettings.Password);
             }
+        }
 
 #if !NETSTANDARD1_3
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
-            ServicePointManager.ServerCertificateValidationCallback = (message, cert, chain, errors) => true;
+        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+        ServicePointManager.ServerCertificateValidationCallback = (message, cert, chain, errors) => true;
 #endif
 
-            return new HttpClient(handler);
-        }
+        return HttpClientFactory2.Create(handler);
     }
 }

src/WireMock.Net/Http/HttpClientFactory2.cs

@@ -0,0 +1,24 @@
+using System.Net.Http;
+
+namespace WireMock.Http;
+
+internal static class HttpClientFactory2
+{
+    public static HttpClient Create(params DelegatingHandler[] handlers)
+    {
+#if NETSTANDARD1_3
+        return new HttpClient();
+#else
+        return HttpClientFactory.Create(handlers);
+#endif
+    }
+
+    public static HttpClient Create(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
+    {
+#if NETSTANDARD1_3
+        return new HttpClient(innerHandler);
+#else
+        return HttpClientFactory.Create(innerHandler, handlers);
+#endif
+    }
+}

src/WireMock.Net/Http/WebhookSender.cs

@@ -26,15 +26,15 @@ namespace WireMock.Http
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }
 
-        public Task<HttpResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] IWebhookRequest request, [NotNull] IRequestMessage originalRequestMessage, [NotNull] IResponseMessage originalResponseMessage)
+        public Task<HttpResponseMessage> SendAsync(HttpClient client, IWebhookRequest request, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage)
         {
-            Guard.NotNull(client, nameof(client));
-            Guard.NotNull(request, nameof(request));
-            Guard.NotNull(originalRequestMessage, nameof(originalRequestMessage));
-            Guard.NotNull(originalResponseMessage, nameof(originalResponseMessage));
+            Guard.NotNull(client);
+            Guard.NotNull(request);
+            Guard.NotNull(originalRequestMessage);
+            Guard.NotNull(originalResponseMessage);
 
-            IBodyData bodyData;
-            IDictionary<string, WireMockList<string>> headers;
+            IBodyData? bodyData;
+            IDictionary<string, WireMockList<string>>? headers;
             if (request.UseTransformer == true)
             {
                 ITransformer responseMessageTransformer;

src/WireMock.Net/IMapping.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using System;
 using System.Threading.Tasks;
 using WireMock.Matchers.Request;
@@ -6,130 +5,125 @@ using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
 
-namespace WireMock
+namespace WireMock;
+
+/// <summary>
+/// The IMapping interface.
+/// </summary>
+public interface IMapping
 {
     /// <summary>
-    /// The IMapping interface.
+    /// Gets the unique identifier.
     /// </summary>
-    public interface IMapping
-    {
-        /// <summary>
-        /// Gets the unique identifier.
-        /// </summary>
-        Guid Guid { get; }
+    Guid Guid { get; }
 
-        /// <summary>
-        /// Gets the TimeSettings (Start, End and TTL).
-        /// </summary>
-        ITimeSettings TimeSettings { get; }
+    /// <summary>
+    /// Gets the TimeSettings (Start, End and TTL).
+    /// </summary>
+    ITimeSettings TimeSettings { get; }
 
-        /// <summary>
-        /// Gets the unique title.
-        /// </summary>
-        string Title { get; }
+    /// <summary>
+    /// Gets the unique title.
+    /// </summary>
+    string Title { get; }
 
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        string Description { get; }
+    /// <summary>
+    /// Gets the description.
+    /// </summary>
+    string Description { get; }
 
-        /// <summary>
-        /// The full filename path for this mapping (only defined for static mappings).
-        /// </summary>
-        string Path { get; set; }
+    /// <summary>
+    /// The full filename path for this mapping (only defined for static mappings).
+    /// </summary>
+    string Path { get; set; }
 
-        /// <summary>
-        /// Gets the priority.  (A low value means higher priority.)
-        /// </summary>
-        int Priority { get; }
+    /// <summary>
+    /// Gets the priority.  (A low value means higher priority.)
+    /// </summary>
+    int Priority { get; }
 
-        /// <summary>
-        /// Scenario.
-        /// </summary>
-        [CanBeNull]
-        string Scenario { get; }
+    /// <summary>
+    /// Scenario.
+    /// </summary>
+    string? Scenario { get; }
 
-        /// <summary>
-        /// Execution state condition for the current mapping.
-        /// </summary>
-        [CanBeNull]
-        string ExecutionConditionState { get; }
+    /// <summary>
+    /// Execution state condition for the current mapping.
+    /// </summary>
+    string? ExecutionConditionState { get; }
 
-        /// <summary>
-        /// The next state which will be signaled after the current mapping execution.
-        /// In case the value is null, state will not be changed.
-        /// </summary>
-        [CanBeNull]
-        string NextState { get; }
+    /// <summary>
+    /// The next state which will be signaled after the current mapping execution.
+    /// In case the value is null, state will not be changed.
+    /// </summary>
+    string? NextState { get; }
 
-        /// <summary>
-        /// The number of times this match should be matched before the state will be changed to the next state.
-        /// </summary>
-        [CanBeNull]
-        int? StateTimes { get; }
+    /// <summary>
+    /// The number of times this match should be matched before the state will be changed to the next state.
+    /// </summary>
+    int? StateTimes { get; }
 
-        /// <summary>
-        /// The Request matcher.
-        /// </summary>
-        IRequestMatcher RequestMatcher { get; }
+    /// <summary>
+    /// The Request matcher.
+    /// </summary>
+    IRequestMatcher RequestMatcher { get; }
 
-        /// <summary>
-        /// The Provider.
-        /// </summary>
-        IResponseProvider Provider { get; }
+    /// <summary>
+    /// The Provider.
+    /// </summary>
+    IResponseProvider Provider { get; }
 
-        /// <summary>
-        /// The WireMockServerSettings.
-        /// </summary>
-        WireMockServerSettings Settings { get; }
+    /// <summary>
+    /// The WireMockServerSettings.
+    /// </summary>
+    WireMockServerSettings Settings { get; }
 
-        /// <summary>
-        /// Is State started ?
-        /// </summary>
-        bool IsStartState { get; }
+    /// <summary>
+    /// Is State started ?
+    /// </summary>
+    bool IsStartState { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this mapping is an Admin Interface.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
-        /// </value>
-        bool IsAdminInterface { get; }
+    /// <summary>
+    /// Gets a value indicating whether this mapping is an Admin Interface.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
+    /// </value>
+    bool IsAdminInterface { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this mapping is a Proxy Mapping.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this mapping is a Proxy Mapping; otherwise, <c>false</c>.
-        /// </value>
-        bool IsProxy { get; }
+    /// <summary>
+    /// Gets a value indicating whether this mapping is a Proxy Mapping.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this mapping is a Proxy Mapping; otherwise, <c>false</c>.
+    /// </value>
+    bool IsProxy { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether this mapping to be logged.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this mapping to be logged; otherwise, <c>false</c>.
-        /// </value>
-        bool LogMapping { get; }
+    /// <summary>
+    /// Gets a value indicating whether this mapping to be logged.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this mapping to be logged; otherwise, <c>false</c>.
+    /// </value>
+    bool LogMapping { get; }
 
-        /// <summary>
-        /// The Webhooks.
-        /// </summary>
-        IWebhook[] Webhooks { get; }
+    /// <summary>
+    /// The Webhooks.
+    /// </summary>
+    IWebhook[]? Webhooks { get; }
 
-        /// <summary>
-        /// ProvideResponseAsync
-        /// </summary>
-        /// <param name="requestMessage">The request message.</param>
-        /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
-        Task<(IResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(IRequestMessage requestMessage);
+    /// <summary>
+    /// ProvideResponseAsync
+    /// </summary>
+    /// <param name="requestMessage">The request message.</param>
+    /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+    Task<(IResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(IRequestMessage requestMessage);
 
-        /// <summary>
-        /// Gets the RequestMatchResult based on the RequestMessage.
-        /// </summary>
-        /// <param name="requestMessage">The request message.</param>
-        /// <param name="nextState">The Next State.</param>
-        /// <returns>The <see cref="IRequestMatchResult"/>.</returns>
-        IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, [CanBeNull] string nextState);
-    }
+    /// <summary>
+    /// Gets the RequestMatchResult based on the RequestMessage.
+    /// </summary>
+    /// <param name="requestMessage">The request message.</param>
+    /// <param name="nextState">The Next State.</param>
+    /// <returns>The <see cref="IRequestMatchResult"/>.</returns>
+    IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState);
 }

src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs

@@ -1,89 +1,87 @@
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// Generic AbstractJsonPartialMatcher
+/// </summary>
+public abstract class AbstractJsonPartialMatcher : JsonMatcher
 {
     /// <summary>
-    /// Generic AbstractJsonPartialMatcher
+    /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
     /// </summary>
-    public abstract class AbstractJsonPartialMatcher : JsonMatcher
+    /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool throwException = false) 
+        : base(value, ignoreCase, throwException)
     {
-        /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        protected AbstractJsonPartialMatcher([NotNull] string value, bool ignoreCase = false, bool throwException = false) 
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
-        /// </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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        protected AbstractJsonPartialMatcher([NotNull] object value, bool ignoreCase = false, bool throwException = false) 
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
-        /// </summary>
-        /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false, bool throwException = false) 
-            : base(matchBehaviour, value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override bool IsMatch(JToken value, JToken input)
-        {
-            if (value == null || value == input)
-            {
-                return true;
-            }
-
-            if (input == null || value.Type != input.Type)
-            {
-                return false;
-            }
-
-            switch (value.Type)
-            {
-                case JTokenType.Object:
-                    var nestedValues = value.ToObject<Dictionary<string, JToken>>();
-                    return nestedValues?.Any() != true ||
-                           nestedValues.All(pair => IsMatch(pair.Value, input.SelectToken(pair.Key)));
-
-                case JTokenType.Array:
-                    var valuesArray = value.ToObject<JToken[]>();
-                    var tokenArray = input.ToObject<JToken[]>();
-
-                    if (valuesArray?.Any() != true)
-                    {
-                        return true;
-                    }
-
-                    return tokenArray?.Any() == true &&
-                           valuesArray.All(subFilter => tokenArray.Any(subToken => IsMatch(subFilter, subToken)));
-
-                default:
-                    return IsMatch(value.ToString(), input.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Check if two strings are a match (matching can be done exact or wildcard)
-        /// </summary>
-        protected abstract bool IsMatch(string value, string input);
     }
-}
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
+    /// </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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool throwException = false) 
+        : base(value, ignoreCase, throwException)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
+    /// </summary>
+    /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool throwException = false) 
+        : base(matchBehaviour, value, ignoreCase, throwException)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(JToken? value, JToken? input)
+    {
+        if (value == null || value == input)
+        {
+            return true;
+        }
+
+        if (input == null || value.Type != input.Type)
+        {
+            return false;
+        }
+
+        switch (value.Type)
+        {
+            case JTokenType.Object:
+                var nestedValues = value.ToObject<Dictionary<string, JToken>>();
+                return nestedValues?.Any() != true ||
+                       nestedValues.All(pair => IsMatch(pair.Value, input.SelectToken(pair.Key)));
+
+            case JTokenType.Array:
+                var valuesArray = value.ToObject<JToken[]>();
+                var tokenArray = input.ToObject<JToken[]>();
+
+                if (valuesArray?.Any() != true)
+                {
+                    return true;
+                }
+
+                return tokenArray?.Any() == true &&
+                       valuesArray.All(subFilter => tokenArray.Any(subToken => IsMatch(subFilter, subToken)));
+
+            default:
+                return IsMatch(value.ToString(), input.ToString());
+        }
+    }
+
+    /// <summary>
+    /// Check if two strings are a match (matching can be done exact or wildcard)
+    /// </summary>
+    protected abstract bool IsMatch(string value, string input);
+}

src/WireMock.Net/Matchers/ContentTypeMatcher.cs

@@ -3,75 +3,74 @@ using AnyOfTypes;
 using JetBrains.Annotations;
 using WireMock.Models;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// ContentTypeMatcher which accepts also all charsets
+/// </summary>
+/// <seealso cref="RegexMatcher" />
+public class ContentTypeMatcher : WildcardMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
     /// <summary>
-    /// ContentTypeMatcher which accepts also all charsets
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
     /// </summary>
-    /// <seealso cref="RegexMatcher" />
-    public class ContentTypeMatcher : WildcardMatcher
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
     {
-        private readonly AnyOf<string, StringPattern>[] _patterns;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-        /// </summary>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false) :
-            base(matchBehaviour, patterns, ignoreCase, throwException)
-        {
-            _patterns = patterns;
-        }
-
-        /// <inheritdoc cref="RegexMatcher.IsMatch"/>
-        public override double IsMatch(string input)
-        {
-            if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out MediaTypeHeaderValue contentType))
-            {
-                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
-            }
-
-            return base.IsMatch(contentType.MediaType);
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public override AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _patterns;
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public override string Name => "ContentTypeMatcher";
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false) :
+        base(matchBehaviour, patterns, ignoreCase, throwException)
+    {
+        _patterns = patterns;
+    }
+
+    /// <inheritdoc cref="RegexMatcher.IsMatch"/>
+    public override double IsMatch(string? input)
+    {
+        if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out MediaTypeHeaderValue contentType))
+        {
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
+        }
+
+        return base.IsMatch(contentType.MediaType);
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public override AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public override string Name => "ContentTypeMatcher";
 }

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -1,67 +1,69 @@
 using System.Linq;
 using AnyOfTypes;
-using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
-using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// ExactMatcher
+/// </summary>
+/// <seealso cref="IStringMatcher" />
+public class ExactMatcher : IStringMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _values;
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// ExactMatcher
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
     /// </summary>
-    /// <seealso cref="IStringMatcher" />
-    public class ExactMatcher : IStringMatcher
+    /// <param name="values">The values.</param>
+    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, values)
     {
-        private readonly AnyOf<string, StringPattern>[] _values;
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-        /// </summary>
-        /// <param name="values">The values.</param>
-        public ExactMatcher([NotNull] params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, values)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        /// <param name="values">The values.</param>
-        public ExactMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] values)
-        {
-            Guard.NotNull(values, nameof(values));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-            _values = values;
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
-        {
-            if (_values.Length == 1)
-            {
-                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values[0].GetPattern() == input));
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Select(v => v.GetPattern()).Contains(input)));
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _values;
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "ExactMatcher";
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(
+        MatchBehaviour matchBehaviour,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] values)
+    {
+        _values = Guard.NotNull(values);
+
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string? input)
+    {
+        double score = MatchScores.ToScore(_values.Select(v => v.GetPattern() == input).ToArray(), MatchOperator);
+        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _values;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "ExactMatcher";
 }

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -1,83 +1,86 @@
-using JetBrains.Annotations;
 using System.Linq;
 using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// ExactObjectMatcher
+/// </summary>
+/// <seealso cref="IObjectMatcher" />
+public class ExactObjectMatcher : IObjectMatcher
 {
     /// <summary>
-    /// ExactObjectMatcher
+    /// Gets the value as object.
     /// </summary>
-    /// <seealso cref="IObjectMatcher" />
-    public class ExactObjectMatcher : IObjectMatcher
+    public object? ValueAsObject { get; }
+
+    /// <summary>
+    /// Gets the value as byte[].
+    /// </summary>
+    public byte[]? ValueAsBytes { get; }
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    public ExactObjectMatcher(object value) : this(MatchBehaviour.AcceptOnMatch, value)
     {
-        /// <summary>
-        /// Gets the value as object.
-        /// </summary>
-        public object ValueAsObject { get; }
-
-        /// <summary>
-        /// Gets the value as byte[].
-        /// </summary>
-        public byte[] ValueAsBytes { get; }
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-        
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public ExactObjectMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="value">The value.</param>
-        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
-        {
-            Guard.NotNull(value, nameof(value));
-
-            ValueAsObject = value;
-            MatchBehaviour = matchBehaviour;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public ExactObjectMatcher([NotNull] byte[] value) : this(MatchBehaviour.AcceptOnMatch, value)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        /// <param name="value">The value.</param>
-        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] value, bool throwException = false)
-        {
-            Guard.NotNull(value, nameof(value));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-            ValueAsBytes = value;
-        }
-
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object input)
-        {
-            bool equals = ValueAsObject != null ? Equals(ValueAsObject, input) : ValueAsBytes.SequenceEqual((byte[])input);
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(equals));
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "ExactObjectMatcher";
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="value">The value.</param>
+    public ExactObjectMatcher(MatchBehaviour matchBehaviour, object value)
+    {
+        ValueAsObject = Guard.NotNull(value);
+        MatchBehaviour = matchBehaviour;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    public ExactObjectMatcher(byte[] value) : this(MatchBehaviour.AcceptOnMatch, value)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="value">The value.</param>
+    public ExactObjectMatcher(MatchBehaviour matchBehaviour, byte[] value, bool throwException = false)
+    {
+        ValueAsBytes = Guard.NotNull(value);
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+    }
+
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object? input)
+    {
+        bool equals = false;
+        if (ValueAsObject != null)
+        {
+            equals = Equals(ValueAsObject, input);
+        }
+        else if (input != null)
+        {
+            equals = ValueAsBytes?.SequenceEqual((byte[])input) == true;
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(equals));
+    }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "ExactObjectMatcher";
 }

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -1,4 +1,4 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers
 {
     /// <summary>
     /// IObjectMatcher
@@ -10,6 +10,6 @@
         /// </summary>
         /// <param name="input">The input.</param>
         /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(object input);
+        double IsMatch(object? input);
     }
 }

src/WireMock.Net/Matchers/IStringMatcher.cs

@@ -1,25 +1,29 @@
 using AnyOfTypes;
 using WireMock.Models;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IStringMatcher
+/// </summary>
+/// <inheritdoc cref="IMatcher"/>
+public interface IStringMatcher : IMatcher
 {
     /// <summary>
-    /// IStringMatcher
+    /// Determines whether the specified input is match.
     /// </summary>
-    /// <inheritdoc cref="IMatcher"/>
-    public interface IStringMatcher : IMatcher
-    {
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(string input);
+    /// <param name="input">The input.</param>
+    /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+    double IsMatch(string? input);
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
-        AnyOf<string, StringPattern>[] GetPatterns();
-    }
+    /// <summary>
+    /// Gets the patterns.
+    /// </summary>
+    /// <returns>Patterns</returns>
+    AnyOf<string, StringPattern>[] GetPatterns();
+
+    /// <summary>
+    /// The <see cref="Matchers.MatchOperator"/>.
+    /// </summary>
+    MatchOperator MatchOperator { get; }
 }

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -1,121 +1,126 @@
 using System.Linq;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
-using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// JsonPathMatcher
+/// </summary>
+/// <seealso cref="IMatcher" />
+/// <seealso cref="IObjectMatcher" />
+public class JsonPathMatcher : IStringMatcher, IObjectMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// JsonPathMatcher
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    /// <seealso cref="IObjectMatcher" />
-    public class JsonPathMatcher : IStringMatcher, IObjectMatcher
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns.ToAnyOfPatterns())
     {
-        private readonly AnyOf<string, StringPattern>[] _patterns;
+    }
 
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
+    {
+    }
 
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(
+        MatchBehaviour matchBehaviour,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns.ToAnyOfPatterns())
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string? input)
+    {
+        double match = MatchScores.Mismatch;
+        if (input != null)
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
-        {
-            Guard.NotNull(patterns, nameof(patterns));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-            _patterns = patterns;
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
-        {
-            double match = MatchScores.Mismatch;
-            if (input != null)
+            try
             {
-                try
+                var jToken = JToken.Parse(input);
+                match = IsMatch(jToken);
+            }
+            catch (JsonException)
+            {
+                if (ThrowException)
                 {
-                    var jToken = JToken.Parse(input);
-                    match = IsMatch(jToken);
-                }
-                catch (JsonException)
-                {
-                    if (ThrowException)
-                    {
-                        throw;
-                    }
+                    throw;
                 }
             }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object input)
-        {
-            double match = MatchScores.Mismatch;
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
 
-            // When input is null or byte[], return Mismatch.
-            if (input != null && !(input is byte[]))
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object? input)
+    {
+        double match = MatchScores.Mismatch;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && !(input is byte[]))
+        {
+            try
             {
-                try
+                // Check if JToken or object
+                JToken jToken = input as JToken ?? JObject.FromObject(input);
+                match = IsMatch(jToken);
+            }
+            catch (JsonException)
+            {
+                if (ThrowException)
                 {
-                    // Check if JToken or object
-                    JToken jToken = input is JToken token ? token : JObject.FromObject(input);
-                    match = IsMatch(jToken);
-                }
-                catch (JsonException)
-                {
-                    if (ThrowException)
-                    {
-                        throw;
-                    }
+                    throw;
                 }
             }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _patterns;
-        }
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
 
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "JsonPathMatcher";
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
 
-        private double IsMatch(JToken jToken)
-        {
-            return MatchScores.ToScore(_patterns.Select(pattern => jToken.SelectToken(pattern.GetPattern()) != null));
-        }
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "JsonPathMatcher";
+
+    private double IsMatch(JToken jToken)
+    {
+        return MatchScores.ToScore(_patterns.Select(pattern => jToken.SelectToken(pattern.GetPattern()) != null).ToArray(), MatchOperator);
     }
 }

src/WireMock.Net/Matchers/JmesPathMatcher.cs

@@ -1,11 +1,10 @@
+using System.Linq;
 using AnyOfTypes;
 using DevLab.JmesPath;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
-using System.Linq;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
-using Stef.Validation;
 
 namespace WireMock.Matchers
 {
@@ -26,7 +25,7 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns.ToAnyOfPatterns())
+        public JmesPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns.ToAnyOfPatterns())
         {
         }
 
@@ -34,7 +33,7 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public JmesPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
         {
         }
 
@@ -42,8 +41,10 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
         /// </summary>
         /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, throwException, patterns)
+        public JmesPathMatcher(bool throwException = false, MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns) :
+            this(MatchBehaviour.AcceptOnMatch, throwException, matchOperator, patterns)
         {
         }
 
@@ -52,25 +53,30 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
+        public JmesPathMatcher(
+            MatchBehaviour matchBehaviour,
+            bool throwException = false,
+            MatchOperator matchOperator = MatchOperator.Or,
+            params AnyOf<string, StringPattern>[] patterns)
         {
-            Guard.NotNull(patterns, nameof(patterns));
-
+            _patterns = Guard.NotNull(patterns);
             MatchBehaviour = matchBehaviour;
             ThrowException = throwException;
-            _patterns = patterns;
+            MatchOperator = matchOperator;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
+        public double IsMatch(string? input)
         {
             double match = MatchScores.Mismatch;
             if (input != null)
             {
                 try
                 {
-                    match = MatchScores.ToScore(_patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))));
+                    var results = _patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))).ToArray();
+                    match = MatchScores.ToScore(results, MatchOperator);
                 }
                 catch (JsonException)
                 {
@@ -85,7 +91,7 @@ namespace WireMock.Matchers
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object input)
+        public double IsMatch(object? input)
         {
             double match = MatchScores.Mismatch;
 
@@ -105,6 +111,9 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
+        /// <inheritdoc />
+        public MatchOperator MatchOperator { get; }
+
         /// <inheritdoc cref="IMatcher.Name"/>
         public string Name => "JmesPathMatcher";
     }

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -6,164 +6,163 @@ using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Util;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// JsonMatcher
+/// </summary>
+public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
 {
+    /// <inheritdoc cref="IValueMatcher.Value"/>
+    public object Value { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public virtual string Name => "JsonMatcher";
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
+    public bool IgnoreCase { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
+    private readonly JToken _valueAsJToken;
+    private readonly Func<JToken, JToken> _jTokenConverter;
+
     /// <summary>
-    /// JsonMatcher
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
     /// </summary>
-    public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
+    /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    public JsonMatcher(string value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
     {
-        /// <inheritdoc cref="IValueMatcher.Value"/>
-        public object Value { get; }
+    }
 
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public virtual string Name => "JsonMatcher";
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+    /// </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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    public JsonMatcher(object value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
+    {
+    }
 
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+    /// </summary>
+    /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool throwException = false)
+    {
+        Guard.NotNull(value, nameof(value));
 
-        /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
-        public bool IgnoreCase { get; }
+        MatchBehaviour = matchBehaviour;
+        IgnoreCase = ignoreCase;
+        ThrowException = throwException;
 
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
+        Value = value;
+        _valueAsJToken = ConvertValueToJToken(value);
+        _jTokenConverter = ignoreCase
+            ? (Func<JToken, JToken>)Rename
+            : jToken => jToken;
+    }
 
-        private readonly JToken _valueAsJToken;
-        private readonly Func<JToken, JToken> _jTokenConverter;
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object? input)
+    {
+        bool match = false;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMatcher"/> 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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public JsonMatcher(string value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
+        // When input is null or byte[], return Mismatch.
+        if (input != null && input is not byte[])
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-        /// </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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public JsonMatcher(object value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-        /// </summary>
-        /// <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="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool throwException = false)
-        {
-            Guard.NotNull(value, nameof(value));
-
-            MatchBehaviour = matchBehaviour;
-            IgnoreCase = ignoreCase;
-            ThrowException = throwException;
-
-            Value = value;
-            _valueAsJToken = ConvertValueToJToken(value);
-            _jTokenConverter = ignoreCase
-                ? (Func<JToken, JToken>)Rename
-                : jToken => jToken;
-        }
-
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object? input)
-        {
-            bool match = false;
-
-            // When input is null or byte[], return Mismatch.
-            if (input != null && input is not byte[])
+            try
             {
-                try
-                {
-                    var inputAsJToken = ConvertValueToJToken(input);
+                var inputAsJToken = ConvertValueToJToken(input);
 
-                    match = IsMatch(
-                        _jTokenConverter(_valueAsJToken),
-                        _jTokenConverter(inputAsJToken));
-                }
-                catch (JsonException)
+                match = IsMatch(
+                    _jTokenConverter(_valueAsJToken),
+                    _jTokenConverter(inputAsJToken));
+            }
+            catch (JsonException)
+            {
+                if (ThrowException)
                 {
-                    if (ThrowException)
-                    {
-                        throw;
-                    }
+                    throw;
                 }
             }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
         }
 
-        /// <summary>
-        /// Compares the input against the matcher value
-        /// </summary>
-        /// <param name="value">Matcher value</param>
-        /// <param name="input">Input value</param>
-        /// <returns></returns>
-        protected virtual bool IsMatch(JToken value, JToken input)
+        return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+    }
+
+    /// <summary>
+    /// Compares the input against the matcher value
+    /// </summary>
+    /// <param name="value">Matcher value</param>
+    /// <param name="input">Input value</param>
+    /// <returns></returns>
+    protected virtual bool IsMatch(JToken value, JToken input)
+    {
+        return JToken.DeepEquals(value, input);
+    }
+
+    private static JToken ConvertValueToJToken(object value)
+    {
+        // Check if JToken, string, IEnumerable or object
+        switch (value)
         {
-            return JToken.DeepEquals(value, input);
-        }
+            case JToken tokenValue:
+                return tokenValue;
 
-        private static JToken ConvertValueToJToken(object value)
-        {
-            // Check if JToken, string, IEnumerable or object
-            switch (value)
-            {
-                case JToken tokenValue:
-                    return tokenValue;
+            case string stringValue:
+                return JsonUtils.Parse(stringValue)!;
 
-                case string stringValue:
-                    return JsonUtils.Parse(stringValue);
+            case IEnumerable enumerableValue:
+                return JArray.FromObject(enumerableValue);
 
-                case IEnumerable enumerableValue:
-                    return JArray.FromObject(enumerableValue);
-
-                default:
-                    return JObject.FromObject(value);
-            }
-        }
-
-        private static string? ToUpper(string? input)
-        {
-            return input?.ToUpperInvariant();
-        }
-
-        // https://stackoverflow.com/questions/11679804/json-net-rename-properties
-        private static JToken Rename(JToken json)
-        {
-            if (json is JProperty property)
-            {
-                JToken propertyValue = property.Value;
-                if (propertyValue.Type == JTokenType.String)
-                {
-                    string stringValue = propertyValue.Value<string>();
-                    propertyValue = ToUpper(stringValue);
-                }
-
-                return new JProperty(ToUpper(property.Name), Rename(propertyValue));
-            }
-
-            if (json is JArray array)
-            {
-                var renamedValues = array.Select(Rename);
-                return new JArray(renamedValues);
-            }
-
-            if (json is JObject obj)
-            {
-                var renamedProperties = obj.Properties().Select(Rename);
-                return new JObject(renamedProperties);
-            }
-
-            return json;
+            default:
+                return JObject.FromObject(value);
         }
     }
+
+    private static string? ToUpper(string? input)
+    {
+        return input?.ToUpperInvariant();
+    }
+
+    // https://stackoverflow.com/questions/11679804/json-net-rename-properties
+    private static JToken Rename(JToken json)
+    {
+        if (json is JProperty property)
+        {
+            JToken propertyValue = property.Value;
+            if (propertyValue.Type == JTokenType.String)
+            {
+                string stringValue = propertyValue.Value<string>()!;
+                propertyValue = ToUpper(stringValue);
+            }
+
+            return new JProperty(ToUpper(property.Name)!, Rename(propertyValue));
+        }
+
+        if (json is JArray array)
+        {
+            var renamedValues = array.Select(Rename);
+            return new JArray(renamedValues);
+        }
+
+        if (json is JObject obj)
+        {
+            var renamedProperties = obj.Properties().Select(Rename);
+            return new JObject(renamedProperties);
+        }
+
+        return json;
+    }
 }

src/WireMock.Net/Matchers/JsonPartialMatcher.cs

@@ -1,38 +1,35 @@
-using JetBrains.Annotations;
+namespace WireMock.Matchers;
 
-namespace WireMock.Matchers
+/// <summary>
+/// JsonPartialMatcher
+/// </summary>
+public class JsonPartialMatcher : AbstractJsonPartialMatcher
 {
-    /// <summary>
-    /// JsonPartialMatcher
-    /// </summary>
-    public class JsonPartialMatcher : AbstractJsonPartialMatcher
+    /// <inheritdoc />
+    public override string Name => nameof(JsonPartialMatcher);
+
+    /// <inheritdoc />
+    public JsonPartialMatcher(string value, bool ignoreCase = false, bool throwException = false)
+        : base(value, ignoreCase, throwException)
     {
-        /// <inheritdoc />
-        public override string Name => nameof(JsonPartialMatcher);
-
-        /// <inheritdoc />
-        public JsonPartialMatcher([NotNull] string value, bool ignoreCase = false, bool throwException = false)
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        public JsonPartialMatcher([NotNull] object value, bool ignoreCase = false, bool throwException = false)
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        public JsonPartialMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false, bool throwException = false)
-            : base(matchBehaviour, value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override bool IsMatch(string value, string input)
-        {
-            var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, ThrowException, value);
-            return MatchScores.IsPerfect(exactStringMatcher.IsMatch(input));
-        }
     }
-}
+
+    /// <inheritdoc />
+    public JsonPartialMatcher(object value, bool ignoreCase = false, bool throwException = false)
+        : base(value, ignoreCase, throwException)
+    {
+    }
+
+    /// <inheritdoc />
+    public JsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool throwException = false)
+        : base(matchBehaviour, value, ignoreCase, throwException)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(string value, string input)
+    {
+        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, ThrowException, MatchOperator.Or, value);
+        return MatchScores.IsPerfect(exactStringMatcher.IsMatch(input));
+    }
+}

src/WireMock.Net/Matchers/JsonPartialWildCardMatcher.cs

@@ -1,38 +1,37 @@
 using JetBrains.Annotations;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// JsonPartialWildCardMatcher
+/// </summary>
+public class JsonPartialWildcardMatcher : AbstractJsonPartialMatcher
 {
-    /// <summary>
-    /// JsonPartialWildCardMatcher
-    /// </summary>
-    public class JsonPartialWildcardMatcher : AbstractJsonPartialMatcher
+    /// <inheritdoc />
+    public override string Name => nameof(JsonPartialWildcardMatcher);
+
+    /// <inheritdoc />
+    public JsonPartialWildcardMatcher(string value, bool ignoreCase = false, bool throwException = false)
+        : base(value, ignoreCase, throwException)
     {
-        /// <inheritdoc />
-        public override string Name => nameof(JsonPartialWildcardMatcher);
-
-        /// <inheritdoc />
-        public JsonPartialWildcardMatcher([NotNull] string value, bool ignoreCase = false, bool throwException = false)
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        public JsonPartialWildcardMatcher([NotNull] object value, bool ignoreCase = false, bool throwException = false)
-            : base(value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        public JsonPartialWildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false, bool throwException = false)
-            : base(matchBehaviour, value, ignoreCase, throwException)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override bool IsMatch(string value, string input)
-        {
-            var wildcardStringMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, value, IgnoreCase);
-            return MatchScores.IsPerfect(wildcardStringMatcher.IsMatch(input));
-        }
     }
-}
+
+    /// <inheritdoc />
+    public JsonPartialWildcardMatcher(object value, bool ignoreCase = false, bool throwException = false)
+        : base(value, ignoreCase, throwException)
+    {
+    }
+
+    /// <inheritdoc />
+    public JsonPartialWildcardMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool throwException = false)
+        : base(matchBehaviour, value, ignoreCase, throwException)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(string value, string input)
+    {
+        var wildcardStringMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, value, IgnoreCase);
+        return MatchScores.IsPerfect(wildcardStringMatcher.IsMatch(input));
+    }
+}

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -1,146 +1,151 @@
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
 using WireMock.Util;
-using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// System.Linq.Dynamic.Core Expression Matcher
+/// </summary>
+/// <inheritdoc cref="IObjectMatcher"/>
+/// <inheritdoc cref="IStringMatcher"/>
+public class LinqMatcher : IObjectMatcher, IStringMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// System.Linq.Dynamic.Core Expression Matcher
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
     /// </summary>
-    /// <inheritdoc cref="IObjectMatcher"/>
-    /// <inheritdoc cref="IStringMatcher"/>
-    public class LinqMatcher : IObjectMatcher, IStringMatcher
+    /// <param name="pattern">The pattern.</param>
+    public LinqMatcher(AnyOf<string, StringPattern> pattern) : this(new[] { pattern })
     {
-        private readonly AnyOf<string, StringPattern>[] _patterns;
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-        /// </summary>
-        /// <param name="pattern">The pattern.</param>
-        public LinqMatcher([NotNull] AnyOf<string, StringPattern> pattern) : this(new[] { pattern })
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public LinqMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="pattern">The pattern.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern) : this(matchBehaviour, false, pattern)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
-        {
-            Guard.NotNull(patterns, nameof(patterns));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-            _patterns = patterns;
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
-        {
-            double match = MatchScores.Mismatch;
-
-            // Convert a single input string to a Queryable string-list with 1 entry.
-            IQueryable queryable = new[] { input }.AsQueryable();
-
-            try
-            {
-                // Use the Any(...) method to check if the result matches
-                match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())));
-
-                return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-            }
-            catch
-            {
-                if (ThrowException)
-                {
-                    throw;
-                }
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object input)
-        {
-            double match = MatchScores.Mismatch;
-
-            JObject value;
-            switch (input)
-            {
-                case JObject valueAsJObject:
-                    value = valueAsJObject;
-                    break;
-
-                default:
-                    value = JObject.FromObject(input);
-                    break;
-            }
-
-            // Convert a single object to a Queryable JObject-list with 1 entry.
-            var queryable1 = new[] { value }.AsQueryable();
-
-            try
-            {
-                // Generate the DynamicLinq select statement.
-                string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
-
-                // Execute DynamicLinq Select statement.
-                var queryable2 = queryable1.Select(dynamicSelect);
-
-                // Use the Any(...) method to check if the result matches.
-                match = MatchScores.ToScore(_patterns.Select(pattern => queryable2.Any(pattern)));
-
-                return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-            }
-            catch
-            {
-                if (ThrowException)
-                {
-                    throw;
-                }
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _patterns;
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "LinqMatcher";
     }
-}
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public LinqMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    public LinqMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern) : this(matchBehaviour, false, MatchOperator.Or, pattern)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public LinqMatcher(
+        MatchBehaviour matchBehaviour,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string input)
+    {
+        double match = MatchScores.Mismatch;
+
+        // Convert a single input string to a Queryable string-list with 1 entry.
+        IQueryable queryable = new[] { input }.AsQueryable();
+
+        try
+        {
+            // Use the Any(...) method to check if the result matches
+            match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())).ToArray(), MatchOperator);
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        }
+        catch
+        {
+            if (ThrowException)
+            {
+                throw;
+            }
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
+
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object input)
+    {
+        double match = MatchScores.Mismatch;
+
+        JObject value;
+        switch (input)
+        {
+            case JObject valueAsJObject:
+                value = valueAsJObject;
+                break;
+
+            default:
+                value = JObject.FromObject(input);
+                break;
+        }
+
+        // Convert a single object to a Queryable JObject-list with 1 entry.
+        var queryable1 = new[] { value }.AsQueryable();
+
+        try
+        {
+            // Generate the DynamicLinq select statement.
+            string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
+
+            // Execute DynamicLinq Select statement.
+            var queryable2 = queryable1.Select(dynamicSelect);
+
+            // Use the Any(...) method to check if the result matches.
+            match = MatchScores.ToScore(_patterns.Select(pattern => queryable2.Any(pattern)).ToArray(), MatchOperator);
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        }
+        catch
+        {
+            if (ThrowException)
+            {
+                throw;
+            }
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "LinqMatcher";
+}

src/WireMock.Net/Matchers/MatchOperator.cs

@@ -0,0 +1,22 @@
+namespace WireMock.Matchers;
+
+/// <summary>
+/// The Operator to use when multiple patterns are defined.
+/// </summary>
+public enum MatchOperator
+{
+    /// <summary>
+    /// Only one pattern needs to  match. [Default]
+    /// </summary>
+    Or,
+
+    /// <summary>
+    /// All patterns should match.
+    /// </summary>
+    And,
+
+    /// <summary>
+    /// The average value from all patterns.
+    /// </summary>
+    Average,
+}

src/WireMock.Net/Matchers/MatchScores.cs

@@ -1,75 +1,84 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// MatchScores
+/// </summary>
+public static class MatchScores
 {
     /// <summary>
-    /// MatchScores
+    /// The tolerance
     /// </summary>
-    public static class MatchScores
+    public const double Tolerance = 0.000001;
+
+    /// <summary>
+    /// The default mismatch score
+    /// </summary>
+    public const double Mismatch = 0.0;
+
+    /// <summary>
+    /// The default perfect match score
+    /// </summary>
+    public const double Perfect = 1.0;
+
+    /// <summary>
+    /// The almost perfect match score
+    /// </summary>
+    public const double AlmostPerfect = 0.99;
+
+    /// <summary>
+    /// Is the value a perfect match?
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>true/false</returns>
+    public static bool IsPerfect(double value)
     {
-        /// <summary>
-        /// The tolerance
-        /// </summary>
-        public const double Tolerance = 0.000001;
+        return Math.Abs(value - Perfect) < Tolerance;
+    }
 
-        /// <summary>
-        /// The default mismatch score
-        /// </summary>
-        public const double Mismatch = 0.0;
+    /// <summary>
+    /// Convert a bool to the score.
+    /// </summary>
+    /// <param name="value">if set to <c>true</c> [value].</param>
+    /// <returns>score</returns>
+    public static double ToScore(bool value)
+    {
+        return value ? Perfect : Mismatch;
+    }
 
-        /// <summary>
-        /// The default perfect match score
-        /// </summary>
-        public const double Perfect = 1.0;
+    /// <summary>
+    /// Calculates the score from multiple values.
+    /// </summary>
+    /// <param name="values">The values.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/>.</param>
+    /// <returns>average score</returns>
+    public static double ToScore(IReadOnlyCollection<bool> values, MatchOperator matchOperator)
+    {
+        return ToScore(values.Select(ToScore).ToArray(), matchOperator);
+    }
 
-        /// <summary>
-        /// The almost perfect match score
-        /// </summary>
-        public const double AlmostPerfect = 0.99;
-
-        /// <summary>
-        /// Is the value a perfect match?
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>true/false</returns>
-        public static bool IsPerfect(double value)
+    /// <summary>
+    /// Calculates the score from multiple values.
+    /// </summary>
+    /// <param name="values">The values.</param>
+    /// <param name="matchOperator"></param>
+    /// <returns>average score</returns>
+    public static double ToScore(IReadOnlyCollection<double> values, MatchOperator matchOperator)
+    {
+        if (!values.Any())
         {
-            return Math.Abs(value - Perfect) < Tolerance;
+            return Mismatch;
         }
 
-        /// <summary>
-        /// Convert a bool to the score.
-        /// </summary>
-        /// <param name="value">if set to <c>true</c> [value].</param>
-        /// <returns>score</returns>
-        public static double ToScore(bool value)
+        return matchOperator switch
         {
-            return value ? Perfect : Mismatch;
-        }
-
-        /// <summary>
-        /// Calculates the score from multiple values.
-        /// </summary>
-        /// <param name="values">The values.</param>
-        /// <returns>average score</returns>
-        [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
-        public static double ToScore(IEnumerable<bool> values)
-        {
-            return values.Any() ? values.Select(ToScore).Average() : Mismatch;
-        }
-
-        /// <summary>
-        /// Calculates the score from multiple values.
-        /// </summary>
-        /// <param name="values">The values.</param>
-        /// <returns>average score</returns>
-        [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
-        public static double ToScore(IEnumerable<double> values)
-        {
-            return values.Any() ? values.Average() : Mismatch;
-        }
+            MatchOperator.Or => ToScore(values.Any(IsPerfect)),
+            MatchOperator.And => ToScore(values.All(IsPerfect)),
+            _ => values.Average()
+        };
     }
 }

src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs

@@ -2,67 +2,69 @@ using System.Linq;
 using AnyOfTypes;
 using WireMock.Models;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// NotNullOrEmptyMatcher
+/// </summary>
+/// <seealso cref="IObjectMatcher" />
+public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
 {
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "NotNullOrEmptyMatcher";
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// NotNullOrEmptyMatcher
+    /// Initializes a new instance of the <see cref="NotNullOrEmptyMatcher"/> class.
     /// </summary>
-    /// <seealso cref="IObjectMatcher" />
-    public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    public NotNullOrEmptyMatcher(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "NotNullOrEmptyMatcher";
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullOrEmptyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        public NotNullOrEmptyMatcher(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            MatchBehaviour = matchBehaviour;
-        }
-
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object input)
-        {
-            bool match;
-
-            switch (input)
-            {
-                case string @string:
-                    match = !string.IsNullOrEmpty(@string);
-                    break;
-
-                case byte[] bytes:
-                    match = bytes != null && bytes.Any();
-                    break;
-
-                default:
-                    match = input != null;
-                    break;
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
-        {
-            var match = !string.IsNullOrEmpty(input);
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return new AnyOf<string, StringPattern>[0];
-        }
+        MatchBehaviour = matchBehaviour;
     }
+
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object? input)
+    {
+        bool match;
+
+        switch (input)
+        {
+            case string @string:
+                match = !string.IsNullOrEmpty(@string);
+                break;
+
+            case byte[] bytes:
+                match = bytes.Any();
+                break;
+
+            default:
+                match = input != null;
+                break;
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+    }
+
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string? input)
+    {
+        var match = !string.IsNullOrEmpty(input);
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return new AnyOf<string, StringPattern>[0];
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
 }

src/WireMock.Net/Matchers/RegexMatcher.cs

@@ -33,8 +33,14 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
     /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
     /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
-    public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true) :
-        this(MatchBehaviour.AcceptOnMatch, new[] { pattern }, ignoreCase, throwException, useRegexExtended)
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    public RegexMatcher(
+        [RegexPattern] AnyOf<string, StringPattern> pattern,
+        bool ignoreCase = false,
+        bool throwException = false,
+        bool useRegexExtended = true,
+        MatchOperator matchOperator = MatchOperator.Or) :
+        this(MatchBehaviour.AcceptOnMatch, new[] { pattern }, ignoreCase, throwException, useRegexExtended, matchOperator)
     {
     }
 
@@ -46,8 +52,15 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
     /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
     /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
-    public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true) :
-        this(matchBehaviour, new[] { pattern }, ignoreCase, throwException, useRegexExtended)
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    public RegexMatcher(
+        MatchBehaviour matchBehaviour,
+        [RegexPattern] AnyOf<string, StringPattern> pattern,
+        bool ignoreCase = false,
+        bool throwException = false,
+        bool useRegexExtended = true,
+        MatchOperator matchOperator = MatchOperator.Or) :
+        this(matchBehaviour, new[] { pattern }, ignoreCase, throwException, useRegexExtended, matchOperator)
     {
     }
 
@@ -59,14 +72,20 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
     /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
     /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
-    public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true)
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    public RegexMatcher(
+        MatchBehaviour matchBehaviour,
+        [RegexPattern] AnyOf<string, StringPattern>[] patterns,
+        bool ignoreCase = false,
+        bool throwException = false,
+        bool useRegexExtended = true,
+        MatchOperator matchOperator = MatchOperator.Or)
     {
-        Guard.NotNull(patterns, nameof(patterns));
-
-        _patterns = patterns;
+        _patterns = Guard.NotNull(patterns);
         IgnoreCase = ignoreCase;
         MatchBehaviour = matchBehaviour;
         ThrowException = throwException;
+        MatchOperator = matchOperator;
 
         RegexOptions options = RegexOptions.Compiled | RegexOptions.Multiline;
 
@@ -79,14 +98,14 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
     }
 
     /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-    public virtual double IsMatch(string input)
+    public virtual double IsMatch(string? input)
     {
         double match = MatchScores.Mismatch;
         if (input != null)
         {
             try
             {
-                match = MatchScores.ToScore(_expressions.Select(e => e.IsMatch(input)));
+                match = MatchScores.ToScore(_expressions.Select(e => e.IsMatch(input)).ToArray(), MatchOperator);
             }
             catch (Exception)
             {
@@ -111,4 +130,8 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
 
     /// <inheritdoc />
     public bool IgnoreCase { get; }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
 }

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

@@ -1,211 +1,226 @@
-using JetBrains.Annotations;
 using System;
 using System.Linq;
+using AnyOfTypes;
+using Stef.Validation;
+using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
-using Stef.Validation;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request body matcher.
+/// </summary>
+public class RequestMessageBodyMatcher : IRequestMatcher
 {
     /// <summary>
-    /// The request body matcher.
+    /// The body function
     /// </summary>
-    public class RequestMessageBodyMatcher : IRequestMatcher
+    public Func<string, bool>? Func { get; }
+
+    /// <summary>
+    /// The body data function for byte[]
+    /// </summary>
+    public Func<byte[], bool>? DataFunc { get; }
+
+    /// <summary>
+    /// The body data function for json
+    /// </summary>
+    public Func<object, bool>? JsonFunc { get; }
+
+    /// <summary>
+    /// The body data function for BodyData
+    /// </summary>
+    public Func<IBodyData, bool>? BodyDataFunc { get; }
+
+    /// <summary>
+    /// The matchers.
+    /// </summary>
+    public IMatcher[]? Matchers { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="body">The body.</param>
+    public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, string body) :
+        this(new[] { new WildcardMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
     {
-        /// <summary>
-        /// The body function
-        /// </summary>
-        public Func<string, bool> Func { get; }
+    }
 
-        /// <summary>
-        /// The body data function for byte[]
-        /// </summary>
-        public Func<byte[], bool> DataFunc { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="body">The body.</param>
+    public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, byte[] body) :
+        this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+    {
+    }
 
-        /// <summary>
-        /// The body data function for json
-        /// </summary>
-        public Func<object, bool> JsonFunc { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="body">The body.</param>
+    public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, object body) :
+        this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+    {
+    }
 
-        /// <summary>
-        /// The body data function for BodyData
-        /// </summary>
-        public Func<IBodyData, bool> BodyDataFunc { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<string, bool> func)
+    {
+        Func = Guard.NotNull(func);
+    }
 
-        /// <summary>
-        /// The matchers.
-        /// </summary>
-        public IMatcher[] Matchers { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<byte[], bool> func)
+    {
+        DataFunc = Guard.NotNull(func);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new[] { new WildcardMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<object, bool> func)
+    {
+        JsonFunc = Guard.NotNull(func);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<IBodyData, bool> func)
+    {
+        BodyDataFunc = Guard.NotNull(func);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="matchers">The matchers.</param>
+    public RequestMessageBodyMatcher(params IMatcher[] matchers)
+    {
+        Matchers = Guard.NotNull(matchers);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="matchers">The matchers.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    public RequestMessageBodyMatcher(MatchOperator matchOperator, params IMatcher[] matchers)
+    {
+        Matchers = Guard.NotNull(matchers);
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = CalculateMatchScore(requestMessage);
+        return requestMatchResult.AddScore(GetType(), score);
+    }
+
+    private static double CalculateMatchScore(IRequestMessage requestMessage, IMatcher matcher)
+    {
+        if (matcher is NotNullOrEmptyMatcher notNullOrEmptyMatcher)
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-            Func = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-            DataFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<object, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-            JsonFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="func">The function.</param>
-        public RequestMessageBodyMatcher([NotNull] Func<IBodyData, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-            BodyDataFunc = func;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageBodyMatcher([NotNull] params IMatcher[] matchers)
-        {
-            Guard.NotNull(matchers, nameof(matchers));
-            Matchers = matchers;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = CalculateMatchScore(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double CalculateMatchScore(IRequestMessage requestMessage, IMatcher matcher)
-        {
-            if (matcher is NotNullOrEmptyMatcher notNullOrEmptyMatcher)
+            switch (requestMessage.BodyData?.DetectedBodyType)
             {
-                switch (requestMessage?.BodyData?.DetectedBodyType)
-                {
-                    case BodyType.Json:
-                    case BodyType.String:
-                        return notNullOrEmptyMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
+                case BodyType.Json:
+                case BodyType.String:
+                    return notNullOrEmptyMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
 
-                    case BodyType.Bytes:
-                        return notNullOrEmptyMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
+                case BodyType.Bytes:
+                    return notNullOrEmptyMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
 
-                    default:
-                        return MatchScores.Mismatch;
-                }
+                default:
+                    return MatchScores.Mismatch;
+            }
+        }
+
+        if (matcher is ExactObjectMatcher exactObjectMatcher)
+        {
+            // If the body is a byte array, try to match.
+            var detectedBodyType = requestMessage.BodyData?.DetectedBodyType;
+            if (detectedBodyType == BodyType.Bytes || detectedBodyType == BodyType.String)
+            {
+                return exactObjectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
+            }
+        }
+
+        // Check if the matcher is a IObjectMatcher
+        if (matcher is IObjectMatcher objectMatcher)
+        {
+            // If the body is a JSON object, try to match.
+            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
+            {
+                return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsJson);
             }
 
-            if (matcher is ExactObjectMatcher exactObjectMatcher)
+            // If the body is a byte array, try to match.
+            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Bytes)
             {
-                // If the body is a byte array, try to match.
-                var detectedBodyType = requestMessage?.BodyData?.DetectedBodyType;
-                if (detectedBodyType == BodyType.Bytes || detectedBodyType == BodyType.String)
-                {
-                    return exactObjectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
-                }
+                return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
             }
-
-            // Check if the matcher is a IObjectMatcher
-            if (matcher is IObjectMatcher objectMatcher)
-            {
-                // If the body is a JSON object, try to match.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
-                {
-                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsJson);
-                }
-
-                // If the body is a byte array, try to match.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Bytes)
-                {
-                    return objectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
-                }
-            }
-
-            // Check if the matcher is a IStringMatcher
-            if (matcher is IStringMatcher stringMatcher)
-            {
-                // If the body is a Json or a String, use the BodyAsString to match on.
-                if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
-                {
-                    return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
-                }
-            }
-
-            return MatchScores.Mismatch;
         }
 
-        private double CalculateMatchScore(IRequestMessage requestMessage)
+        // Check if the matcher is a IStringMatcher
+        if (matcher is IStringMatcher stringMatcher)
         {
-            if (Matchers != null && Matchers.Any())
+            // If the body is a Json or a String, use the BodyAsString to match on.
+            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
             {
-                return Matchers.Max(matcher => CalculateMatchScore(requestMessage, matcher));
+                return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
             }
-
-            if (Func != null)
-            {
-                return MatchScores.ToScore(Func(requestMessage?.BodyData?.BodyAsString));
-            }
-
-            if (JsonFunc != null)
-            {
-                return MatchScores.ToScore(JsonFunc(requestMessage?.BodyData?.BodyAsJson));
-            }
-
-            if (DataFunc != null)
-            {
-                return MatchScores.ToScore(DataFunc(requestMessage?.BodyData?.BodyAsBytes));
-            }
-
-            if (BodyDataFunc != null)
-            {
-                return MatchScores.ToScore(BodyDataFunc(requestMessage?.BodyData));
-            }
-
-            return MatchScores.Mismatch;
         }
+
+        return MatchScores.Mismatch;
+    }
+
+    private double CalculateMatchScore(IRequestMessage requestMessage)
+    {
+        if (Matchers != null)
+        {
+            var matchersResult = Matchers.Select(matcher => CalculateMatchScore(requestMessage, matcher)).ToArray();
+            return MatchScores.ToScore(matchersResult, MatchOperator);
+        }
+
+        if (Func != null)
+        {
+            return MatchScores.ToScore(Func(requestMessage.BodyData?.BodyAsString));
+        }
+
+        if (JsonFunc != null)
+        {
+            return MatchScores.ToScore(JsonFunc(requestMessage.BodyData?.BodyAsJson));
+        }
+
+        if (DataFunc != null)
+        {
+            return MatchScores.ToScore(DataFunc(requestMessage.BodyData?.BodyAsBytes));
+        }
+
+        if (BodyDataFunc != null)
+        {
+            return MatchScores.ToScore(BodyDataFunc(requestMessage.BodyData));
+        }
+
+        return MatchScores.Mismatch;
     }
 }

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

@@ -1,75 +1,98 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
+using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Models;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request clientIP matcher.
+/// </summary>
+public class RequestMessageClientIPMatcher : IRequestMatcher
 {
     /// <summary>
-    /// The request ClientIP matcher.
+    /// The matchers
     /// </summary>
-    public class RequestMessageClientIPMatcher : IRequestMatcher
+    public IReadOnlyList<IStringMatcher>? Matchers { get; }
+
+    /// <summary>
+    /// The clientIP functions
+    /// </summary>
+    public Func<string, bool>[]? Funcs { get; }
+
+    /// <summary>
+    /// The <see cref="MatchBehaviour"/>
+    /// </summary>
+    public MatchBehaviour Behaviour { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="clientIPs">The clientIPs.</param>
+    public RequestMessageClientIPMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator,
+        params string[] clientIPs) :
+        this(matchBehaviour, matchOperator, clientIPs
+            .Select(clientIP => new WildcardMatcher(matchBehaviour, new AnyOf<string, StringPattern>[] { clientIP }, false, false, matchOperator))
+            .Cast<IStringMatcher>().ToArray())
     {
-        /// <summary>
-        /// The matchers.
-        /// </summary>
-        public IReadOnlyList<IStringMatcher> Matchers { get; }
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// The ClientIP functions.
-        /// </summary>
-        public Func<string, bool>[] Funcs { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    public RequestMessageClientIPMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Matchers = Guard.NotNull(matchers);
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
-        /// </summary>
-        /// <param name="clientIPs">The clientIPs.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        public RequestMessageClientIPMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(matchBehaviour, ip)).Cast<IStringMatcher>().ToArray())
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
+    /// </summary>
+    /// <param name="funcs">The clientIP functions.</param>
+    public RequestMessageClientIPMatcher(params Func<string, bool>[] funcs)
+    {
+        Funcs = Guard.NotNull(funcs);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = IsMatch(requestMessage);
+        return requestMatchResult.AddScore(GetType(), score);
+    }
+
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        if (Matchers != null)
         {
+            var results = Matchers.Select(m => m.IsMatch(requestMessage.ClientIP)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageClientIPMatcher([NotNull] params IStringMatcher[] matchers)
+        if (Funcs != null)
         {
-            Guard.NotNull(matchers, nameof(matchers));
-            Matchers = matchers;
+            var results = Funcs.Select(func => func(requestMessage.ClientIP)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
-        /// </summary>
-        /// <param name="funcs">The clientIP functions.</param>
-        public RequestMessageClientIPMatcher([NotNull] params Func<string, bool>[] funcs)
-        {
-            Guard.NotNull(funcs, nameof(funcs));
-            Funcs = funcs;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = IsMatch(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            if (Matchers != null)
-            {
-                return Matchers.Max(matcher => matcher.IsMatch(requestMessage.ClientIP));
-            }
-
-            if (Funcs != null)
-            {
-                return MatchScores.ToScore(requestMessage.ClientIP != null && Funcs.Any(func => func(requestMessage.ClientIP)));
-            }
-
-            return MatchScores.Mismatch;
-        }
+        return MatchScores.Mismatch;
     }
 }

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

@@ -1,130 +1,142 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using WireMock.Types;
 using Stef.Validation;
+using WireMock.Types;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request header matcher.
+/// </summary>
+/// <inheritdoc cref="IRequestMatcher"/>
+public class RequestMessageHeaderMatcher : IRequestMatcher
 {
+    private readonly MatchBehaviour _matchBehaviour;
+    private readonly bool _ignoreCase;
+
     /// <summary>
-    /// The request header matcher.
+    /// The functions
     /// </summary>
-    /// <inheritdoc cref="IRequestMatcher"/>
-    public class RequestMessageHeaderMatcher : IRequestMatcher
+    public Func<IDictionary<string, string[]>, bool>[]? Funcs { get; }
+
+    /// <summary>
+    /// The name
+    /// </summary>
+    public string? Name { get; }
+
+    /// <value>
+    /// The matchers.
+    /// </value>
+    public IStringMatcher[]? Matchers { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, string name, string pattern, bool ignoreCase)
     {
-        private readonly MatchBehaviour _matchBehaviour;
-        private readonly bool _ignoreCase;
+        Guard.NotNull(name);
+        Guard.NotNull(pattern);
 
-        /// <summary>
-        /// The functions
-        /// </summary>
-        public Func<IDictionary<string, string[]>, bool>[] Funcs { get; }
+        _matchBehaviour = matchBehaviour;
+        _ignoreCase = ignoreCase;
+        Name = name;
+        Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
+    }
 
-        /// <summary>
-        /// The name
-        /// </summary>
-        public string Name { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="name">The name.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, string name, bool ignoreCase, params string[] patterns) :
+        this(matchBehaviour, matchOperator, name, ignoreCase, patterns.Select(pattern => new WildcardMatcher(matchBehaviour, pattern, ignoreCase)).Cast<IStringMatcher>().ToArray())
+    {
+        Guard.NotNull(patterns);
+    }
 
-        /// <value>
-        /// The matchers.
-        /// </value>
-        public IStringMatcher[] Matchers { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="name">The name.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, string name, bool ignoreCase, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name);
+        Guard.NotNull(matchers);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, [NotNull] string pattern, bool ignoreCase)
+        _matchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+        Name = name;
+        Matchers = matchers;
+        _ignoreCase = ignoreCase;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
+    /// </summary>
+    /// <param name="funcs">The funcs.</param>
+    public RequestMessageHeaderMatcher(params Func<IDictionary<string, string[]>, bool>[] funcs)
+    {
+        Funcs = Guard.NotNull(funcs);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = IsMatch(requestMessage);
+        return requestMatchResult.AddScore(GetType(), score);
+    }
+
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        if (requestMessage.Headers == null)
         {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(pattern, nameof(pattern));
-
-            _matchBehaviour = matchBehaviour;
-            _ignoreCase = ignoreCase;
-            Name = name;
-            Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
+            return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="name">The name.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, bool ignoreCase, [NotNull] params string[] patterns) :
-            this(matchBehaviour, name, ignoreCase, patterns.Select(pattern => new WildcardMatcher(matchBehaviour, pattern, ignoreCase)).Cast<IStringMatcher>().ToArray())
+        // Check if we want to use IgnoreCase to compare the Header-Name and Header-Value(s)
+        var headers = !_ignoreCase ? requestMessage.Headers : new Dictionary<string, WireMockList<string>>(requestMessage.Headers, StringComparer.OrdinalIgnoreCase);
+
+        if (Funcs != null)
         {
-            Guard.NotNull(patterns, nameof(patterns));
+            var funcResults = Funcs.Select(f => f(headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))).ToArray();
+            return MatchScores.ToScore(funcResults, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="name">The name.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, bool ignoreCase, [NotNull] params IStringMatcher[] matchers)
+        if (Matchers != null)
         {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(matchers, nameof(matchers));
-
-            _matchBehaviour = matchBehaviour;
-            Name = name;
-            Matchers = matchers;
-            _ignoreCase = ignoreCase;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        public RequestMessageHeaderMatcher([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs)
-        {
-            Guard.NotNull(funcs, nameof(funcs));
-
-            Funcs = funcs;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = IsMatch(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            if (requestMessage.Headers == null)
+            if (!headers.ContainsKey(Name!))
             {
                 return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
-            // Check if we want to use IgnoreCase to compare the Header-Name and Header-Value(s)
-            var headers = !_ignoreCase ? requestMessage.Headers : new Dictionary<string, WireMockList<string>>(requestMessage.Headers, StringComparer.OrdinalIgnoreCase);
-
-            if (Funcs != null)
+            var results = new List<double>();
+            foreach (var matcher in Matchers)
             {
-                return MatchScores.ToScore(Funcs.Any(f => f(headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));
+                var resultsPerMatcher = headers[Name!].Select(v => matcher.IsMatch(v)).ToArray();
+
+                results.Add(MatchScores.ToScore(resultsPerMatcher, MatchOperator.And));
             }
 
-            if (Matchers == null)
-            {
-                return MatchScores.Mismatch;
-            }
-
-            if (!headers.ContainsKey(Name))
-            {
-                return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
-            }
-
-            WireMockList<string> list = headers[Name];
-            return Matchers.Max(m => list.Max(m.IsMatch)); // TODO : is this correct ?
+            return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.ToScore(results, MatchOperator));
         }
+
+        return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
     }
 }

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

@@ -1,45 +1,52 @@
 using System;
 using System.Linq;
-using JetBrains.Annotations;
 using Stef.Validation;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request method matcher.
+/// </summary>
+internal class RequestMessageMethodMatcher : IRequestMatcher
 {
     /// <summary>
-    /// The request verb matcher.
+    /// The <see cref="Matchers.MatchBehaviour"/>
     /// </summary>
-    internal class RequestMessageMethodMatcher : IRequestMatcher
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// The <see cref="Matchers.MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; }
+
+    /// <summary>
+    /// The methods
+    /// </summary>
+    public string[] Methods { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageMethodMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
+    /// <param name="methods">The methods.</param>
+    public RequestMessageMethodMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params string[] methods)
     {
-        private readonly MatchBehaviour _matchBehaviour;
+        Methods = Guard.NotNull(methods);
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// The methods
-        /// </summary>
-        public string[] Methods { get; }
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = MatchBehaviourHelper.Convert(MatchBehaviour, IsMatch(requestMessage));
+        return requestMatchResult.AddScore(GetType(), score);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageMethodMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="methods">The methods.</param>
-        public RequestMessageMethodMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] methods)
-        {
-            Guard.NotNull(methods, nameof(methods));
-            _matchBehaviour = matchBehaviour;
-
-            Methods = methods;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = MatchBehaviourHelper.Convert(_matchBehaviour, IsMatch(requestMessage));
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            return MatchScores.ToScore(Methods.Contains(requestMessage.Method, StringComparer.OrdinalIgnoreCase));
-        }
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        var scores = Methods.Select(m => string.Equals(m, requestMessage.Method, StringComparison.OrdinalIgnoreCase)).ToArray();
+        return MatchScores.ToScore(scores, MatchOperator);
     }
 }

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

@@ -1,152 +1,146 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using WireMock.Types;
 using Stef.Validation;
+using WireMock.Types;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request parameters matcher.
+/// </summary>
+public class RequestMessageParamMatcher : IRequestMatcher
 {
+    private readonly MatchBehaviour _matchBehaviour;
+
     /// <summary>
-    /// The request parameters matcher.
+    /// The funcs
     /// </summary>
-    public class RequestMessageParamMatcher : IRequestMatcher
+    public Func<IDictionary<string, WireMockList<string>>, bool>[]? Funcs { get; }
+
+    /// <summary>
+    /// The key
+    /// </summary>
+    public string? Key { get; }
+
+    /// <summary>
+    /// Defines if the key should be matched using case-ignore.
+    /// </summary>
+    public bool? IgnoreCase { get; }
+
+    /// <summary>
+    /// The matchers.
+    /// </summary>
+    public IReadOnlyList<IStringMatcher>? Matchers { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase) : this(matchBehaviour, key, ignoreCase, (IStringMatcher[]?)null)
     {
-        private readonly MatchBehaviour _matchBehaviour;
+    }
 
-        /// <summary>
-        /// The funcs
-        /// </summary>
-        public Func<IDictionary<string, WireMockList<string>>, bool>[] Funcs { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="values">The values.</param>
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, string[]? values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, false, MatchOperator.And, value)).Cast<IStringMatcher>().ToArray())
+    {
+    }
 
-        /// <summary>
-        /// The key
-        /// </summary>
-        public string Key { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="matchers">The matchers.</param>
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, IStringMatcher[]? matchers)
+    {
+        _matchBehaviour = matchBehaviour;
+        Key = Guard.NotNull(key);
+        IgnoreCase = ignoreCase;
+        Matchers = matchers;
+    }
 
-        /// <summary>
-        /// Defines if the key should be matched using case-ignore.
-        /// </summary>
-        public bool? IgnoreCase { get; private set; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
+    /// </summary>
+    /// <param name="funcs">The funcs.</param>
+    public RequestMessageParamMatcher(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
+    {
+        Funcs = Guard.NotNull(funcs);
+    }
 
-        /// <summary>
-        /// The matchers.
-        /// </summary>
-        public IReadOnlyList<IStringMatcher> Matchers { get; }
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = MatchBehaviourHelper.Convert(_matchBehaviour, IsMatch(requestMessage));
+        return requestMatchResult.AddScore(GetType(), score);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, bool ignoreCase) : this(matchBehaviour, key, ignoreCase, (IStringMatcher[])null)
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        if (Funcs != null)
         {
+            return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="values">The values.</param>
-        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, bool ignoreCase, [CanBeNull] string[] values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, false, value)).Cast<IStringMatcher>().ToArray())
+        WireMockList<string> valuesPresentInRequestMessage = ((RequestMessage)requestMessage).GetParameter(Key, IgnoreCase ?? false);
+        if (valuesPresentInRequestMessage == null)
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, bool ignoreCase, [CanBeNull] IStringMatcher[] matchers)
-        {
-            Guard.NotNull(key, nameof(key));
-
-            _matchBehaviour = matchBehaviour;
-            Key = key;
-            IgnoreCase = ignoreCase;
-            Matchers = matchers;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        public RequestMessageParamMatcher([NotNull] params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
-        {
-            Guard.NotNull(funcs, nameof(funcs));
-
-            Funcs = funcs;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = MatchBehaviourHelper.Convert(_matchBehaviour, IsMatch(requestMessage));
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            if (Funcs != null)
-            {
-                return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
-            }
-
-            WireMockList<string> valuesPresentInRequestMessage = ((RequestMessage) requestMessage).GetParameter(Key, IgnoreCase ?? false);
-            if (valuesPresentInRequestMessage == null)
-            {
-                // Key is not present at all, just return Mismatch
-                return MatchScores.Mismatch;
-            }
-
-            if (Matchers != null && Matchers.Any())
-            {
-                // Return the score based on Matchers and valuesPresentInRequestMessage
-                return CalculateScore(valuesPresentInRequestMessage);
-            }
-
-            if (Matchers == null || !Matchers.Any())
-            {
-                // Matchers are null or not defined, and Key is present, just return Perfect.
-                return MatchScores.Perfect;
-            }
-
+            // Key is not present at all, just return Mismatch
             return MatchScores.Mismatch;
         }
 
-        private double CalculateScore(WireMockList<string> valuesPresentInRequestMessage)
+        if (Matchers != null && Matchers.Any())
         {
-            var total = new List<double>();
+            // Return the score based on Matchers and valuesPresentInRequestMessage
+            return CalculateScore(valuesPresentInRequestMessage);
+        }
 
-            // If the total patterns in all matchers > values in message, use the matcher as base
-            if (Matchers.Sum(m => m.GetPatterns().Length) > valuesPresentInRequestMessage.Count)
-            {
-                foreach (var matcher in Matchers)
-                {
-                    double score = 0d;
-                    foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
-                    {
-                        score += matcher.IsMatch(valuePresentInRequestMessage) / matcher.GetPatterns().Length;
-                    }
+        if (Matchers == null || !Matchers.Any())
+        {
+            // Matchers are null or not defined, and Key is present, just return Perfect.
+            return MatchScores.Perfect;
+        }
 
-                    total.Add(score);
-                }
-            }
-            else
+        return MatchScores.Mismatch;
+    }
+
+    private double CalculateScore(WireMockList<string> valuesPresentInRequestMessage)
+    {
+        var total = new List<double>();
+
+        // If the total patterns in all matchers > values in message, use the matcher as base
+        if (Matchers.Sum(m => m.GetPatterns().Length) > valuesPresentInRequestMessage.Count)
+        {
+            foreach (var matcher in Matchers)
             {
+                double score = 0d;
                 foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
                 {
-                    double score = Matchers.Max(m => m.IsMatch(valuePresentInRequestMessage));
-                    total.Add(score);
+                    score += matcher.IsMatch(valuePresentInRequestMessage) / matcher.GetPatterns().Length;
                 }
-            }
 
-            return total.Any() ? MatchScores.ToScore(total) : MatchScores.Mismatch;
+                total.Add(score);
+            }
         }
+        else
+        {
+            foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
+            {
+                double score = Matchers.Max(m => m.IsMatch(valuePresentInRequestMessage));
+                total.Add(score);
+            }
+        }
+
+        return total.Any() ? MatchScores.ToScore(total, MatchOperator.Average) : MatchScores.Mismatch;
     }
 }

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

@@ -1,77 +1,98 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
+using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Models;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request path matcher.
+/// </summary>
+public class RequestMessagePathMatcher : IRequestMatcher
 {
     /// <summary>
-    /// The request path matcher.
+    /// The matchers
     /// </summary>
-    public class RequestMessagePathMatcher : IRequestMatcher
+    public IReadOnlyList<IStringMatcher>? Matchers { get; }
+
+    /// <summary>
+    /// The path functions
+    /// </summary>
+    public Func<string, bool>[]? Funcs { get; }
+
+    /// <summary>
+    /// The <see cref="MatchBehaviour"/>
+    /// </summary>
+    public MatchBehaviour Behaviour { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="paths">The paths.</param>
+    public RequestMessagePathMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator,
+        params string[] paths) :
+        this(matchBehaviour, matchOperator, paths
+            .Select(path => new WildcardMatcher(matchBehaviour, new AnyOf<string, StringPattern>[] { path }, false, false, matchOperator))
+            .Cast<IStringMatcher>().ToArray())
     {
-        /// <summary>
-        /// The matchers
-        /// </summary>
-        public IReadOnlyList<IStringMatcher> Matchers { get; }
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// The path functions
-        /// </summary>
-        public Func<string, bool>[] Funcs { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    public RequestMessagePathMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Matchers = Guard.NotNull(matchers);
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="paths">The paths.</param>
-        public RequestMessagePathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(matchBehaviour, path)).Cast<IStringMatcher>().ToArray())
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
+    /// </summary>
+    /// <param name="funcs">The path functions.</param>
+    public RequestMessagePathMatcher(params Func<string, bool>[] funcs)
+    {
+        Funcs = Guard.NotNull(funcs);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = IsMatch(requestMessage);
+        return requestMatchResult.AddScore(GetType(), score);
+    }
+
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        if (Matchers != null)
         {
+            var results = Matchers.Select(m => m.IsMatch(requestMessage.Path)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessagePathMatcher([NotNull] params IStringMatcher[] matchers)
+        if (Funcs != null)
         {
-            Guard.NotNull(matchers, nameof(matchers));
-
-            Matchers = matchers;
+            var results = Funcs.Select(func => func(requestMessage.Path)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
-        /// </summary>
-        /// <param name="funcs">The path functions.</param>
-        public RequestMessagePathMatcher([NotNull] params Func<string, bool>[] funcs)
-        {
-            Guard.NotNull(funcs, nameof(funcs));
-
-            Funcs = funcs;
-        }
-
-        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = IsMatch(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            if (Matchers != null)
-            {
-                return Matchers.Max(m => m.IsMatch(requestMessage.Path));
-            }
-
-            if (Funcs != null)
-            {
-                return MatchScores.ToScore(requestMessage.Path != null && Funcs.Any(func => func(requestMessage.Path)));
-            }
-
-            return MatchScores.Mismatch;
-        }
+        return MatchScores.Mismatch;
     }
 }

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

@@ -1,75 +1,98 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
+using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Models;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request url matcher.
+/// </summary>
+public class RequestMessageUrlMatcher : IRequestMatcher
 {
     /// <summary>
-    /// The request url matcher.
+    /// The matchers
     /// </summary>
-    public class RequestMessageUrlMatcher : IRequestMatcher
+    public IReadOnlyList<IStringMatcher>? Matchers { get; }
+
+    /// <summary>
+    /// The url functions
+    /// </summary>
+    public Func<string, bool>[]? Funcs { get; }
+
+    /// <summary>
+    /// The <see cref="MatchBehaviour"/>
+    /// </summary>
+    public MatchBehaviour Behaviour { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="urls">The urls.</param>
+    public RequestMessageUrlMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator,
+        params string[] urls) :
+        this(matchBehaviour, matchOperator, urls
+            .Select(url => new WildcardMatcher(matchBehaviour, new AnyOf<string, StringPattern>[] { url }, false, false, matchOperator))
+            .Cast<IStringMatcher>().ToArray())
     {
-        /// <summary>
-        /// The matchers.
-        /// </summary>
-        public IReadOnlyList<IStringMatcher> Matchers { get; }
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// The url functions.
-        /// </summary>
-        public Func<string, bool>[] Funcs { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="matchers">The matchers.</param>
+    public RequestMessageUrlMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Matchers = Guard.NotNull(matchers);
+        Behaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="urls">The urls.</param>
-        public RequestMessageUrlMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(matchBehaviour, url)).Cast<IStringMatcher>().ToArray())
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
+    /// </summary>
+    /// <param name="funcs">The url functions.</param>
+    public RequestMessageUrlMatcher(params Func<string, bool>[] funcs)
+    {
+        Funcs = Guard.NotNull(funcs);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        double score = IsMatch(requestMessage);
+        return requestMatchResult.AddScore(GetType(), score);
+    }
+
+    private double IsMatch(IRequestMessage requestMessage)
+    {
+        if (Matchers != null)
         {
+            var results = Matchers.Select(m => m.IsMatch(requestMessage.Url)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageUrlMatcher([NotNull] params IStringMatcher[] matchers)
+        if (Funcs != null)
         {
-            Guard.NotNull(matchers, nameof(matchers));
-            Matchers = matchers;
+            var results = Funcs.Select(func => func(requestMessage.Url)).ToArray();
+            return MatchScores.ToScore(results, MatchOperator);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
-        /// </summary>
-        /// <param name="funcs">The url functions.</param>
-        public RequestMessageUrlMatcher([NotNull] params Func<string, bool>[] funcs)
-        {
-            Guard.NotNull(funcs, nameof(funcs));
-            Funcs = funcs;
-        }
-
-        /// <inheritdoc />
-        public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
-        {
-            double score = IsMatch(requestMessage);
-            return requestMatchResult.AddScore(GetType(), score);
-        }
-
-        private double IsMatch(IRequestMessage requestMessage)
-        {
-            if (Matchers != null)
-            {
-                return Matchers.Max(matcher => matcher.IsMatch(requestMessage.Url));
-            }
-
-            if (Funcs != null)
-            {
-                return MatchScores.ToScore(requestMessage.Url != null && Funcs.Any(func => func(requestMessage.Url)));
-            }
-
-            return MatchScores.Mismatch;
-        }
+        return MatchScores.Mismatch;
     }
 }

src/WireMock.Net/Matchers/SimMetricsMatcher.cs

@@ -1,143 +1,149 @@
 using System.Linq;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using SimMetrics.Net;
 using SimMetrics.Net.API;
 using SimMetrics.Net.Metric;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
-using Stef.Validation;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// SimMetricsMatcher
+/// </summary>
+/// <seealso cref="IStringMatcher" />
+public class SimMetricsMatcher : IStringMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+    private readonly SimMetricType _simMetricType;
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// SimMetricsMatcher
+    /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
     /// </summary>
-    /// <seealso cref="IStringMatcher" />
-    public class SimMetricsMatcher : IStringMatcher
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="simMetricType">The SimMetric Type</param>
+    public SimMetricsMatcher(AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new[] { pattern }, simMetricType)
     {
-        private readonly AnyOf<string, StringPattern>[] _patterns;
-        private readonly SimMetricType _simMetricType;
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
-        /// </summary>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new[] { pattern }, simMetricType)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(matchBehaviour, new[] { pattern }, simMetricType)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns.ToAnyOfPatterns(), simMetricType)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns, simMetricType)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="simMetricType">The SimMetric Type</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein, bool throwException = false)
-        {
-            Guard.NotNull(patterns, nameof(patterns));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-
-            _patterns = patterns;
-            _simMetricType = simMetricType;
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
-        {
-            IStringMetric stringMetricType = GetStringMetricType();
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringMetricType.GetSimilarity(p.GetPattern(), input))));
-        }
-
-        private IStringMetric GetStringMetricType()
-        {
-            switch (_simMetricType)
-            {
-                case SimMetricType.BlockDistance:
-                    return new BlockDistance();
-                case SimMetricType.ChapmanLengthDeviation:
-                    return new ChapmanLengthDeviation();
-                case SimMetricType.CosineSimilarity:
-                    return new CosineSimilarity();
-                case SimMetricType.DiceSimilarity:
-                    return new DiceSimilarity();
-                case SimMetricType.EuclideanDistance:
-                    return new EuclideanDistance();
-                case SimMetricType.JaccardSimilarity:
-                    return new JaccardSimilarity();
-                case SimMetricType.Jaro:
-                    return new Jaro();
-                case SimMetricType.JaroWinkler:
-                    return new JaroWinkler();
-                case SimMetricType.MatchingCoefficient:
-                    return new MatchingCoefficient();
-                case SimMetricType.MongeElkan:
-                    return new MongeElkan();
-                case SimMetricType.NeedlemanWunch:
-                    return new NeedlemanWunch();
-                case SimMetricType.OverlapCoefficient:
-                    return new OverlapCoefficient();
-                case SimMetricType.QGramsDistance:
-                    return new QGramsDistance();
-                case SimMetricType.SmithWaterman:
-                    return new SmithWaterman();
-                case SimMetricType.SmithWatermanGotoh:
-                    return new SmithWatermanGotoh();
-                case SimMetricType.SmithWatermanGotohWindowedAffine:
-                    return new SmithWatermanGotohWindowedAffine();
-                case SimMetricType.ChapmanMeanLength:
-                    return new ChapmanMeanLength();
-                default:
-                    return new Levenstein();
-            }
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _patterns;
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => $"SimMetricsMatcher.{_simMetricType}";
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="simMetricType">The SimMetric Type</param>
+    public SimMetricsMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(matchBehaviour, new[] { pattern }, simMetricType)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="simMetricType">The SimMetric Type</param>
+    public SimMetricsMatcher(string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns.ToAnyOfPatterns(), simMetricType)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="simMetricType">The SimMetric Type</param>
+    public SimMetricsMatcher(AnyOf<string, StringPattern>[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns, simMetricType)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="simMetricType">The SimMetric Type</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    public SimMetricsMatcher(
+        MatchBehaviour matchBehaviour,
+        AnyOf<string, StringPattern>[] patterns,
+        SimMetricType simMetricType = SimMetricType.Levenstein,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Average)
+    {
+        _patterns = Guard.NotNull(patterns);
+        _simMetricType = simMetricType;
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string input)
+    {
+        IStringMetric stringMetricType = GetStringMetricType();
+
+        var score = MatchScores.ToScore(_patterns.Select(p => stringMetricType.GetSimilarity(p.GetPattern(), input)).ToArray(), MatchOperator);
+        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
+    }
+
+    private IStringMetric GetStringMetricType()
+    {
+        switch (_simMetricType)
+        {
+            case SimMetricType.BlockDistance:
+                return new BlockDistance();
+            case SimMetricType.ChapmanLengthDeviation:
+                return new ChapmanLengthDeviation();
+            case SimMetricType.CosineSimilarity:
+                return new CosineSimilarity();
+            case SimMetricType.DiceSimilarity:
+                return new DiceSimilarity();
+            case SimMetricType.EuclideanDistance:
+                return new EuclideanDistance();
+            case SimMetricType.JaccardSimilarity:
+                return new JaccardSimilarity();
+            case SimMetricType.Jaro:
+                return new Jaro();
+            case SimMetricType.JaroWinkler:
+                return new JaroWinkler();
+            case SimMetricType.MatchingCoefficient:
+                return new MatchingCoefficient();
+            case SimMetricType.MongeElkan:
+                return new MongeElkan();
+            case SimMetricType.NeedlemanWunch:
+                return new NeedlemanWunch();
+            case SimMetricType.OverlapCoefficient:
+                return new OverlapCoefficient();
+            case SimMetricType.QGramsDistance:
+                return new QGramsDistance();
+            case SimMetricType.SmithWaterman:
+                return new SmithWaterman();
+            case SimMetricType.SmithWatermanGotoh:
+                return new SmithWatermanGotoh();
+            case SimMetricType.SmithWatermanGotohWindowedAffine:
+                return new SmithWatermanGotohWindowedAffine();
+            case SimMetricType.ChapmanMeanLength:
+                return new ChapmanMeanLength();
+            default:
+                return new Levenstein();
+        }
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; } = MatchOperator.Average;
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => $"SimMetricsMatcher.{_simMetricType}";
 }

src/WireMock.Net/Matchers/WildcardMatcher.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using AnyOfTypes;
-using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
 
@@ -20,7 +20,7 @@ public class WildcardMatcher : RegexMatcher
     /// </summary>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">IgnoreCase</param>
-    public WildcardMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+    public WildcardMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
     {
     }
 
@@ -30,7 +30,7 @@ public class WildcardMatcher : RegexMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">IgnoreCase</param>
-    public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+    public WildcardMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
     {
     }
 
@@ -39,7 +39,7 @@ public class WildcardMatcher : RegexMatcher
     /// </summary>
     /// <param name="patterns">The patterns.</param>
     /// <param name="ignoreCase">IgnoreCase</param>
-    public WildcardMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+    public WildcardMatcher(AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
     {
     }
 
@@ -50,10 +50,16 @@ public class WildcardMatcher : RegexMatcher
     /// <param name="patterns">The patterns.</param>
     /// <param name="ignoreCase">IgnoreCase</param>
     /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-    public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false) :
-        base(matchBehaviour, CreateArray(patterns), ignoreCase, throwException)
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    public WildcardMatcher(
+        MatchBehaviour matchBehaviour,
+        AnyOf<string, StringPattern>[] patterns,
+        bool ignoreCase = false,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Or) :
+            base(matchBehaviour, CreateArray(patterns), ignoreCase, throwException, true, matchOperator)
     {
-        _patterns = patterns;
+        _patterns = Guard.NotNull(patterns);
     }
 
     /// <inheritdoc />
@@ -67,7 +73,8 @@ public class WildcardMatcher : RegexMatcher
 
     private static AnyOf<string, StringPattern>[] CreateArray(AnyOf<string, StringPattern>[] patterns)
     {
-        return patterns.Select(pattern => new AnyOf<string, StringPattern>(
+        return patterns
+            .Select(pattern => new AnyOf<string, StringPattern>(
                 new StringPattern
                 {
                     Pattern = "^" + Regex.Escape(pattern.GetPattern()).Replace(@"\*", ".*").Replace(@"\?", ".") + "$",

src/WireMock.Net/Matchers/XPathMatcher.cs

@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Xml;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using WireMock.Extensions;
 using WireMock.Models;
 using Stef.Validation;
@@ -30,7 +29,7 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public XPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public XPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
         {
         }
 
@@ -39,18 +38,22 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
         /// <param name="patterns">The patterns.</param>
-        public XPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
+        public XPathMatcher(
+            MatchBehaviour matchBehaviour,
+            bool throwException = false,
+            MatchOperator matchOperator = MatchOperator.Or,
+            params AnyOf<string, StringPattern>[] patterns)
         {
-            Guard.NotNull(patterns, nameof(patterns));
-
+            _patterns = Guard.NotNull(patterns);
             MatchBehaviour = matchBehaviour;
             ThrowException = throwException;
-            _patterns = patterns;
+            MatchOperator = matchOperator;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string input)
+        public double IsMatch(string? input)
         {
             double match = MatchScores.Mismatch;
             if (input != null)
@@ -59,9 +62,9 @@ namespace WireMock.Matchers
                 {
                     var nav = new XmlDocument { InnerXml = input }.CreateNavigator();
 #if NETSTANDARD1_3
-                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p.GetPattern()})"))));
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p.GetPattern()})"))).ToArray(), MatchOperator);
 #else
-                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p.GetPattern()})"))));
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p.GetPattern()})"))).ToArray(), MatchOperator);
 #endif
                 }
                 catch (Exception)
@@ -82,6 +85,9 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
+        /// <inheritdoc />
+        public MatchOperator MatchOperator { get; }
+
         /// <inheritdoc cref="IMatcher.Name"/>
         public string Name => "XPathMatcher";
     }

src/WireMock.Net/Models/StringPattern.cs

@@ -1,18 +1,17 @@
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// StringPattern which defines the Pattern as a string, and optionally the filepath pattern file.
+/// </summary>
+public struct StringPattern
 {
     /// <summary>
-    /// StringPattern which defines the Pattern as a string, and optionally the filepath pattern file.
+    /// The pattern as string.
     /// </summary>
-    public struct StringPattern
-    {
-        /// <summary>
-        /// The pattern as string.
-        /// </summary>
-        public string Pattern { get; set; }
+    public string Pattern { get; set; }
 
-        /// <summary>
-        /// The filepath (optionally)
-        /// </summary>
-        public string PatternAsFile { get; set; }
-    }
+    /// <summary>
+    /// The filepath (optionally)
+    /// </summary>
+    public string? PatternAsFile { get; set; }
 }

src/WireMock.Net/Models/WebhookRequest.cs

@@ -16,10 +16,10 @@ namespace WireMock.Models
         public string Method { get; set; }
 
         /// <inheritdoc cref="IWebhookRequest.Headers"/>
-        public IDictionary<string, WireMockList<string>> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>>? Headers { get; set; }
 
         /// <inheritdoc cref="IWebhookRequest.BodyData"/>
-        public IBodyData BodyData { get; set; }
+        public IBodyData? BodyData { get; set; }
 
         /// <inheritdoc cref="IWebhookRequest.UseTransformer"/>
         public bool? UseTransformer { get; set; }

src/WireMock.Net/Pact/Models/V2/Interaction.cs

@@ -1,13 +1,12 @@
-namespace WireMock.Pact.Models.V2
+namespace WireMock.Pact.Models.V2;
+
+public class Interaction
 {
-    public class Interaction
-    {
-        public string Description { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
 
-        public string ProviderState { get; set; }
+    public string ProviderState { get; set; }
 
-        public Request Request { get; set; } = new Request();
+    public PactRequest Request { get; set; } = new PactRequest();
 
-        public Response Response { get; set; } = new Response();
-    }
+    public PactResponse Response { get; set; } = new PactResponse();
 }

src/WireMock.Net/Pact/Models/V2/PactRequest.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace WireMock.Pact.Models.V2;
 
-public class Request
+public class PactRequest
 {
     public IDictionary<string, string>? Headers { get; set; }
 

src/WireMock.Net/Pact/Models/V2/PactResponse.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace WireMock.Pact.Models.V2;
 
-public class Response
+public class PactResponse
 {
     public object? Body { get; set; }
 

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Http;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
@@ -11,100 +11,98 @@ using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
-using Stef.Validation;
 
-namespace WireMock.Proxy
+namespace WireMock.Proxy;
+
+internal class ProxyHelper
 {
-    internal class ProxyHelper
+    private readonly WireMockServerSettings _settings;
+
+    public ProxyHelper(WireMockServerSettings settings)
     {
-        private readonly WireMockServerSettings _settings;
+        _settings = Guard.NotNull(settings);
+    }
 
-        public ProxyHelper([NotNull] WireMockServerSettings settings)
+    public async Task<(IResponseMessage Message, IMapping? Mapping)> SendAsync(
+        ProxyAndRecordSettings proxyAndRecordSettings,
+        HttpClient client,
+        IRequestMessage requestMessage,
+        string url)
+    {
+        Guard.NotNull(client, nameof(client));
+        Guard.NotNull(requestMessage, nameof(requestMessage));
+        Guard.NotNull(url, nameof(url));
+
+        var originalUri = new Uri(requestMessage.Url);
+        var requiredUri = new Uri(url);
+
+        // Create HttpRequestMessage
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
+
+        // Call the URL
+        var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
+
+        // Create ResponseMessage
+        bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
+        bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
+
+        var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate).ConfigureAwait(false);
+
+        IMapping? mapping = null;
+        if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
+            (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
         {
-            _settings = Guard.NotNull(settings, nameof(settings));
+            mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
         }
 
-        public async Task<(IResponseMessage Message, IMapping Mapping)> SendAsync(
-            [NotNull] ProxyAndRecordSettings proxyAndRecordSettings,
-            [NotNull] HttpClient client,
-            [NotNull] IRequestMessage requestMessage,
-            [NotNull] string url)
+        return (responseMessage, mapping);
+    }
+
+    private IMapping ToMapping(ProxyAndRecordSettings proxyAndRecordSettings, IRequestMessage requestMessage, ResponseMessage responseMessage)
+    {
+        var excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
+        var excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
+
+        var request = Request.Create();
+        request.WithPath(requestMessage.Path);
+        request.UsingMethod(requestMessage.Method);
+
+        requestMessage.Query?.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
+        requestMessage.Cookies?.Loop((key, value) =>
         {
-            Guard.NotNull(client, nameof(client));
-            Guard.NotNull(requestMessage, nameof(requestMessage));
-            Guard.NotNull(url, nameof(url));
-
-            var originalUri = new Uri(requestMessage.Url);
-            var requiredUri = new Uri(url);
-
-            // Create HttpRequestMessage
-            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
-
-            // Call the URL
-            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
-
-            // Create ResponseMessage
-            bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
-            bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
-
-            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate).ConfigureAwait(false);
-
-            IMapping mapping = null;
-            if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
-                (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
+            if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
             {
-                mapping = ToMapping(proxyAndRecordSettings, requestMessage, responseMessage);
+                request.WithCookie(key, value);
             }
+        });
 
-            return (responseMessage, mapping);
-        }
-
-        private IMapping ToMapping(ProxyAndRecordSettings proxyAndRecordSettings, IRequestMessage requestMessage, ResponseMessage responseMessage)
+        var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
+        requestMessage.Headers?.Loop((key, value) =>
         {
-            string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
-            string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
-
-            var request = Request.Create();
-            request.WithPath(requestMessage.Path);
-            request.UsingMethod(requestMessage.Method);
-
-            requestMessage.Query.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
-            requestMessage.Cookies.Loop((key, value) =>
+            if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
             {
-                if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithCookie(key, value);
-                }
-            });
-
-            var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
-            requestMessage.Headers.Loop((key, value) =>
-            {
-                if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
-                {
-                    request.WithHeader(key, value.ToArray());
-                }
-            });
-
-            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
-            switch (requestMessage.BodyData?.DetectedBodyType)
-            {
-                case BodyType.Json:
-                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
-                    break;
-
-                case BodyType.String:
-                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
-                    break;
-
-                case BodyType.Bytes:
-                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
-                    break;
+                request.WithHeader(key, value.ToArray());
             }
+        });
 
-            var response = Response.Create(responseMessage);
+        bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+        switch (requestMessage.BodyData?.DetectedBodyType)
+        {
+            case BodyType.Json:
+                request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson!, true, throwExceptionWhenMatcherFails));
+                break;
 
-            return new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, null, null);
+            case BodyType.String:
+                request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, MatchOperator.Or, requestMessage.BodyData.BodyAsString));
+                break;
+
+            case BodyType.Bytes:
+                request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
+                break;
         }
+
+        var response = Response.Create(responseMessage);
+
+        return new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, null, null);
     }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,80 +1,79 @@
-using JetBrains.Annotations;
 using System;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Util;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The BodyRequestBuilder interface.
+/// </summary>
+public interface IBodyRequestBuilder : IRequestMatcher
 {
     /// <summary>
-    /// The BodyRequestBuilder interface.
+    /// WithBody: IMatcher
     /// </summary>
-    public interface IBodyRequestBuilder : IRequestMatcher
-    {
-        /// <summary>
-        /// WithBody: IMatcher
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher matcher);
+    /// <param name="matcher">The matcher.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(IMatcher matcher);
 
-        /// <summary>
-        /// WithBody: IMatcher[]
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
+    /// <summary>
+    /// WithBody: IMatcher[]
+    /// </summary>
+    /// <param name="matchers">The matchers.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(IMatcher[] matchers, MatchOperator matchOperator = MatchOperator.Or);
 
-        /// <summary>
-        /// WithBody: Body as string
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithBody: Body as string
+    /// </summary>
+    /// <param name="body">The body.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithBody: Body as byte[]
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithBody: Body as byte[]
+    /// </summary>
+    /// <param name="body">The body.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithBody: Body as object
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithBody: Body as object
+    /// </summary>
+    /// <param name="body">The body.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithBody: func (string)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+    /// <summary>
+    /// WithBody: func (string)
+    /// </summary>
+    /// <param name="func">The function.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(Func<string, bool> func);
 
-        /// <summary>
-        /// WithBody: func (byte[])
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
+    /// <summary>
+    /// WithBody: func (byte[])
+    /// </summary>
+    /// <param name="func">The function.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(Func<byte[], bool> func);
 
-        /// <summary>
-        /// WithBody: func (json object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+    /// <summary>
+    /// WithBody: func (json object)
+    /// </summary>
+    /// <param name="func">The function.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(Func<object, bool> func);
 
-        /// <summary>
-        /// WithBody: func (BodyData object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
-    }
+    /// <summary>
+    /// WithBody: func (BodyData object)
+    /// </summary>
+    /// <param name="func">The function.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(Func<IBodyData, bool> func);
 }

src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs

@@ -1,41 +1,47 @@
-using System;
-using JetBrains.Annotations;
+using System;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The IClientIPRequestBuilder interface.
+/// </summary>
+public interface IClientIPRequestBuilder : IUrlAndPathRequestBuilder
 {
     /// <summary>
-    /// The IClientIPRequestBuilder interface.
+    /// WithClientIP: add clientIP matching based on IStringMatchers.
     /// </summary>
-    public interface IClientIPRequestBuilder : IUrlAndPathRequestBuilder
-    {
-        /// <summary>
-        /// WithClientIP: add matching on ClientIP matchers.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP([NotNull] params IStringMatcher[] matchers);
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithClientIP(params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithClientIP: add matching on clientIPs.
-        /// </summary>
-        /// <param name="clientIPs">The clientIPs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP([NotNull] params string[] clientIPs);
+    /// <summary>
+    /// WithClientIP: add clientIP matching based on MatchOperator and IStringMatchers.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithClientIP(MatchOperator matchOperator, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithClientIP: add matching on clientIPs and matchBehaviour.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="clientIPs">The clientIPs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP(MatchBehaviour matchBehaviour, [NotNull] params string[] clientIPs);
+    /// <summary>
+    /// WithClientIP: add clientIP matching based on clientIPs.
+    /// </summary>
+    /// <param name="clientIPs">The clientIPs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithClientIP(params string[] clientIPs);
 
-        /// <summary>
-        /// WithClientIP: add matching on ClientIP funcs.
-        /// </summary>
-        /// <param name="funcs">The path funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP([NotNull] params Func<string, bool>[] funcs);
-    }
+    /// <summary>
+    /// WithClientIP: add clientIP matching based on clientIPs , matchBehaviour and MatchOperator.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="clientIPs">The clientIPs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] clientIPs);
+
+    /// <summary>
+    /// WithClientIP: add clientIP matching based on functions.
+    /// </summary>
+    /// <param name="funcs">The clientIP funcs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithClientIP(params Func<string, bool>[] funcs);
 }

src/WireMock.Net/RequestBuilders/IHeadersRequestBuilder.cs

@@ -1,85 +1,86 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The HeadersRequestBuilder interface.
+/// </summary>
+public interface IHeadersRequestBuilder : ICookiesRequestBuilder
 {
     /// <summary>
-    /// The HeadersRequestBuilder interface.
+    /// WithHeader: matching based on name, pattern and matchBehaviour.
     /// </summary>
-    public interface IHeadersRequestBuilder : ICookiesRequestBuilder
-    {
-        /// <summary>
-        /// WithHeader: matching based on name, pattern and matchBehaviour.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string pattern, MatchBehaviour matchBehaviour);
+    /// <param name="name">The name.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, string pattern, MatchBehaviour matchBehaviour);
 
-        /// <summary>
-        /// WithHeader: matching based on name, pattern, ignoreCase and matchBehaviour.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithHeader: matching based on name, pattern, ignoreCase and matchBehaviour.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithHeader: matching based on name, patterns and matchBehaviour.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, MatchBehaviour matchBehaviour);
+    /// <summary>
+    /// WithHeader: matching based on name, patterns and matchBehaviour.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, string[] patterns, MatchBehaviour matchBehaviour, MatchOperator matchOperator = MatchOperator.Or);
 
-        /// <summary>
-        /// WithHeader: matching based on name, patterns, ignoreCase and matchBehaviour.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithHeader: matching based on name, patterns, ignoreCase and matchBehaviour.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch, MatchOperator matchOperator = MatchOperator.Or);
 
-        /// <summary>
-        /// WithHeader: matching based on name and IStringMatcher[].
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithHeader: matching based on name and IStringMatcher[].
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithHeader: matching based on name, ignoreCase and IStringMatcher[].
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="ignoreCase">Ignore the case from the header-keys.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, bool ignoreCase, [NotNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithHeader: matching based on name, ignoreCase and IStringMatcher[].
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="ignoreCase">Ignore the case from the header-keys.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, bool ignoreCase, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithHeader: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="ignoreCase">Ignore the case from the header-keys.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, bool ignoreCase, MatchBehaviour matchBehaviour, [NotNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithHeader: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="ignoreCase">Ignore the case from the header-keys.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(string name, bool ignoreCase, MatchBehaviour matchBehaviour, MatchOperator matchOperator = MatchOperator.Or, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithHeader: matching based on functions.
-        /// </summary>
-        /// <param name="funcs">The headers funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs);
-    }
+    /// <summary>
+    /// WithHeader: matching based on functions.
+    /// </summary>
+    /// <param name="funcs">The headers funcs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs);
 }

src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs

@@ -1,111 +1,96 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The MethodRequestBuilder interface.
+/// </summary>
+public interface IMethodRequestBuilder : IHeadersRequestBuilder
 {
     /// <summary>
-    /// The MethodRequestBuilder interface.
+    /// UsingConnect: add HTTP Method matching on `CONNECT` and matchBehaviour (optional).
     /// </summary>
-    public interface IMethodRequestBuilder : IHeadersRequestBuilder
-    {
-        /// <summary>
-        /// UsingConnect: add HTTP Method matching on `CONNECT` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingConnect(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingConnect(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingDelete: add HTTP Method matching on `DELETE` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingDelete: add HTTP Method matching on `DELETE` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingGet: add HTTP Method matching on `GET` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingGet: add HTTP Method matching on `GET` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingHead: Add HTTP Method matching on `HEAD` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingHead: Add HTTP Method matching on `HEAD` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingPost: add HTTP Method matching on `POST` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingPost: add HTTP Method matching on `POST` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingPatch: add HTTP Method matching on `PATCH` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingPatch: add HTTP Method matching on `PATCH` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingPut: add HTTP Method matching on `OPTIONS` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingOptions(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `OPTIONS` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingOptions(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingPut: add HTTP Method matching on `PUT` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `PUT` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingTrace: add HTTP Method matching on `TRACE` and matchBehaviour (optional).
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingTrace(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// UsingTrace: add HTTP Method matching on `TRACE` and matchBehaviour (optional).
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingTrace(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// UsingAnyMethod: add HTTP Method matching on any method.
-        /// </summary>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingAnyMethod();
+    /// <summary>
+    /// UsingAnyMethod: add HTTP Method matching on any method.
+    /// </summary>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingAnyMethod();
 
-        /// <summary>
-        /// UsingAnyVerb: add HTTP Method matching on any method.
-        /// </summary>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        [Obsolete("Use the method UsingAnyMethod().")]
-        IRequestBuilder UsingAnyVerb();
+    /// <summary>
+    /// UsingMethod: add HTTP Method matching on any methods and matchBehaviour.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="methods">The method or methods.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params string[] methods);
 
-        /// <summary>
-        /// UsingMethod: add HTTP Method matching on any methods and matchBehaviour.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="methods">The method or methods.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, [NotNull] params string[] methods);
-
-        /// <summary>
-        /// UsingMethod: add HTTP Method matching on any methods.
-        /// </summary>
-        /// <param name="methods">The method or methods.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder UsingMethod([NotNull] params string[] methods);
-
-        /// <summary>
-        /// UsingVerb: add HTTP Method matching on any methods.
-        /// </summary>
-        /// <param name="verbs">The method or methods.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        [Obsolete("Use the method UsingMethod(...).")]
-        IRequestBuilder UsingVerb([NotNull] params string[] verbs);
-    }
+    /// <summary>
+    /// UsingMethod: add HTTP Method matching on any methods.
+    /// </summary>
+    /// <param name="methods">The method or methods.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder UsingMethod(params string[] methods);
 }

src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs

@@ -1,110 +1,108 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Types;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The ParamsRequestBuilder interface.
+/// </summary>
+public interface IParamsRequestBuilder : IBodyRequestBuilder
 {
     /// <summary>
-    /// The ParamsRequestBuilder interface.
+    /// WithParam: matching on key only.
     /// </summary>
-    public interface IParamsRequestBuilder : IBodyRequestBuilder
-    {
-        /// <summary>
-        /// WithParam: matching on key only.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="matchBehaviour">The match behaviour (optional).</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <param name="key">The key.</param>
+    /// <param name="matchBehaviour">The match behaviour (optional).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithParam: matching on key only.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="matchBehaviour">The match behaviour (optional).</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, bool ignoreCase, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    /// <summary>
+    /// WithParam: matching on key only.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="matchBehaviour">The match behaviour (optional).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, bool ignoreCase, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-        /// <summary>
-        /// WithParam: matching on key and values.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="values">The values.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params string[] values);
+    /// <summary>
+    /// WithParam: matching on key and values.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="values">The values.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, params string[] values);
 
-        /// <summary>
-        /// WithParam: matching on key and values.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="values">The values.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, bool ignoreCase, [CanBeNull] params string[] values);
+    /// <summary>
+    /// WithParam: matching on key and values.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="values">The values.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, bool ignoreCase, params string[] values);
 
-        /// <summary>
-        /// WithParam: matching on key and matchers.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithParam: matching on key and matchers.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithParam: matching on key and matchers.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, bool ignoreCase, [CanBeNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithParam: matching on key and matchers.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, bool ignoreCase, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithParam: matching on key, values and matchBehaviour.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="values">The values.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, [CanBeNull] params string[] values);
+    /// <summary>
+    /// WithParam: matching on key, values and matchBehaviour.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="values">The values.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params string[] values);
 
-        /// <summary>
-        /// WithParam: matching on key, values and matchBehaviour.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="values">The values.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, [CanBeNull] params string[] values);
+    /// <summary>
+    /// WithParam: matching on key, values and matchBehaviour.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="values">The values.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, params string[] values);
 
-        /// <summary>
-        /// WithParam: matching on key, matchers and matchBehaviour.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, [CanBeNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithParam: matching on key, matchers and matchBehaviour.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithParam: matching on key, matchers and matchBehaviour.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, [CanBeNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithParam: matching on key, matchers and matchBehaviour.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithParam: matching on functions.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs);
-    }
+    /// <summary>
+    /// WithParam: matching on functions.
+    /// </summary>
+    /// <param name="funcs">The funcs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs);
 }

src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs

@@ -1,70 +1,84 @@
-using System;
-using JetBrains.Annotations;
+using System;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IUrlAndPathRequestBuilder
+/// </summary>
+public interface IUrlAndPathRequestBuilder : IMethodRequestBuilder
 {
     /// <summary>
-    /// IUrlAndPathRequestBuilder
+    /// WithPath: add path matching based on IStringMatchers.
     /// </summary>
-    public interface IUrlAndPathRequestBuilder : IMethodRequestBuilder
-    {
-        /// <summary>
-        /// WithPath: add path matching based on IStringMatchers.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath([NotNull] params IStringMatcher[] matchers);
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithPath(params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithPath: add path matching based on paths.
-        /// </summary>
-        /// <param name="paths">The paths.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath([NotNull] params string[] paths);
+    /// <summary>
+    /// WithPath: add path matching based on MatchOperator and IStringMatchers.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithPath(MatchOperator matchOperator, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithPath: add path matching based on paths and matchBehaviour.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="paths">The paths.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath(MatchBehaviour matchBehaviour, [NotNull] params string[] paths);
+    /// <summary>
+    /// WithPath: add path matching based on paths.
+    /// </summary>
+    /// <param name="paths">The paths.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithPath(params string[] paths);
 
-        /// <summary>
-        /// WithPath: add path matching based on functions.
-        /// </summary>
-        /// <param name="funcs">The path funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath([NotNull] params Func<string, bool>[] funcs);
+    /// <summary>
+    /// WithPath: add path matching based on paths , matchBehaviour and MatchOperator.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="paths">The paths.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithPath(MatchOperator matchOperator, params string[] paths);
 
-        /// <summary>
-        /// WithUrl: add url matching based on IStringMatcher[].
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params IStringMatcher[] matchers);
+    /// <summary>
+    /// WithPath: add path matching based on functions.
+    /// </summary>
+    /// <param name="funcs">The path funcs.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithPath(params Func<string, bool>[] funcs);
 
-        /// <summary>
-        /// WithUrl: add url matching based on urls.
-        /// </summary>
-        /// <param name="urls">The urls.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params string[] urls);
+    /// <summary>
+    /// WithUrl: add url matching based on IStringMatcher[].
+    /// </summary>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithUrl(params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithUrl: add url matching based on urls.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="urls">The urls.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl(MatchBehaviour matchBehaviour, [NotNull] params string[] urls);
+    /// <summary>
+    /// WithUrl: add url matching based on MatchOperator and IStringMatchers.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="matchers">The matchers.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithUrl(MatchOperator matchOperator, params IStringMatcher[] matchers);
 
-        /// <summary>
-        /// WithUrl: add url matching based on functions.
-        /// </summary>
-        /// <param name="funcs">The url functions.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params Func<string, bool>[] funcs);
-    }
+    /// <summary>
+    /// WithUrl: add url matching based on urls.
+    /// </summary>
+    /// <param name="urls">The urls.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithUrl(params string[] urls);
+
+    /// <summary>
+    /// WithUrl: add url matching based on urls.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use.</param>
+    /// <param name="urls">The urls.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithUrl(MatchOperator matchOperator, params string[] urls);
+
+    /// <summary>
+    /// WithUrl: add url matching based on functions.
+    /// </summary>
+    /// <param name="funcs">The url functions.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithUrl(params Func<string, bool>[] funcs);
 }

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

@@ -0,0 +1,48 @@
+using System;
+using Stef.Validation;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
+    {
+        return WithClientIP(MatchOperator.Or, matchers);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Guard.NotNullOrEmpty(matchers);
+
+        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, matchers));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithClientIP(params string[] paths)
+    {
+        return WithClientIP(MatchOperator.Or, paths);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] paths)
+    {
+        Guard.NotNullOrEmpty(paths);
+
+        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, paths));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithClientIP(params Func<string, bool>[] funcs)
+    {
+        Guard.NotNullOrEmpty(funcs);
+
+        _requestMatchers.Add(new RequestMessageClientIPMatcher(funcs));
+        return this;
+    }
+}

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

@@ -1,4 +1,4 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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.Linq;
 using WireMock.Http;
@@ -6,110 +6,97 @@ using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using Stef.Validation;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+public partial class Request
 {
-    public partial class Request
+    /// <inheritdoc />
+    public IRequestBuilder UsingConnect(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingConnect(MatchBehaviour)"/>
-        public IRequestBuilder UsingConnect(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.CONNECT));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.DELETE));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.GET));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.HEAD));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingOptions(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.OPTIONS));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.POST));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.PATCH));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.PUT));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingTrace(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, MatchOperator.Or, HttpRequestMethods.TRACE));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder UsingAnyMethod()
+    {
+        var matchers = _requestMatchers.Where(m => m is RequestMessageMethodMatcher).ToList();
+        foreach (var matcher in matchers)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.CONNECT));
-            return this;
+            _requestMatchers.Remove(matcher);
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingDelete(MatchBehaviour)"/>
-        public IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.DELETE));
-            return this;
-        }
+        return this;
+    }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingGet(MatchBehaviour)"/>
-        public IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.GET));
-            return this;
-        }
+    /// <inheritdoc />
+    public IRequestBuilder UsingMethod(params string[] methods)
+    {
+        return UsingMethod(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, methods);
+    }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingHead(MatchBehaviour)"/>
-        public IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.HEAD));
-            return this;
-        }
+    /// <inheritdoc />
+    public IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, MatchOperator matchOperator, params string[] methods)
+    {
+        Guard.NotNullOrEmpty(methods);
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingOptions(MatchBehaviour)"/>
-        public IRequestBuilder UsingOptions(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.OPTIONS));
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPost(MatchBehaviour)"/>
-        public IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.POST));
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPatch(MatchBehaviour)"/>
-        public IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.PATCH));
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPut(MatchBehaviour)"/>
-        public IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.PUT));
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingTrace(MatchBehaviour)"/>
-        public IRequestBuilder UsingTrace(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, HttpRequestMethods.TRACE));
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyMethod"/>
-        public IRequestBuilder UsingAnyMethod()
-        {
-            var matchers = _requestMatchers.Where(m => m is RequestMessageMethodMatcher).ToList();
-            foreach (var matcher in matchers)
-            {
-                _requestMatchers.Remove(matcher);
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyVerb"/>
-        public IRequestBuilder UsingAnyVerb()
-        {
-            return UsingAnyMethod();
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(string[])"/>
-        public IRequestBuilder UsingMethod(params string[] methods)
-        {
-            return UsingMethod(MatchBehaviour.AcceptOnMatch, methods);
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb(string[])"/>
-        public IRequestBuilder UsingVerb(params string[] verbs)
-        {
-            return UsingMethod(verbs);
-        }
-
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(MatchBehaviour, string[])"/>
-        public IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, params string[] methods)
-        {
-            Guard.NotNullOrEmpty(methods, nameof(methods));
-
-            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, methods));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, matchOperator, methods));
+        return this;
     }
 }

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

@@ -1,4 +1,4 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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 WireMock.Matchers;
@@ -6,80 +6,79 @@ using WireMock.Matchers.Request;
 using WireMock.Util;
 using Stef.Validation;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+public partial class Request
 {
-    public partial class Request
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
+    public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
-        public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
-        public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
-        public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher[])"/>
-        public IRequestBuilder WithBody(IMatcher matcher)
-        {
-            return WithBody(new[] { matcher });
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher[])"/>
-        public IRequestBuilder WithBody(IMatcher[] matchers)
-        {
-            Guard.NotNull(matchers, nameof(matchers));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchers));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{string, bool})"/>
-        public IRequestBuilder WithBody(Func<string, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{byte[], bool})"/>
-        public IRequestBuilder WithBody(Func<byte[], bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{object, bool})"/>
-        public IRequestBuilder WithBody(Func<object, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{IBodyData, bool})"/>
-        public IRequestBuilder WithBody(Func<IBodyData, bool> func)
-        {
-            Guard.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+        return this;
     }
-}
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
+    public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+        return this;
+    }
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
+    public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(IMatcher matcher)
+    {
+        return WithBody(new[] { matcher });
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(IMatcher[] matchers, MatchOperator matchOperator = MatchOperator.Or)
+    {
+        Guard.NotNull(matchers);
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchOperator, matchers));
+        return this;
+    }
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{string, bool})"/>
+    public IRequestBuilder WithBody(Func<string, bool> func)
+    {
+        Guard.NotNull(func, nameof(func));
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+        return this;
+    }
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{byte[], bool})"/>
+    public IRequestBuilder WithBody(Func<byte[], bool> func)
+    {
+        Guard.NotNull(func, nameof(func));
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+        return this;
+    }
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{object, bool})"/>
+    public IRequestBuilder WithBody(Func<object, bool> func)
+    {
+        Guard.NotNull(func, nameof(func));
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+        return this;
+    }
+
+    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{IBodyData, bool})"/>
+    public IRequestBuilder WithBody(Func<IBodyData, bool> func)
+    {
+        Guard.NotNull(func, nameof(func));
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+        return this;
+    }
+}

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

@@ -1,4 +1,4 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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;
@@ -6,79 +6,78 @@ using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using Stef.Validation;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+public partial class Request
 {
-    public partial class Request
+    /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string, MatchBehaviour)"/>
+    public IRequestBuilder WithHeader(string name, string pattern, MatchBehaviour matchBehaviour)
     {
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string, MatchBehaviour)"/>
-        public IRequestBuilder WithHeader(string name, string pattern, MatchBehaviour matchBehaviour)
-        {
-            return WithHeader(name, pattern, true, matchBehaviour);
-        }
+        return WithHeader(name, pattern, true, matchBehaviour);
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string, bool, MatchBehaviour)"/>
-        public IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(pattern, nameof(pattern));
+    /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string, bool, MatchBehaviour)"/>
+    public IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(name);
+        Guard.NotNull(pattern);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, pattern, ignoreCase));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, pattern, ignoreCase));
+        return this;
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string[], MatchBehaviour)"/>
-        public IRequestBuilder WithHeader(string name, string[] patterns, MatchBehaviour matchBehaviour)
-        {
-            return WithHeader(name, patterns, true, matchBehaviour);
-        }
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(string name, string[] patterns, MatchBehaviour matchBehaviour, MatchOperator matchOperator = MatchOperator.Or)
+    {
+        return WithHeader(name, patterns, true, matchBehaviour, matchOperator);
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, string[], bool, MatchBehaviour)"/>
-        public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(patterns, nameof(patterns));
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch, MatchOperator matchOperator = MatchOperator.Or)
+    {
+        Guard.NotNull(name);
+        Guard.NotNull(patterns);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, ignoreCase, patterns));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, matchOperator, name, ignoreCase, patterns));
+        return this;
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, IStringMatcher[])"/>
-        public IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name);
+        Guard.NotNullOrEmpty(matchers);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, name, false, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, name, false, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, bool, IStringMatcher[])"/>
-        public IRequestBuilder WithHeader(string name, bool ignoreCase, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(string name, bool ignoreCase, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name);
+        Guard.NotNullOrEmpty(matchers);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, name, ignoreCase, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, name, ignoreCase, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(string, IStringMatcher[])"/>
-        public IRequestBuilder WithHeader(string name, bool ignoreCase, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(string name, bool ignoreCase, MatchBehaviour matchBehaviour, MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name);
+        Guard.NotNullOrEmpty(matchers);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, ignoreCase, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, matchOperator, name, ignoreCase, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="IHeadersRequestBuilder.WithHeader(Func{IDictionary{string, string[]}, bool}[])"/>
-        public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
+    /// <inheritdoc />
+    public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
+    {
+        Guard.NotNullOrEmpty(funcs);
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(funcs));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageHeaderMatcher(funcs));
+        return this;
     }
 }

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

@@ -1,4 +1,4 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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;
@@ -59,7 +59,7 @@ namespace WireMock.RequestBuilders
         /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, string[])"/>
         public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, params string[] values)
         {
-            Guard.NotNull(key, nameof(key));
+            Guard.NotNull(key);
 
             _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, values));
             return this;
@@ -74,7 +74,7 @@ namespace WireMock.RequestBuilders
         /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, IStringMatcher[])"/>
         public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase, params IStringMatcher[] matchers)
         {
-            Guard.NotNull(key, nameof(key));
+            Guard.NotNull(key);
 
             _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, matchers));
             return this;

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

@@ -0,0 +1,48 @@
+using System;
+using Stef.Validation;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithPath(params IStringMatcher[] matchers)
+    {
+        return WithPath(MatchOperator.Or, matchers);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithPath(MatchOperator matchOperator, params IStringMatcher[] matchers)
+    {
+        Guard.NotNullOrEmpty(matchers);
+
+        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, matchers));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithPath(params string[] paths)
+    {
+        return WithPath(MatchOperator.Or, paths);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithPath(MatchOperator matchOperator, params string[] paths)
+    {
+        Guard.NotNullOrEmpty(paths);
+
+        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, paths));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithPath(params Func<string, bool>[] funcs)
+    {
+        Guard.NotNullOrEmpty(funcs);
+
+        _requestMatchers.Add(new RequestMessagePathMatcher(funcs));
+        return this;
+    }
+}

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

@@ -0,0 +1,49 @@
+using System;
+using Stef.Validation;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders
+{
+    public partial class Request
+    {
+        /// <inheritdoc />
+        public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
+        {
+            return WithUrl(MatchOperator.Or, matchers);
+        }
+
+        /// <inheritdoc />
+        public IRequestBuilder WithUrl(MatchOperator matchOperator, params IStringMatcher[] matchers)
+        {
+            Guard.NotNullOrEmpty(matchers);
+
+            _requestMatchers.Add(new RequestMessageUrlMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, matchers));
+            return this;
+        }
+
+        /// <inheritdoc />
+        public IRequestBuilder WithUrl(params string[] urls)
+        {
+            return WithUrl(MatchOperator.Or, urls);
+        }
+
+        /// <inheritdoc />
+        public IRequestBuilder WithUrl(MatchOperator matchOperator, params string[] urls)
+        {
+            Guard.NotNullOrEmpty(urls);
+
+            _requestMatchers.Add(new RequestMessageUrlMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, urls));
+            return this;
+        }
+
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(Func{string, bool}[])"/>
+        public IRequestBuilder WithUrl(params Func<string, bool>[] funcs)
+        {
+            Guard.NotNullOrEmpty(funcs);
+
+            _requestMatchers.Add(new RequestMessageUrlMatcher(funcs));
+            return this;
+        }
+    }
+}

src/WireMock.Net/RequestBuilders/Request.cs

@@ -1,167 +1,67 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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.Collections.ObjectModel;
 using System.Linq;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
 using Stef.Validation;
+using WireMock.Matchers.Request;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The Request Builder
+/// </summary>
+public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
+    private readonly IList<IRequestMatcher> _requestMatchers;
+
     /// <summary>
-    /// The requests.
+    /// Creates this instance.
     /// </summary>
-    public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder Create()
     {
-        private readonly IList<IRequestMatcher> _requestMatchers;
-
-        /// <summary>
-        /// Creates this instance.
-        /// </summary>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public static IRequestBuilder Create()
-        {
-            return new Request(new List<IRequestMatcher>());
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Request"/> class.
-        /// </summary>
-        /// <param name="requestMatchers">The request matchers.</param>
-        private Request(IList<IRequestMatcher> requestMatchers) : base(requestMatchers)
-        {
-            _requestMatchers = requestMatchers;
-        }
-
-        /// <summary>
-        /// Gets the request message matchers.
-        /// </summary>
-        /// <typeparam name="T">Type of IRequestMatcher</typeparam>
-        /// <returns>A List{T}</returns>
-        public IList<T> GetRequestMessageMatchers<T>() where T : IRequestMatcher
-        {
-            return new ReadOnlyCollection<T>(_requestMatchers.OfType<T>().ToList());
-        }
-
-        /// <summary>
-        /// Gets the request message matcher.
-        /// </summary>
-        /// <typeparam name="T">Type of IRequestMatcher</typeparam>
-        /// <returns>A RequestMatcher</returns>
-        public T GetRequestMessageMatcher<T>() where T : IRequestMatcher
-        {
-            return _requestMatchers.OfType<T>().FirstOrDefault();
-        }
-
-        /// <summary>
-        /// Gets the request message matcher.
-        /// </summary>
-        /// <typeparam name="T">Type of IRequestMatcher</typeparam>
-        /// <returns>A RequestMatcher</returns>
-        public T GetRequestMessageMatcher<T>(Func<T, bool> func) where T : IRequestMatcher
-        {
-            return _requestMatchers.OfType<T>().FirstOrDefault(func);
-        }
-
-        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(IStringMatcher[])"/>
-        public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
-        {
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
-
-            _requestMatchers.Add(new RequestMessageClientIPMatcher(matchers));
-            return this;
-        }
-
-        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(string[])"/>
-        public IRequestBuilder WithClientIP(params string[] clientIPs)
-        {
-            return WithClientIP(MatchBehaviour.AcceptOnMatch, clientIPs);
-        }
-
-        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(string[])"/>
-        public IRequestBuilder WithClientIP(MatchBehaviour matchBehaviour, params string[] clientIPs)
-        {
-            Guard.NotNullOrEmpty(clientIPs, nameof(clientIPs));
-
-            _requestMatchers.Add(new RequestMessageClientIPMatcher(matchBehaviour, clientIPs));
-            return this;
-        }
-
-        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(Func{string, bool}[])"/>
-        public IRequestBuilder WithClientIP(params Func<string, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
-
-            _requestMatchers.Add(new RequestMessageClientIPMatcher(funcs));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(IStringMatcher[])"/>
-        public IRequestBuilder WithPath(params IStringMatcher[] matchers)
-        {
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
-
-            _requestMatchers.Add(new RequestMessagePathMatcher(matchers));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(string[])"/>
-        public IRequestBuilder WithPath(params string[] paths)
-        {
-            return WithPath(MatchBehaviour.AcceptOnMatch, paths);
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(MatchBehaviour, string[])"/>
-        public IRequestBuilder WithPath(MatchBehaviour matchBehaviour, params string[] paths)
-        {
-            Guard.NotNullOrEmpty(paths, nameof(paths));
-
-            _requestMatchers.Add(new RequestMessagePathMatcher(matchBehaviour, paths));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(Func{string, bool}[])"/>
-        public IRequestBuilder WithPath(params Func<string, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
-
-            _requestMatchers.Add(new RequestMessagePathMatcher(funcs));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(IStringMatcher[])"/>
-        public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
-        {
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
-
-            _requestMatchers.Add(new RequestMessageUrlMatcher(matchers));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(string[])"/>
-        public IRequestBuilder WithUrl(params string[] urls)
-        {
-            return WithUrl(MatchBehaviour.AcceptOnMatch, urls);
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(MatchBehaviour, string[])"/>
-        public IRequestBuilder WithUrl(MatchBehaviour matchBehaviour, params string[] urls)
-        {
-            Guard.NotNullOrEmpty(urls, nameof(urls));
-
-            _requestMatchers.Add(new RequestMessageUrlMatcher(matchBehaviour, urls));
-            return this;
-        }
-
-        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(Func{string, bool}[])"/>
-        public IRequestBuilder WithUrl(params Func<string, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
-
-            _requestMatchers.Add(new RequestMessageUrlMatcher(funcs));
-            return this;
-        }
+        return new Request(new List<IRequestMatcher>());
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Request"/> class.
+    /// </summary>
+    /// <param name="requestMatchers">The request matchers.</param>
+    private Request(IList<IRequestMatcher> requestMatchers) : base(requestMatchers)
+    {
+        _requestMatchers = Guard.NotNull(requestMatchers);
+    }
+
+    /// <summary>
+    /// Gets the request message matchers.
+    /// </summary>
+    /// <typeparam name="T">Type of IRequestMatcher</typeparam>
+    /// <returns>A List{T}</returns>
+    public IList<T> GetRequestMessageMatchers<T>() where T : IRequestMatcher
+    {
+        return new ReadOnlyCollection<T>(_requestMatchers.OfType<T>().ToList());
+    }
+
+    /// <summary>
+    /// Gets the request message matcher.
+    /// </summary>
+    /// <typeparam name="T">Type of IRequestMatcher</typeparam>
+    /// <returns>A RequestMatcher</returns>
+    public T? GetRequestMessageMatcher<T>() where T : IRequestMatcher
+    {
+        return _requestMatchers.OfType<T>().FirstOrDefault();
+    }
+
+    /// <summary>
+    /// Gets the request message matcher.
+    /// </summary>
+    /// <typeparam name="T">Type of IRequestMatcher</typeparam>
+    /// <returns>A RequestMatcher</returns>
+    public T? GetRequestMessageMatcher<T>(Func<T, bool> func) where T : IRequestMatcher
+    {
+        return _requestMatchers.OfType<T>().FirstOrDefault(func);
+    }
+  
 }

src/WireMock.Net/RequestMessage.cs

@@ -1,4 +1,4 @@
-// This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
+// 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 JetBrains.Annotations;
 using System;
@@ -48,19 +48,19 @@ namespace WireMock
         public string Method { get; }
 
         /// <inheritdoc cref="IRequestMessage.Headers" />
-        public IDictionary<string, WireMockList<string>> Headers { get; }
+        public IDictionary<string, WireMockList<string>>? Headers { get; }
 
         /// <inheritdoc cref="IRequestMessage.Cookies" />
-        public IDictionary<string, string> Cookies { get; }
+        public IDictionary<string, string>? Cookies { get; }
 
         /// <inheritdoc cref="IRequestMessage.Query" />
-        public IDictionary<string, WireMockList<string>> Query { get; }
+        public IDictionary<string, WireMockList<string>>? Query { get; }
 
         /// <inheritdoc cref="IRequestMessage.RawQuery" />
         public string RawQuery { get; }
 
         /// <inheritdoc cref="IRequestMessage.BodyData" />
-        public IBodyData BodyData { get; }
+        public IBodyData? BodyData { get; }
 
         /// <inheritdoc cref="IRequestMessage.Body" />
         public string Body { get; }
@@ -101,7 +101,7 @@ namespace WireMock
         /// <param name="bodyData">The BodyData.</param>
         /// <param name="headers">The headers.</param>
         /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] UrlDetails urlDetails, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] IBodyData bodyData = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        public RequestMessage(UrlDetails urlDetails, string method, string clientIP, IBodyData? bodyData = null, IDictionary<string, string[]>? headers = null, IDictionary<string, string>? cookies = null)
         {
             Guard.NotNull(urlDetails, nameof(urlDetails));
             Guard.NotNull(method, nameof(method));
@@ -144,7 +144,7 @@ namespace WireMock
         /// <param name="key">The key.</param>
         /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
         /// <returns>The query parameter.</returns>
-        public WireMockList<string> GetParameter(string key, bool ignoreCase = false)
+        public WireMockList<string>? GetParameter(string? key, bool ignoreCase = false)
         {
             if (Query == null)
             {

src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs

@@ -1,41 +1,40 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using System.Collections.Generic;
 using WireMock.Types;
 
-namespace WireMock.ResponseBuilders
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// The HeadersResponseBuilder interface.
+/// </summary>
+public interface IHeadersResponseBuilder : IBodyResponseBuilder
 {
     /// <summary>
-    /// The HeadersResponseBuilder interface.
+    /// The with header.
     /// </summary>
-    public interface IHeadersResponseBuilder : IBodyResponseBuilder
-    {
-        /// <summary>
-        /// The with header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="values">The values.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeader([NotNull] string name, params string[] values);
+    /// <param name="name">The name.</param>
+    /// <param name="values">The values.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithHeader(string name, params string[] values);
 
-        /// <summary>
-        /// The with headers.
-        /// </summary>
-        /// <param name="headers">The headers.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string> headers);
+    /// <summary>
+    /// The with headers.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithHeaders(IDictionary<string, string> headers);
 
-        /// <summary>
-        /// The with headers.
-        /// </summary>
-        /// <param name="headers">The headers.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeaders([NotNull] IDictionary<string, string[]> headers);
+    /// <summary>
+    /// The with headers.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithHeaders(IDictionary<string, string[]> headers);
 
-        /// <summary>
-        /// The with headers.
-        /// </summary>
-        /// <param name="headers">The headers.</param>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithHeaders([NotNull] IDictionary<string, WireMockList<string>> headers);
-    }
+    /// <summary>
+    /// The with headers.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers);
 }

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

@@ -3,40 +3,39 @@ using WireMock.Http;
 using WireMock.Settings;
 using Stef.Validation;
 
-namespace WireMock.ResponseBuilders
+namespace WireMock.ResponseBuilders;
+
+public partial class Response
 {
-    public partial class Response
+    private HttpClient _httpClientForProxy;
+
+    /// <summary>
+    /// The WebProxy settings.
+    /// </summary>
+    public ProxyAndRecordSettings? ProxyAndRecordSettings { get; private set; }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithProxy(string proxyUrl, string? clientX509Certificate2ThumbprintOrSubjectName = null)
     {
-        private HttpClient _httpClientForProxy;
+        Guard.NotNullOrEmpty(proxyUrl);
 
-        /// <summary>
-        /// The WebProxy settings.
-        /// </summary>
-        public ProxyAndRecordSettings ProxyAndRecordSettings { get; private set; }
-
-        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(string, string)"/>
-        public IResponseBuilder WithProxy(string proxyUrl, string clientX509Certificate2ThumbprintOrSubjectName = null)
+        var settings = new ProxyAndRecordSettings
         {
-            Guard.NotNullOrEmpty(proxyUrl, nameof(proxyUrl));
+            Url = proxyUrl,
+            ClientX509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName
+        };
 
-            var settings = new ProxyAndRecordSettings
-            {
-                Url = proxyUrl,
-                ClientX509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName
-            };
+        return WithProxy(settings);
+    }
 
-            return WithProxy(settings);
-        }
+    /// <inheritdoc />
+    public IResponseBuilder WithProxy(ProxyAndRecordSettings settings)
+    {
+        Guard.NotNull(settings);
 
-        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(ProxyAndRecordSettings)"/>
-        public IResponseBuilder WithProxy(ProxyAndRecordSettings settings)
-        {
-            Guard.NotNull(settings, nameof(settings));
+        ProxyAndRecordSettings = settings;
 
-            ProxyAndRecordSettings = settings;
-
-            _httpClientForProxy = HttpClientBuilder.Build(settings);
-            return this;
-        }
+        _httpClientForProxy = HttpClientBuilder.Build(settings);
+        return this;
     }
 }

src/WireMock.Net/ResponseMessage.cs

@@ -15,7 +15,7 @@ namespace WireMock
     public class ResponseMessage : IResponseMessage
     {
         /// <inheritdoc cref="IResponseMessage.Headers" />
-        public IDictionary<string, WireMockList<string>> Headers { get; set; } = new Dictionary<string, WireMockList<string>>();
+        public IDictionary<string, WireMockList<string>>? Headers { get; set; } = new Dictionary<string, WireMockList<string>>();
 
         /// <inheritdoc cref="IResponseMessage.StatusCode" />
         public object StatusCode { get; set; }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -4,234 +4,254 @@ using System.Linq;
 using System.Threading;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
+using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
 
-namespace WireMock.Serialization
-{
-    internal class MappingConverter
-    {
-        private readonly MatcherMapper _mapper;
+namespace WireMock.Serialization;
 
-        public MappingConverter(MatcherMapper mapper)
+internal class MappingConverter
+{
+    private readonly MatcherMapper _mapper;
+
+    public MappingConverter(MatcherMapper mapper)
+    {
+        _mapper = Guard.NotNull(mapper, nameof(mapper));
+    }
+
+    public MappingModel ToMappingModel(IMapping mapping)
+    {
+        var request = (Request)mapping.RequestMatcher;
+        var response = (Response)mapping.Provider;
+
+        var clientIPMatcher = request.GetRequestMessageMatcher<RequestMessageClientIPMatcher>();
+        var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
+        var urlMatcher = request.GetRequestMessageMatcher<RequestMessageUrlMatcher>();
+        var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>();
+        var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>();
+        var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
+        var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
+        var bodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
+
+        var mappingModel = new MappingModel
         {
-            _mapper = Guard.NotNull(mapper, nameof(mapper));
+            Guid = mapping.Guid,
+            TimeSettings = TimeSettingsMapper.Map(mapping.TimeSettings),
+            Title = mapping.Title,
+            Description = mapping.Description,
+            Priority = mapping.Priority != 0 ? mapping.Priority : null,
+            Scenario = mapping.Scenario,
+            WhenStateIs = mapping.ExecutionConditionState,
+            SetStateTo = mapping.NextState,
+            Request = new RequestModel
+            {
+                Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
+                {
+                    Name = hm.Name,
+                    Matchers = _mapper.Map(hm.Matchers)
+                }).ToList() : null,
+
+                Cookies = cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
+                {
+                    Name = cm.Name,
+                    Matchers = _mapper.Map(cm.Matchers)
+                }).ToList() : null,
+
+                Params = paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
+                {
+                    Name = pm.Key,
+                    IgnoreCase = pm.IgnoreCase == true ? true : null,
+                    Matchers = _mapper.Map(pm.Matchers)
+                }).ToList() : null
+            },
+            Response = new ResponseModel()
+        };
+
+        if (methodMatcher is { Methods: { } })
+        {
+            mappingModel.Request.Methods = methodMatcher.Methods;
+            mappingModel.Request.MethodsRejectOnMatch = methodMatcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : null;
+            mappingModel.Request.MethodsMatchOperator = methodMatcher.Methods.Length > 1 ? methodMatcher.MatchOperator.ToString() : null;
         }
 
-        public MappingModel ToMappingModel(IMapping mapping)
+        if (clientIPMatcher is { Matchers: { } })
         {
-            var request = (Request)mapping.RequestMatcher;
-            var response = (Response)mapping.Provider;
-
-            var clientIPMatchers = request.GetRequestMessageMatchers<RequestMessageClientIPMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
-            var pathMatchers = request.GetRequestMessageMatchers<RequestMessagePathMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
-            var urlMatchers = request.GetRequestMessageMatchers<RequestMessageUrlMatcher>().Where(m => m.Matchers != null).SelectMany(m => m.Matchers).ToList();
-            var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>();
-            var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>();
-            var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
-            var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
-            var bodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
-
-            var mappingModel = new MappingModel
+            var clientIPMatchers = _mapper.Map(clientIPMatcher.Matchers);
+            mappingModel.Request.Path = new ClientIPModel
             {
-                Guid = mapping.Guid,
-                TimeSettings = TimeSettingsMapper.Map(mapping.TimeSettings),
-                Title = mapping.Title,
-                Description = mapping.Description,
-                Priority = mapping.Priority != 0 ? mapping.Priority : (int?)null,
-                Scenario = mapping.Scenario,
-                WhenStateIs = mapping.ExecutionConditionState,
-                SetStateTo = mapping.NextState,
-                Request = new RequestModel
-                {
-                    ClientIP = clientIPMatchers.Any() ? new ClientIPModel
-                    {
-                        Matchers = _mapper.Map(clientIPMatchers)
-                    } : null,
-
-                    Path = pathMatchers.Any() ? new PathModel
-                    {
-                        Matchers = _mapper.Map(pathMatchers)
-                    } : null,
-
-                    Url = urlMatchers.Any() ? new UrlModel
-                    {
-                        Matchers = _mapper.Map(urlMatchers)
-                    } : null,
-
-                    Methods = methodMatcher?.Methods,
-
-                    Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
-                    {
-                        Name = hm.Name,
-                        Matchers = _mapper.Map(hm.Matchers)
-                    }).ToList() : null,
-
-                    Cookies = cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
-                    {
-                        Name = cm.Name,
-                        Matchers = _mapper.Map(cm.Matchers)
-                    }).ToList() : null,
-
-                    Params = paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
-                    {
-                        Name = pm.Key,
-                        IgnoreCase = pm.IgnoreCase == true ? true : (bool?)null,
-                        Matchers = _mapper.Map(pm.Matchers)
-                    }).ToList() : null
-                },
-                Response = new ResponseModel()
+                Matchers = clientIPMatchers,
+                MatchOperator = clientIPMatchers?.Length > 1 ? clientIPMatcher.MatchOperator.ToString() : null
             };
+        }
 
-            if (response.MinimumDelayMilliseconds >= 0 || response.MaximumDelayMilliseconds > 0)
+        if (pathMatcher is { Matchers: { } })
+        {
+            var pathMatchers = _mapper.Map(pathMatcher.Matchers);
+            mappingModel.Request.Path = new PathModel
             {
-                mappingModel.Response.MinimumRandomDelay = response.MinimumDelayMilliseconds;
-                mappingModel.Response.MaximumRandomDelay = response.MaximumDelayMilliseconds;
+                Matchers = pathMatchers,
+                MatchOperator = pathMatchers?.Length > 1 ? pathMatcher.MatchOperator.ToString() : null
+            };
+        }
+        else if (urlMatcher is { Matchers: { } })
+        {
+            var urlMatchers = _mapper.Map(urlMatcher.Matchers);
+            mappingModel.Request.Url = new UrlModel
+            {
+                Matchers = urlMatchers,
+                MatchOperator = urlMatchers?.Length > 1 ? urlMatcher.MatchOperator.ToString() : null
+            };
+        }
+
+        if (response.MinimumDelayMilliseconds >= 0 || response.MaximumDelayMilliseconds > 0)
+        {
+            mappingModel.Response.MinimumRandomDelay = response.MinimumDelayMilliseconds;
+            mappingModel.Response.MaximumRandomDelay = response.MaximumDelayMilliseconds;
+        }
+        else
+        {
+            mappingModel.Response.Delay = (int?)(response.Delay == Timeout.InfiniteTimeSpan ? TimeSpan.MaxValue.TotalMilliseconds : response.Delay?.TotalMilliseconds);
+        }
+
+        if (mapping.Webhooks?.Length == 1)
+        {
+            mappingModel.Webhook = WebhookMapper.Map(mapping.Webhooks[0]);
+        }
+        else if (mapping.Webhooks?.Length > 1)
+        {
+            mappingModel.Webhooks = mapping.Webhooks.Select(WebhookMapper.Map).ToArray();
+        }
+
+        if (bodyMatcher?.Matchers != null)
+        {
+            mappingModel.Request.Body = new BodyModel();
+
+            if (bodyMatcher.Matchers.Length == 1)
+            {
+                mappingModel.Request.Body.Matcher = _mapper.Map(bodyMatcher.Matchers[0]);
             }
-            else
+            else if (bodyMatcher.Matchers.Length > 1)
             {
-                mappingModel.Response.Delay = (int?)(response.Delay == Timeout.InfiniteTimeSpan ? TimeSpan.MaxValue.TotalMilliseconds : response.Delay?.TotalMilliseconds);
+                mappingModel.Request.Body.Matchers = _mapper.Map(bodyMatcher.Matchers);
+                mappingModel.Request.Body.MatchOperator = bodyMatcher.MatchOperator.ToString();
+            }
+        }
+
+        if (response.ProxyAndRecordSettings != null)
+        {
+            mappingModel.Response.StatusCode = null;
+            mappingModel.Response.Headers = null;
+            mappingModel.Response.BodyDestination = null;
+            mappingModel.Response.BodyAsJson = null;
+            mappingModel.Response.BodyAsJsonIndented = null;
+            mappingModel.Response.Body = null;
+            mappingModel.Response.BodyAsBytes = null;
+            mappingModel.Response.BodyAsFile = null;
+            mappingModel.Response.BodyAsFileIsCached = null;
+            mappingModel.Response.UseTransformer = null;
+            mappingModel.Response.TransformerType = null;
+            mappingModel.Response.UseTransformerForBodyAsFile = null;
+            mappingModel.Response.TransformerReplaceNodeOptions = null;
+            mappingModel.Response.BodyEncoding = null;
+            mappingModel.Response.ProxyUrl = response.ProxyAndRecordSettings.Url;
+            mappingModel.Response.Fault = null;
+            mappingModel.Response.WebProxy = MapWebProxy(response.ProxyAndRecordSettings.WebProxySettings);
+        }
+        else
+        {
+            mappingModel.Response.WebProxy = null;
+            mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
+            mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
+
+            if (response.ResponseMessage.Headers != null && response.ResponseMessage.Headers.Count > 0)
+            {
+                mappingModel.Response.Headers = MapHeaders(response.ResponseMessage.Headers);
             }
 
-            if (mapping.Webhooks?.Length == 1)
+            if (response.UseTransformer)
             {
-                mappingModel.Webhook = WebhookMapper.Map(mapping.Webhooks[0]);
-            }
-            else if (mapping.Webhooks?.Length > 1)
-            {
-                mappingModel.Webhooks = mapping.Webhooks.Select(WebhookMapper.Map).ToArray();
+                mappingModel.Response.UseTransformer = response.UseTransformer;
+                mappingModel.Response.TransformerType = response.TransformerType.ToString();
+                mappingModel.Response.TransformerReplaceNodeOptions = response.TransformerReplaceNodeOptions.ToString();
             }
 
-            if (bodyMatcher?.Matchers != null)
+            if (response.UseTransformerForBodyAsFile)
             {
-                mappingModel.Request.Body = new BodyModel();
-
-                if (bodyMatcher.Matchers.Length == 1)
-                {
-                    mappingModel.Request.Body.Matcher = _mapper.Map(bodyMatcher.Matchers[0]);
-                }
-                else if (bodyMatcher.Matchers.Length > 1)
-                {
-                    mappingModel.Request.Body.Matchers = _mapper.Map(bodyMatcher.Matchers);
-                }
+                mappingModel.Response.UseTransformerForBodyAsFile = response.UseTransformerForBodyAsFile;
             }
 
-            if (response.ProxyAndRecordSettings != null)
+            if (response.ResponseMessage.BodyData != null)
             {
-                mappingModel.Response.StatusCode = null;
-                mappingModel.Response.Headers = null;
-                mappingModel.Response.BodyDestination = null;
-                mappingModel.Response.BodyAsJson = null;
-                mappingModel.Response.BodyAsJsonIndented = null;
-                mappingModel.Response.Body = null;
-                mappingModel.Response.BodyAsBytes = null;
-                mappingModel.Response.BodyAsFile = null;
-                mappingModel.Response.BodyAsFileIsCached = null;
-                mappingModel.Response.UseTransformer = null;
-                mappingModel.Response.TransformerType = null;
-                mappingModel.Response.UseTransformerForBodyAsFile = null;
-                mappingModel.Response.TransformerReplaceNodeOptions = null;
-                mappingModel.Response.BodyEncoding = null;
-                mappingModel.Response.ProxyUrl = response.ProxyAndRecordSettings.Url;
-                mappingModel.Response.Fault = null;
-                mappingModel.Response.WebProxy = MapWebProxy(response.ProxyAndRecordSettings.WebProxySettings);
-            }
-            else
-            {
-                mappingModel.Response.WebProxy = null;
-                mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
-                mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
-
-                if (response.ResponseMessage.Headers != null && response.ResponseMessage.Headers.Count > 0)
+                switch (response.ResponseMessage.BodyData?.DetectedBodyType)
                 {
-                    mappingModel.Response.Headers = MapHeaders(response.ResponseMessage.Headers);
-                }
+                    case BodyType.String:
+                        mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
+                        break;
 
-                if (response.UseTransformer)
-                {
-                    mappingModel.Response.UseTransformer = response.UseTransformer;
-                    mappingModel.Response.TransformerType = response.TransformerType.ToString();
-                    mappingModel.Response.TransformerReplaceNodeOptions = response.TransformerReplaceNodeOptions.ToString();
-                }
-
-                if (response.UseTransformerForBodyAsFile)
-                {
-                    mappingModel.Response.UseTransformerForBodyAsFile = response.UseTransformerForBodyAsFile;
-                }
-
-                if (response.ResponseMessage.BodyData != null)
-                {
-                    switch (response.ResponseMessage.BodyData?.DetectedBodyType)
-                    {
-                        case BodyType.String:
-                            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
+                    case BodyType.Json:
+                        mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
+                        if (response.ResponseMessage.BodyData.BodyAsJsonIndented == true)
                         {
-                            EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
-                            CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
-                            WebName = response.ResponseMessage.BodyData.Encoding.WebName
-                        };
-                    }
+                            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.FaultType != FaultType.NONE)
+                if (response.ResponseMessage.BodyData.Encoding != null && response.ResponseMessage.BodyData.Encoding.WebName != "utf-8")
                 {
-                    mappingModel.Response.Fault = new FaultModel
+                    mappingModel.Response.BodyEncoding = new EncodingModel
                     {
-                        Type = response.ResponseMessage.FaultType.ToString(),
-                        Percentage = response.ResponseMessage.FaultPercentage
+                        EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
+                        CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
+                        WebName = response.ResponseMessage.BodyData.Encoding.WebName
                     };
                 }
             }
 
-            return mappingModel;
-        }
-
-        private static WebProxyModel MapWebProxy(WebProxySettings settings)
-        {
-            return settings != null ? new WebProxyModel
+            if (response.ResponseMessage.FaultType != FaultType.NONE)
             {
-                Address = settings.Address,
-                UserName = settings.UserName,
-                Password = settings.Password
-            } : null;
-        }
-
-        private static IDictionary<string, object> MapHeaders(IDictionary<string, WireMockList<string>> dictionary)
-        {
-            var newDictionary = new Dictionary<string, object>();
-            foreach (var entry in dictionary)
-            {
-                object value = entry.Value.Count == 1 ? (object)entry.Value.ToString() : entry.Value;
-                newDictionary.Add(entry.Key, value);
+                mappingModel.Response.Fault = new FaultModel
+                {
+                    Type = response.ResponseMessage.FaultType.ToString(),
+                    Percentage = response.ResponseMessage.FaultPercentage
+                };
             }
-
-            return newDictionary;
         }
+
+        return mappingModel;
+    }
+
+    private static WebProxyModel? MapWebProxy(WebProxySettings? settings)
+    {
+        return settings != null ? new WebProxyModel
+        {
+            Address = settings.Address,
+            UserName = settings.UserName,
+            Password = settings.Password
+        } : null;
+    }
+
+    private static IDictionary<string, object> MapHeaders(IDictionary<string, WireMockList<string>> dictionary)
+    {
+        var newDictionary = new Dictionary<string, object>();
+        foreach (var entry in dictionary)
+        {
+            object value = entry.Value.Count == 1 ? entry.Value.ToString() : entry.Value;
+            newDictionary.Add(entry.Key, value);
+        }
+
+        return newDictionary;
     }
 }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -9,208 +9,220 @@ using WireMock.Matchers;
 using WireMock.Models;
 using WireMock.Plugin;
 using WireMock.Settings;
+using WireMock.Util;
 
-namespace WireMock.Serialization
+namespace WireMock.Serialization;
+
+internal class MatcherMapper
 {
-    internal class MatcherMapper
+    private readonly WireMockServerSettings _settings;
+
+    public MatcherMapper(WireMockServerSettings settings)
     {
-        private readonly WireMockServerSettings _settings;
+        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+    }
 
-        public MatcherMapper(WireMockServerSettings settings)
+    public IMatcher[]? Map(IEnumerable<MatcherModel>? matchers)
+    {
+        if (matchers == null)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            return null;
+        }
+        return matchers.Select(Map).Where(m => m != null).ToArray()!;
+    }
+
+    public IMatcher? Map(MatcherModel? matcher)
+    {
+        if (matcher == null)
+        {
+            return null;
         }
 
-        public IMatcher[] Map(IEnumerable<MatcherModel>? matchers)
+        string[] parts = matcher.Name.Split('.');
+        string matcherName = parts[0];
+        string? matcherType = parts.Length > 1 ? parts[1] : null;
+        var stringPatterns = ParseStringPatterns(matcher);
+        var matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+        var matchOperator = StringUtils.ParseMatchOperator(matcher.MatchOperator);
+        bool ignoreCase = matcher.IgnoreCase == true;
+        bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+        bool useRegexExtended = _settings.UseRegexExtended == true;
+
+        switch (matcherName)
         {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
+            case nameof(NotNullOrEmptyMatcher):
+                return new NotNullOrEmptyMatcher(matchBehaviour);
+
+            case "CSharpCodeMatcher":
+                if (_settings.AllowCSharpCodeMatcher == true)
+                {
+                    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'.");
+
+            case nameof(LinqMatcher):
+                return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+
+            case nameof(ExactMatcher):
+                return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+
+            case nameof(ExactObjectMatcher):
+                return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
+
+            case nameof(RegexMatcher):
+                return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails, useRegexExtended, matchOperator);
+
+            case nameof(JsonMatcher):
+                var valueForJsonMatcher = matcher.Pattern ?? matcher.Patterns;
+                return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
+
+            case nameof(JsonPartialMatcher):
+                var valueForJsonPartialMatcher = matcher.Pattern ?? matcher.Patterns;
+                return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
+
+            case nameof(JsonPartialWildcardMatcher):
+                var valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns;
+                return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
+
+            case nameof(JsonPathMatcher):
+                return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+
+            case nameof(JmesPathMatcher):
+                return new JmesPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+
+            case nameof(XPathMatcher):
+                return new XPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+
+            case nameof(WildcardMatcher):
+                return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails, matchOperator);
+
+            case nameof(ContentTypeMatcher):
+                return new ContentTypeMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+
+            case nameof(SimMetricsMatcher):
+                SimMetricType type = SimMetricType.Levenstein;
+                if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
+                {
+                    throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
+                }
+
+                return new SimMetricsMatcher(matchBehaviour, stringPatterns, type, throwExceptionWhenMatcherFails);
+
+            default:
+                if (_settings.CustomMatcherMappings != null && _settings.CustomMatcherMappings.ContainsKey(matcherName))
+                {
+                    return _settings.CustomMatcherMappings[matcherName](matcher);
+                }
+
+                throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
+        }
+    }
+
+    public MatcherModel[]? Map(IEnumerable<IMatcher>? matchers)
+    {
+        if (matchers == null)
+        {
+            return null;
         }
 
-        public IMatcher? Map(MatcherModel? matcher)
+        return matchers.Where(m => m != null).Select(Map).ToArray()!;
+    }
+
+    public MatcherModel? Map(IMatcher? matcher)
+    {
+        if (matcher == null)
         {
-            if (matcher == null)
-            {
-                return null;
-            }
-
-            string[] parts = matcher.Name.Split('.');
-            string matcherName = parts[0];
-            string? matcherType = parts.Length > 1 ? parts[1] : null;
-            var stringPatterns = ParseStringPatterns(matcher);
-            var matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
-            bool ignoreCase = matcher.IgnoreCase == true;
-            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
-            bool useRegexExtended = _settings.UseRegexExtended == true;
-
-            switch (matcherName)
-            {
-                case nameof(NotNullOrEmptyMatcher):
-                    return new NotNullOrEmptyMatcher(matchBehaviour);
-
-                case "CSharpCodeMatcher":
-                    if (_settings.AllowCSharpCodeMatcher == true)
-                    {
-                        return PluginLoader.Load<ICSharpCodeMatcher>(matchBehaviour, stringPatterns);
-                    }
-
-                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because WireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
-
-                case nameof(LinqMatcher):
-                    return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case nameof(ExactMatcher):
-                    return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case nameof(ExactObjectMatcher):
-                    return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
-
-                case nameof(RegexMatcher):
-                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails, useRegexExtended);
-
-                case nameof(JsonMatcher):
-                    var valueForJsonMatcher = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonMatcher(matchBehaviour, valueForJsonMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case nameof(JsonPartialMatcher):
-                    var valueForJsonPartialMatcher = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case nameof(JsonPartialWildcardMatcher):
-                    var valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher!, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case nameof(JsonPathMatcher):
-                    return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case nameof(JmesPathMatcher):
-                    return new JmesPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case nameof(XPathMatcher):
-                    return new XPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case nameof(WildcardMatcher):
-                    return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case nameof(ContentTypeMatcher):
-                    return new ContentTypeMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case nameof(SimMetricsMatcher):
-                    SimMetricType type = SimMetricType.Levenstein;
-                    if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
-                    {
-                        throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
-                    }
-
-                    return new SimMetricsMatcher(matchBehaviour, stringPatterns, type, throwExceptionWhenMatcherFails);
-
-                default:
-                    if (_settings.CustomMatcherMappings != null && _settings.CustomMatcherMappings.ContainsKey(matcherName))
-                    {
-                        return _settings.CustomMatcherMappings[matcherName](matcher);
-                    }
-
-                    throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
-            }
+            return null;
         }
 
-        public MatcherModel[] Map(IEnumerable<IMatcher>? matchers)
+        bool? ignoreCase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : null;
+        bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : null;
+
+        var model = new MatcherModel
         {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
-        }
+            RejectOnMatch = rejectOnMatch,
+            IgnoreCase = ignoreCase,
+            Name = matcher.Name
+        };
 
-        public MatcherModel? Map(IMatcher? matcher)
+        switch (matcher)
         {
-            if (matcher == null)
-            {
-                return null;
-            }
-
-            bool? ignoreCase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : (bool?)null;
-            bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?)null;
-
-            var model = new MatcherModel
-            {
-                RejectOnMatch = rejectOnMatch,
-                IgnoreCase = ignoreCase,
-                Name = matcher.Name
-            };
-
-            switch (matcher)
-            {
-                // If the matcher is a IStringMatcher, get the patterns.
-                case IStringMatcher stringMatcher:
-                    var stringPatterns = stringMatcher.GetPatterns();
-                    if (stringPatterns.Length == 1)
+            // If the matcher is a IStringMatcher, get the operator & patterns.
+            case IStringMatcher stringMatcher:
+                var stringPatterns = stringMatcher.GetPatterns();
+                if (stringPatterns.Length == 1)
+                {
+                    if (stringPatterns[0].IsFirst)
                     {
-                        if (stringPatterns[0].IsFirst)
-                        {
-                            model.Pattern = stringPatterns[0].First;
-                        }
-                        else
-                        {
-                            model.Pattern = stringPatterns[0].Second.Pattern;
-                            model.PatternAsFile = stringPatterns[0].Second.PatternAsFile;
-                        }
+                        model.Pattern = stringPatterns[0].First;
                     }
                     else
                     {
-                        model.Patterns = stringPatterns.Select(p => p.GetPattern()).Cast<object>().ToArray();
+                        model.Pattern = stringPatterns[0].Second.Pattern;
+                        model.PatternAsFile = stringPatterns[0].Second.PatternAsFile;
                     }
-                    break;
+                }
+                else
+                {
+                    model.Patterns = stringPatterns.Select(p => p.GetPattern()).Cast<object>().ToArray();
+                    model.MatchOperator = stringMatcher.MatchOperator.ToString();
+                }
+                break;
 
-                // If the matcher is a IValueMatcher, get the value (can be string or object).
-                case IValueMatcher valueMatcher:
-                    model.Pattern = valueMatcher.Value;
-                    break;
+            // If the matcher is a IValueMatcher, get the value (can be string or object).
+            case IValueMatcher valueMatcher:
+                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;
-            }
-
-            return model;
+            // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
+            case ExactObjectMatcher exactObjectMatcher:
+                model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
+                break;
         }
 
-        private AnyOf<string, StringPattern>[] ParseStringPatterns(MatcherModel matcher)
+        return model;
+    }
+
+    private AnyOf<string, StringPattern>[] ParseStringPatterns(MatcherModel matcher)
+    {
+        if (matcher.Pattern is string patternAsString)
         {
-            if (matcher.Pattern is string patternAsString)
-            {
-                return new[] { new AnyOf<string, StringPattern>(patternAsString) };
-            }
-
-            if (matcher.Pattern is IEnumerable<string> patternAsStringArray)
-            {
-                return patternAsStringArray.ToAnyOfPatterns();
-            }
-
-            if (matcher.Patterns?.OfType<string>() is IEnumerable<string> patternsAsStringArray)
-            {
-                return patternsAsStringArray.ToAnyOfPatterns();
-            }
-
-            if (!string.IsNullOrEmpty(matcher.PatternAsFile))
-            {
-                var pattern = _settings.FileSystemHandler.ReadFileAsString(matcher.PatternAsFile);
-                return new[] { new AnyOf<string, StringPattern>(new StringPattern { Pattern = pattern, PatternAsFile = matcher.PatternAsFile }) };
-            }
-
-            return new AnyOf<string, StringPattern>[0];
+            return new[] { new AnyOf<string, StringPattern>(patternAsString) };
         }
 
-        private ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> stringPattern, bool throwException)
+        if (matcher.Pattern is IEnumerable<string> patternAsStringArray)
         {
-            byte[] bytePattern;
-            try
-            {
-                bytePattern = Convert.FromBase64String(stringPattern.GetPattern());
-            }
-            catch
-            {
-                throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
-            }
-
-            return new ExactObjectMatcher(matchBehaviour, bytePattern, throwException);
+            return patternAsStringArray.ToAnyOfPatterns();
         }
+
+        if (matcher.Patterns?.OfType<string>() is IEnumerable<string> patternsAsStringArray)
+        {
+            return patternsAsStringArray.ToAnyOfPatterns();
+        }
+
+        if (!string.IsNullOrEmpty(matcher.PatternAsFile))
+        {
+            var patternAsFile = matcher.PatternAsFile!;
+            var pattern = _settings.FileSystemHandler.ReadFileAsString(patternAsFile);
+            return new[] { new AnyOf<string, StringPattern>(new StringPattern { Pattern = pattern, PatternAsFile = patternAsFile }) };
+        }
+
+        return new AnyOf<string, StringPattern>[0];
+    }
+
+    private static ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> stringPattern, bool throwException)
+    {
+        byte[] bytePattern;
+        try
+        {
+            bytePattern = Convert.FromBase64String(stringPattern.GetPattern());
+        }
+        catch
+        {
+            throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
+        }
+
+        return new ExactObjectMatcher(matchBehaviour, bytePattern, throwException);
     }
 }

src/WireMock.Net/Serialization/PactMapper.cs

@@ -53,9 +53,9 @@ internal static class PactMapper
         return (filename, JsonUtils.SerializeAsPactFile(pact));
     }
 
-    private static Request MapRequest(RequestModel request, string path)
+    private static PactRequest MapRequest(RequestModel request, string path)
     {
-        return new Request
+        return new PactRequest
         {
             Method = request.Methods?.FirstOrDefault() ?? DefaultMethod,
             Path = path,
@@ -65,14 +65,14 @@ internal static class PactMapper
         };
     }
 
-    private static Response MapResponse(ResponseModel? response)
+    private static PactResponse MapResponse(ResponseModel? response)
     {
         if (response == null)
         {
-            return new Response();
+            return new PactResponse();
         }
 
-        return new Response
+        return new PactResponse
         {
             Status = MapStatusCode(response.StatusCode),
             Headers = MapResponseHeaders(response.Headers),

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -2,251 +2,254 @@
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
-using Stef.Validation;
-using WireMock.Constants;
 
-namespace WireMock.Server
+namespace WireMock.Server;
+
+/// <summary>
+/// The respond with a provider.
+/// </summary>
+internal class RespondWithAProvider : IRespondWithAProvider
 {
+    private int _priority;
+    private string? _title;
+    private string? _description;
+    private string? _path;
+    private string? _executionConditionState;
+    private string? _nextState;
+    private string? _scenario;
+    private int _timesInSameState = 1;
+    private readonly RegistrationCallback _registrationCallback;
+    private readonly IRequestMatcher _requestMatcher;
+    private readonly WireMockServerSettings _settings;
+    private readonly bool _saveToFile;
+
+    public Guid Guid { get; private set; } = Guid.NewGuid();
+
+    public IWebhook[]? Webhooks { get; private set; }
+
+    public ITimeSettings? TimeSettings { get; private set; }
+
     /// <summary>
-    /// The respond with a provider.
+    /// Initializes a new instance of the <see cref="RespondWithAProvider"/> class.
     /// </summary>
-    internal class RespondWithAProvider : IRespondWithAProvider
+    /// <param name="registrationCallback">The registration callback.</param>
+    /// <param name="requestMatcher">The request matcher.</param>
+    /// <param name="settings">The WireMockServerSettings.</param>
+    /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
+    public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, WireMockServerSettings settings, bool saveToFile = false)
     {
-        private int _priority;
-        private string _title;
-        private string _description;
-        private string _path;
-        private string _executionConditionState;
-        private string _nextState;
-        private string _scenario;
-        private int _timesInSameState = 1;
-        private readonly RegistrationCallback _registrationCallback;
-        private readonly IRequestMatcher _requestMatcher;
-        private readonly WireMockServerSettings _settings;
-        private readonly bool _saveToFile;
+        _registrationCallback = registrationCallback;
+        _requestMatcher = requestMatcher;
+        _settings = settings;
+        _saveToFile = saveToFile;
+    }
 
-        public Guid Guid { get; private set; } = Guid.NewGuid();
+    /// <summary>
+    /// The respond with.
+    /// </summary>
+    /// <param name="provider">The provider.</param>
+    public void RespondWith(IResponseProvider provider)
+    {
+        _registrationCallback(new Mapping(Guid, _title, _description, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhooks, TimeSettings), _saveToFile);
+    }
 
-        public IWebhook[] Webhooks { get; private set; }
+    /// <inheritdoc />
+    public IRespondWithAProvider WithGuid(string guid)
+    {
+        return WithGuid(Guid.Parse(guid));
+    }
 
-        public ITimeSettings TimeSettings { get; private set; }
+    /// <inheritdoc />
+    public IRespondWithAProvider WithGuid(Guid guid)
+    {
+        Guid = guid;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RespondWithAProvider"/> class.
-        /// </summary>
-        /// <param name="registrationCallback">The registration callback.</param>
-        /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="settings">The WireMockServerSettings.</param>
-        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, WireMockServerSettings settings, bool saveToFile = false)
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithTitle(string title)
+    {
+        _title = title;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithDescription(string description)
+    {
+        _description = description;
+
+        return this;
+    }
+
+    /// <see cref="IRespondWithAProvider.WithPath"/>
+    public IRespondWithAProvider WithPath(string path)
+    {
+        _path = path;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider AtPriority(int priority)
+    {
+        _priority = priority;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider InScenario(string scenario)
+    {
+        _scenario = scenario;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider InScenario(int scenario)
+    {
+        return InScenario(scenario.ToString());
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WhenStateIs(string state)
+    {
+        if (string.IsNullOrEmpty(_scenario))
         {
-            _registrationCallback = registrationCallback;
-            _requestMatcher = requestMatcher;
-            _settings = settings;
-            _saveToFile = saveToFile;
+            throw new NotSupportedException("Unable to set state condition when no scenario is defined.");
         }
 
-        /// <summary>
-        /// The respond with.
-        /// </summary>
-        /// <param name="provider">The provider.</param>
-        public void RespondWith(IResponseProvider provider)
+        _executionConditionState = state;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WhenStateIs(int state)
+    {
+        return WhenStateIs(state.ToString());
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WillSetStateTo(string state, int? times = 1)
+    {
+        if (string.IsNullOrEmpty(_scenario))
         {
-            _registrationCallback(new Mapping(Guid, _title, _description, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhooks, TimeSettings), _saveToFile);
+            throw new NotSupportedException("Unable to set next state when no scenario is defined.");
         }
 
-        /// <inheritdoc />
-        public IRespondWithAProvider WithGuid(string guid)
+        _nextState = state;
+        _timesInSameState = times ?? 1;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WillSetStateTo(int state, int? times = 1)
+    {
+        return WillSetStateTo(state.ToString(), times);
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithTimeSettings(ITimeSettings timeSettings)
+    {
+        Guard.NotNull(timeSettings, nameof(timeSettings));
+
+        TimeSettings = timeSettings;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithWebhook(params IWebhook[] webhooks)
+    {
+        Guard.HasNoNulls(webhooks, nameof(webhooks));
+
+        Webhooks = webhooks;
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithWebhook(
+        string url,
+        string method = "post",
+        IDictionary<string, WireMockList<string>>? headers = null,
+        string? body = null,
+        bool useTransformer = true,
+        TransformerType transformerType = TransformerType.Handlebars)
+    {
+        Guard.NotNull(url);
+        Guard.NotNull(method);
+
+        Webhooks = new[] { InitWebhook(url, method, headers, useTransformer, transformerType) };
+
+        if (body != null)
         {
-            return WithGuid(Guid.Parse(guid));
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithGuid(Guid guid)
-        {
-            Guid = guid;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithTitle(string title)
-        {
-            _title = title;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithDescription(string description)
-        {
-            _description = description;
-
-            return this;
-        }
-
-        /// <see cref="IRespondWithAProvider.WithPath"/>
-        public IRespondWithAProvider WithPath(string path)
-        {
-            _path = path;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider AtPriority(int priority)
-        {
-            _priority = priority;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider InScenario(string scenario)
-        {
-            _scenario = scenario;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider InScenario(int scenario)
-        {
-            return InScenario(scenario.ToString());
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WhenStateIs(string state)
-        {
-            if (string.IsNullOrEmpty(_scenario))
+            Webhooks[0].Request.BodyData = new BodyData
             {
-                throw new NotSupportedException("Unable to set state condition when no scenario is defined.");
-            }
-
-            _executionConditionState = state;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WhenStateIs(int state)
-        {
-            return WhenStateIs(state.ToString());
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WillSetStateTo(string state, int? times = 1)
-        {
-            if (string.IsNullOrEmpty(_scenario))
-            {
-                throw new NotSupportedException("Unable to set next state when no scenario is defined.");
-            }
-
-            _nextState = state;
-            _timesInSameState = times ?? 1;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WillSetStateTo(int state, int? times = 1)
-        {
-            return WillSetStateTo(state.ToString(), times);
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithTimeSettings(ITimeSettings timeSettings)
-        {
-            Guard.NotNull(timeSettings, nameof(timeSettings));
-
-            TimeSettings = timeSettings;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithWebhook(params IWebhook[] webhooks)
-        {
-            Guard.HasNoNulls(webhooks, nameof(webhooks));
-
-            Webhooks = webhooks;
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithWebhook(
-            [NotNull] string url,
-            [CanBeNull] string method = "post",
-            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
-            [CanBeNull] string body = null,
-            bool useTransformer = true,
-            TransformerType transformerType = TransformerType.Handlebars)
-        {
-            Webhooks = new[] { InitWebhook(url, method, headers, useTransformer, transformerType) };
-
-            if (body != null)
-            {
-                Webhooks[0].Request.BodyData = new BodyData
-                {
-                    BodyAsString = body,
-                    DetectedBodyType = BodyType.String,
-                    DetectedBodyTypeFromContentType = BodyType.String
-                };
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc />
-        public IRespondWithAProvider WithWebhook(
-            [NotNull] string url,
-            [CanBeNull] string method = "post",
-            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
-            [CanBeNull] object body = null,
-            bool useTransformer = true,
-            TransformerType transformerType = TransformerType.Handlebars)
-        {
-            Webhooks = new[] { InitWebhook(url, method, headers, useTransformer, transformerType) };
-
-            if (body != null)
-            {
-                Webhooks[0].Request.BodyData = new BodyData
-                {
-                    BodyAsJson = body,
-                    DetectedBodyType = BodyType.Json,
-                    DetectedBodyTypeFromContentType = BodyType.Json
-                };
-            }
-
-            return this;
-        }
-
-        private static IWebhook InitWebhook(
-            string url,
-            string method,
-            IDictionary<string, WireMockList<string>> headers,
-            bool useTransformer,
-            TransformerType transformerType)
-        {
-            return new Webhook
-            {
-                Request = new WebhookRequest
-                {
-                    Url = url,
-                    Method = method ?? "post",
-                    Headers = headers,
-                    UseTransformer = useTransformer,
-                    TransformerType = transformerType
-                }
+                BodyAsString = body,
+                DetectedBodyType = BodyType.String,
+                DetectedBodyTypeFromContentType = BodyType.String
             };
         }
+
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider WithWebhook(
+        string url,
+        string method = "post",
+        IDictionary<string, WireMockList<string>>? headers = null,
+        object? body = null,
+        bool useTransformer = true,
+        TransformerType transformerType = TransformerType.Handlebars)
+    {
+        Guard.NotNull(url);
+        Guard.NotNull(method);
+
+        Webhooks = new[] { InitWebhook(url, method, headers, useTransformer, transformerType) };
+
+        if (body != null)
+        {
+            Webhooks[0].Request.BodyData = new BodyData
+            {
+                BodyAsJson = body,
+                DetectedBodyType = BodyType.Json,
+                DetectedBodyTypeFromContentType = BodyType.Json
+            };
+        }
+
+        return this;
+    }
+
+    private static IWebhook InitWebhook(
+        string url,
+        string method,
+        IDictionary<string, WireMockList<string>>? headers,
+        bool useTransformer,
+        TransformerType transformerType)
+    {
+        return new Webhook
+        {
+            Request = new WebhookRequest
+            {
+                Url = url,
+                Method = method,
+                Headers = headers,
+                UseTransformer = useTransformer,
+                TransformerType = transformerType
+            }
+        };
     }
 }

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

@@ -234,14 +234,14 @@ public partial class WireMockServer
     private async Task<IResponseMessage> ProxyAndRecordAsync(IRequestMessage requestMessage, WireMockServerSettings settings)
     {
         var requestUri = new Uri(requestMessage.Url);
-        var proxyUri = new Uri(settings.ProxyAndRecordSettings.Url);
+        var proxyUri = new Uri(settings.ProxyAndRecordSettings!.Url);
         var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
 
         var proxyHelper = new ProxyHelper(settings);
 
         var (responseMessage, mapping) = await proxyHelper.SendAsync(
-            _settings.ProxyAndRecordSettings,
-            _httpClientForProxy,
+            _settings.ProxyAndRecordSettings!,
+            _httpClientForProxy!,
             requestMessage,
             proxyUriWithRequestPathAndQuery.AbsoluteUri
         ).ConfigureAwait(false);
@@ -442,73 +442,6 @@ public partial class WireMockServer
         }
     }
 
-    private Guid? ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
-    {
-        Guard.NotNull(mappingModel, nameof(mappingModel));
-        Guard.NotNull(mappingModel.Request, nameof(mappingModel.Request));
-        Guard.NotNull(mappingModel.Response, nameof(mappingModel.Response));
-
-        var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
-        if (requestBuilder == null)
-        {
-            return null;
-        }
-
-        var responseBuilder = InitResponseBuilder(mappingModel.Response);
-
-        var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);
-
-        if (guid != null)
-        {
-            respondProvider = respondProvider.WithGuid(guid.Value);
-        }
-        else if (mappingModel.Guid != null && mappingModel.Guid != Guid.Empty)
-        {
-            respondProvider = respondProvider.WithGuid(mappingModel.Guid.Value);
-        }
-
-        if (mappingModel.TimeSettings != null)
-        {
-            respondProvider = respondProvider.WithTimeSettings(TimeSettingsMapper.Map(mappingModel.TimeSettings));
-        }
-
-        if (path != null)
-        {
-            respondProvider = respondProvider.WithPath(path);
-        }
-
-        if (!string.IsNullOrEmpty(mappingModel.Title))
-        {
-            respondProvider = respondProvider.WithTitle(mappingModel.Title);
-        }
-
-        if (mappingModel.Priority != null)
-        {
-            respondProvider = respondProvider.AtPriority(mappingModel.Priority.Value);
-        }
-
-        if (mappingModel.Scenario != null)
-        {
-            respondProvider = respondProvider.InScenario(mappingModel.Scenario);
-            respondProvider = respondProvider.WhenStateIs(mappingModel.WhenStateIs);
-            respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo);
-        }
-
-        if (mappingModel.Webhook != null)
-        {
-            respondProvider = respondProvider.WithWebhook(WebhookMapper.Map(mappingModel.Webhook));
-        }
-        else if (mappingModel.Webhooks?.Length > 1)
-        {
-            var webhooks = mappingModel.Webhooks.Select(WebhookMapper.Map).ToArray();
-            respondProvider = respondProvider.WithWebhook(webhooks);
-        }
-
-        respondProvider.RespondWith(responseBuilder);
-
-        return respondProvider.Guid;
-    }
-
     private IResponseMessage MappingsDelete(IRequestMessage requestMessage)
     {
         if (!string.IsNullOrEmpty(requestMessage.Body))
@@ -518,23 +451,19 @@ public partial class WireMockServer
             {
                 return ResponseMessageBuilder.Create($"Mappings deleted. Affected GUIDs: [{string.Join(", ", deletedGuids.ToArray())}]");
             }
-            else
-            {
-                // return bad request
-                return ResponseMessageBuilder.Create("Poorly formed mapping JSON.", 400);
-            }
-        }
-        else
-        {
-            ResetMappings();
 
-            ResetScenarios();
-
-            return ResponseMessageBuilder.Create("Mappings deleted");
+            // return bad request
+            return ResponseMessageBuilder.Create("Poorly formed mapping JSON.", 400);
         }
+
+        ResetMappings();
+
+        ResetScenarios();
+
+        return ResponseMessageBuilder.Create("Mappings deleted");
     }
 
-    private IEnumerable<Guid> MappingsDeleteMappingFromBody(IRequestMessage requestMessage)
+    private IEnumerable<Guid>? MappingsDeleteMappingFromBody(IRequestMessage requestMessage)
     {
         var deletedGuids = new List<Guid>();
 
@@ -577,9 +506,10 @@ public partial class WireMockServer
         ResetScenarios();
 
         string message = "Mappings reset";
-        if (requestMessage.Query.ContainsKey(QueryParamReloadStaticMappings) &&
-            bool.TryParse(requestMessage.Query[QueryParamReloadStaticMappings].ToString(), out bool reloadStaticMappings)
-            && reloadStaticMappings)
+        if (requestMessage.Query != null &&
+            requestMessage.Query.ContainsKey(QueryParamReloadStaticMappings) &&
+            bool.TryParse(requestMessage.Query[QueryParamReloadStaticMappings].ToString(), out bool reloadStaticMappings) &&
+            reloadStaticMappings)
         {
             ReadStaticMappings();
             message = $"{message} and static mappings reloaded";
@@ -718,220 +648,6 @@ public partial class WireMockServer
         return this;
     }
     #endregion
-    private IRequestBuilder? InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
-    {
-        IRequestBuilder requestBuilder = Request.Create();
-
-        if (requestModel.ClientIP != null)
-        {
-            if (requestModel.ClientIP is string clientIP)
-            {
-                requestBuilder = requestBuilder.WithClientIP(clientIP);
-            }
-            else
-            {
-                var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
-                if (clientIPModel?.Matchers != null)
-                {
-                    requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                }
-            }
-        }
-
-        bool pathOrUrlMatchersValid = false;
-        if (requestModel.Path != null)
-        {
-            if (requestModel.Path is string path)
-            {
-                requestBuilder = requestBuilder.WithPath(path);
-                pathOrUrlMatchersValid = true;
-            }
-            else
-            {
-                var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
-                if (pathModel?.Matchers != null)
-                {
-                    requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
-                }
-            }
-        }
-        else if (requestModel.Url != null)
-        {
-            if (requestModel.Url is string url)
-            {
-                requestBuilder = requestBuilder.WithUrl(url);
-                pathOrUrlMatchersValid = true;
-            }
-            else
-            {
-                var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
-                if (urlModel?.Matchers != null)
-                {
-                    requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
-                }
-            }
-        }
-
-        if (pathOrUrlRequired && !pathOrUrlMatchersValid)
-        {
-            _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
-            return null;
-        }
-
-        if (requestModel.Methods != null)
-        {
-            requestBuilder = requestBuilder.UsingMethod(requestModel.Methods);
-        }
-
-        if (requestModel.Headers != null)
-        {
-            foreach (var headerModel in requestModel.Headers.Where(h => h.Matchers != null))
-            {
-                requestBuilder = requestBuilder.WithHeader(
-                    headerModel.Name,
-                    headerModel.IgnoreCase == true,
-                    headerModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch,
-                    headerModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray()
-                );
-            }
-        }
-
-        if (requestModel.Cookies != null)
-        {
-            foreach (var cookieModel in requestModel.Cookies.Where(c => c.Matchers != null))
-            {
-                requestBuilder = requestBuilder.WithCookie(
-                    cookieModel.Name,
-                    cookieModel.IgnoreCase == true,
-                    cookieModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch,
-                    cookieModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-            }
-        }
-
-        if (requestModel.Params != null)
-        {
-            foreach (var paramModel in requestModel.Params.Where(p => p is { Matchers: { } }))
-            {
-                bool ignoreCase = paramModel.IgnoreCase == true;
-                requestBuilder = requestBuilder.WithParam(paramModel.Name, ignoreCase, paramModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-            }
-        }
-
-        if (requestModel.Body?.Matcher != null)
-        {
-            requestBuilder = requestBuilder.WithBody(_matcherMapper.Map(requestModel.Body.Matcher));
-        }
-        else if (requestModel.Body?.Matchers != null)
-        {
-            requestBuilder = requestBuilder.WithBody(_matcherMapper.Map(requestModel.Body.Matchers));
-        }
-
-        return requestBuilder;
-    }
-
-    private IResponseBuilder InitResponseBuilder(ResponseModel responseModel)
-    {
-        IResponseBuilder responseBuilder = Response.Create();
-
-        if (responseModel.Delay > 0)
-        {
-            responseBuilder = responseBuilder.WithDelay(responseModel.Delay.Value);
-        }
-        else if (responseModel.MinimumRandomDelay >= 0 || responseModel.MaximumRandomDelay > 0)
-        {
-            responseBuilder = responseBuilder.WithRandomDelay(responseModel.MinimumRandomDelay ?? 0, responseModel.MaximumRandomDelay ?? 60_000);
-        }
-
-        if (responseModel.UseTransformer == true)
-        {
-            if (!Enum.TryParse<TransformerType>(responseModel.TransformerType, out var transformerType))
-            {
-                transformerType = TransformerType.Handlebars;
-            }
-
-            if (!Enum.TryParse<ReplaceNodeOptions>(responseModel.TransformerReplaceNodeOptions, out var option))
-            {
-                option = ReplaceNodeOptions.None;
-            }
-            responseBuilder = responseBuilder.WithTransformer(
-                transformerType,
-                responseModel.UseTransformerForBodyAsFile == true,
-                option);
-        }
-
-        if (!string.IsNullOrEmpty(responseModel.ProxyUrl))
-        {
-            var proxyAndRecordSettings = new ProxyAndRecordSettings
-            {
-                Url = responseModel.ProxyUrl,
-                ClientX509Certificate2ThumbprintOrSubjectName = responseModel.X509Certificate2ThumbprintOrSubjectName,
-                WebProxySettings = responseModel.WebProxy != null ? new WebProxySettings
-                {
-                    Address = responseModel.WebProxy.Address,
-                    UserName = responseModel.WebProxy.UserName,
-                    Password = responseModel.WebProxy.Password
-                } : null
-            };
-
-            return responseBuilder.WithProxy(proxyAndRecordSettings);
-        }
-
-        if (responseModel.StatusCode is string statusCodeAsString)
-        {
-            responseBuilder = responseBuilder.WithStatusCode(statusCodeAsString);
-        }
-        else if (responseModel.StatusCode != null)
-        {
-            // Convert to Int32 because Newtonsoft deserializes an 'object' with a number value to a long.
-            responseBuilder = responseBuilder.WithStatusCode(Convert.ToInt32(responseModel.StatusCode));
-        }
-
-        if (responseModel.Headers != null)
-        {
-            foreach (var entry in responseModel.Headers)
-            {
-                responseBuilder = entry.Value is string value ?
-                    responseBuilder.WithHeader(entry.Key, value) :
-                    responseBuilder.WithHeader(entry.Key, JsonUtils.ParseJTokenToObject<string[]>(entry.Value));
-            }
-        }
-        else if (responseModel.HeadersRaw != null)
-        {
-            foreach (string headerLine in responseModel.HeadersRaw.Split(new[] { "\n", "\r\n" }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                int indexColon = headerLine.IndexOf(":", StringComparison.Ordinal);
-                string key = headerLine.Substring(0, indexColon).TrimStart(' ', '\t');
-                string value = headerLine.Substring(indexColon + 1).TrimStart(' ', '\t');
-                responseBuilder = responseBuilder.WithHeader(key, value);
-            }
-        }
-
-        if (responseModel.BodyAsBytes != null)
-        {
-            responseBuilder = responseBuilder.WithBody(responseModel.BodyAsBytes, responseModel.BodyDestination, ToEncoding(responseModel.BodyEncoding));
-        }
-        else if (responseModel.Body != null)
-        {
-            responseBuilder = responseBuilder.WithBody(responseModel.Body, responseModel.BodyDestination, ToEncoding(responseModel.BodyEncoding));
-        }
-        else if (responseModel.BodyAsJson != null)
-        {
-            responseBuilder = responseBuilder.WithBodyAsJson(responseModel.BodyAsJson, ToEncoding(responseModel.BodyEncoding), responseModel.BodyAsJsonIndented == true);
-        }
-        else if (responseModel.BodyAsFile != null)
-        {
-            responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile, responseModel.BodyAsFileIsCached == true);
-        }
-
-        if (responseModel.Fault != null && Enum.TryParse(responseModel.Fault.Type, out FaultType faultType))
-        {
-            responseBuilder.WithFault(faultType, responseModel.Fault.Percentage);
-        }
-
-        return responseBuilder;
-    }
 
     private void DisposeEnhancedFileSystemWatcher()
     {

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

@@ -0,0 +1,318 @@
+using System;
+using System.Linq;
+using Stef.Validation;
+using WireMock.Admin.Mappings;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Serialization;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Server;
+
+public partial class WireMockServer
+{
+    private Guid? ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
+    {
+        Guard.NotNull(mappingModel);
+        Guard.NotNull(mappingModel.Request, nameof(mappingModel.Request));
+        Guard.NotNull(mappingModel.Response, nameof(mappingModel.Response));
+
+        var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
+        if (requestBuilder == null)
+        {
+            return null;
+        }
+
+        var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);
+
+        if (guid != null)
+        {
+            respondProvider = respondProvider.WithGuid(guid.Value);
+        }
+        else if (mappingModel.Guid != null && mappingModel.Guid != Guid.Empty)
+        {
+            respondProvider = respondProvider.WithGuid(mappingModel.Guid.Value);
+        }
+
+        if (mappingModel.TimeSettings != null)
+        {
+            respondProvider = respondProvider.WithTimeSettings(TimeSettingsMapper.Map(mappingModel.TimeSettings));
+        }
+
+        if (path != null)
+        {
+            respondProvider = respondProvider.WithPath(path);
+        }
+
+        if (!string.IsNullOrEmpty(mappingModel.Title))
+        {
+            respondProvider = respondProvider.WithTitle(mappingModel.Title!);
+        }
+
+        if (mappingModel.Priority != null)
+        {
+            respondProvider = respondProvider.AtPriority(mappingModel.Priority.Value);
+        }
+
+        if (mappingModel.Scenario != null)
+        {
+            respondProvider = respondProvider.InScenario(mappingModel.Scenario);
+
+            if (!string.IsNullOrEmpty(mappingModel.WhenStateIs))
+            {
+                respondProvider = respondProvider.WhenStateIs(mappingModel.WhenStateIs!);
+            }
+
+            if (!string.IsNullOrEmpty(mappingModel.SetStateTo))
+            {
+                respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo!);
+            }
+        }
+
+        if (mappingModel.Webhook != null)
+        {
+            respondProvider = respondProvider.WithWebhook(WebhookMapper.Map(mappingModel.Webhook));
+        }
+        else if (mappingModel.Webhooks?.Length > 1)
+        {
+            var webhooks = mappingModel.Webhooks.Select(WebhookMapper.Map).ToArray();
+            respondProvider = respondProvider.WithWebhook(webhooks);
+        }
+
+        var responseBuilder = InitResponseBuilder(mappingModel.Response);
+        respondProvider.RespondWith(responseBuilder);
+
+        return respondProvider.Guid;
+    }
+
+    private IRequestBuilder? InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
+    {
+        IRequestBuilder requestBuilder = Request.Create();
+
+        if (requestModel.ClientIP != null)
+        {
+            if (requestModel.ClientIP is string clientIP)
+            {
+                requestBuilder = requestBuilder.WithClientIP(clientIP);
+            }
+            else
+            {
+                var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
+                if (clientIPModel?.Matchers != null)
+                {
+                    requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
+                }
+            }
+        }
+
+        bool pathOrUrlMatchersValid = false;
+        if (requestModel.Path != null)
+        {
+            if (requestModel.Path is string path)
+            {
+                requestBuilder = requestBuilder.WithPath(path);
+                pathOrUrlMatchersValid = true;
+            }
+            else
+            {
+                var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
+                if (pathModel?.Matchers != null)
+                {
+                    var matchOperator = StringUtils.ParseMatchOperator(pathModel.MatchOperator);
+                    requestBuilder = requestBuilder.WithPath(matchOperator, pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
+                    pathOrUrlMatchersValid = true;
+                }
+            }
+        }
+        else if (requestModel.Url != null)
+        {
+            if (requestModel.Url is string url)
+            {
+                requestBuilder = requestBuilder.WithUrl(url);
+                pathOrUrlMatchersValid = true;
+            }
+            else
+            {
+                var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
+                if (urlModel?.Matchers != null)
+                {
+                    var matchOperator = StringUtils.ParseMatchOperator(urlModel.MatchOperator);
+                    requestBuilder = requestBuilder.WithUrl(matchOperator, urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
+                    pathOrUrlMatchersValid = true;
+                }
+            }
+        }
+
+        if (pathOrUrlRequired && !pathOrUrlMatchersValid)
+        {
+            _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
+            return null;
+        }
+
+        if (requestModel.Methods != null)
+        {
+            var matchBehaviour = requestModel.MethodsRejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+            var matchOperator = StringUtils.ParseMatchOperator(requestModel.MethodsMatchOperator);
+            requestBuilder = requestBuilder.UsingMethod(matchBehaviour, matchOperator, requestModel.Methods);
+        }
+
+        if (requestModel.Headers != null)
+        {
+            foreach (var headerModel in requestModel.Headers.Where(h => h.Matchers != null))
+            {
+                var matchOperator = StringUtils.ParseMatchOperator(headerModel.MatchOperator);
+                requestBuilder = requestBuilder.WithHeader(
+                    headerModel.Name,
+                    headerModel.IgnoreCase == true,
+                    headerModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch,
+                    matchOperator,
+                    headerModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray()
+                );
+            }
+        }
+
+        if (requestModel.Cookies != null)
+        {
+            foreach (var cookieModel in requestModel.Cookies.Where(c => c.Matchers != null))
+            {
+                requestBuilder = requestBuilder.WithCookie(
+                    cookieModel.Name,
+                    cookieModel.IgnoreCase == true,
+                    cookieModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch,
+                    cookieModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
+            }
+        }
+
+        if (requestModel.Params != null)
+        {
+            foreach (var paramModel in requestModel.Params.Where(p => p is { Matchers: { } }))
+            {
+                bool ignoreCase = paramModel.IgnoreCase == true;
+                requestBuilder = requestBuilder.WithParam(paramModel.Name, ignoreCase, paramModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
+            }
+        }
+
+        if (requestModel.Body?.Matcher != null)
+        {
+            requestBuilder = requestBuilder.WithBody(_matcherMapper.Map(requestModel.Body.Matcher)!);
+        }
+        else if (requestModel.Body?.Matchers != null)
+        {
+            var matchOperator = StringUtils.ParseMatchOperator(requestModel.Body.MatchOperator);
+            requestBuilder = requestBuilder.WithBody(_matcherMapper.Map(requestModel.Body.Matchers)!, matchOperator);
+        }
+
+        return requestBuilder;
+    }
+
+    private static IResponseBuilder InitResponseBuilder(ResponseModel responseModel)
+    {
+        IResponseBuilder responseBuilder = Response.Create();
+
+        if (responseModel.Delay > 0)
+        {
+            responseBuilder = responseBuilder.WithDelay(responseModel.Delay.Value);
+        }
+        else if (responseModel.MinimumRandomDelay >= 0 || responseModel.MaximumRandomDelay > 0)
+        {
+            responseBuilder = responseBuilder.WithRandomDelay(responseModel.MinimumRandomDelay ?? 0, responseModel.MaximumRandomDelay ?? 60_000);
+        }
+
+        if (responseModel.UseTransformer == true)
+        {
+            if (!Enum.TryParse<TransformerType>(responseModel.TransformerType, out var transformerType))
+            {
+                transformerType = TransformerType.Handlebars;
+            }
+
+            if (!Enum.TryParse<ReplaceNodeOptions>(responseModel.TransformerReplaceNodeOptions, out var option))
+            {
+                option = ReplaceNodeOptions.None;
+            }
+            responseBuilder = responseBuilder.WithTransformer(
+                transformerType,
+                responseModel.UseTransformerForBodyAsFile == true,
+                option);
+        }
+
+        if (!string.IsNullOrEmpty(responseModel.ProxyUrl))
+        {
+            var proxyAndRecordSettings = new ProxyAndRecordSettings
+            {
+                Url = responseModel.ProxyUrl!,
+                ClientX509Certificate2ThumbprintOrSubjectName = responseModel.X509Certificate2ThumbprintOrSubjectName,
+                WebProxySettings = responseModel.WebProxy != null ? new WebProxySettings
+                {
+                    Address = responseModel.WebProxy.Address,
+                    UserName = responseModel.WebProxy.UserName,
+                    Password = responseModel.WebProxy.Password
+                } : null
+            };
+
+            return responseBuilder.WithProxy(proxyAndRecordSettings);
+        }
+
+        if (responseModel.StatusCode is string statusCodeAsString)
+        {
+            responseBuilder = responseBuilder.WithStatusCode(statusCodeAsString);
+        }
+        else if (responseModel.StatusCode != null)
+        {
+            // Convert to Int32 because Newtonsoft deserializes an 'object' with a number value to a long.
+            responseBuilder = responseBuilder.WithStatusCode(Convert.ToInt32(responseModel.StatusCode));
+        }
+
+        if (responseModel.Headers != null)
+        {
+            foreach (var entry in responseModel.Headers)
+            {
+                if (entry.Value is string value)
+                {
+                    responseBuilder.WithHeader(entry.Key, value);
+                }
+                else
+                {
+                    var headers = JsonUtils.ParseJTokenToObject<string[]>(entry.Value) ?? new string[0];
+                    responseBuilder.WithHeader(entry.Key, headers);
+                }
+            }
+        }
+        else if (responseModel.HeadersRaw != null)
+        {
+            foreach (string headerLine in responseModel.HeadersRaw.Split(new[] { "\n", "\r\n" }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                int indexColon = headerLine.IndexOf(":", StringComparison.Ordinal);
+                string key = headerLine.Substring(0, indexColon).TrimStart(' ', '\t');
+                string value = headerLine.Substring(indexColon + 1).TrimStart(' ', '\t');
+                responseBuilder = responseBuilder.WithHeader(key, value);
+            }
+        }
+
+        if (responseModel.BodyAsBytes != null)
+        {
+            responseBuilder = responseBuilder.WithBody(responseModel.BodyAsBytes, responseModel.BodyDestination, ToEncoding(responseModel.BodyEncoding));
+        }
+        else if (responseModel.Body != null)
+        {
+            responseBuilder = responseBuilder.WithBody(responseModel.Body, responseModel.BodyDestination, ToEncoding(responseModel.BodyEncoding));
+        }
+        else if (responseModel.BodyAsJson != null)
+        {
+            responseBuilder = responseBuilder.WithBodyAsJson(responseModel.BodyAsJson, ToEncoding(responseModel.BodyEncoding), responseModel.BodyAsJsonIndented == true);
+        }
+        else if (responseModel.BodyAsFile != null)
+        {
+            responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile, responseModel.BodyAsFileIsCached == true);
+        }
+
+        if (responseModel.Fault != null && Enum.TryParse(responseModel.Fault.Type, out FaultType faultType))
+        {
+            responseBuilder.WithFault(faultType, responseModel.Fault.Percentage);
+        }
+
+        return responseBuilder;
+    }
+}

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

@@ -10,299 +10,302 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Util;
 using Stef.Validation;
-using OrgMapping = WireMock.Org.Abstractions.Mapping;
+using OrgMappings = WireMock.Org.Abstractions.Mappings;
 
-namespace WireMock.Server
+namespace WireMock.Server;
+
+public partial class WireMockServer
 {
-    public partial class WireMockServer
+    /// <summary>
+    /// Read WireMock.org mapping json file.
+    /// </summary>
+    /// <param name="path">The path to the WireMock.org mapping json file.</param>
+    [PublicAPI]
+    public void ReadStaticWireMockOrgMappingAndAddOrUpdate(string path)
     {
-        /// <summary>
-        /// Read WireMock.org mapping json file.
-        /// </summary>
-        /// <param name="path">The path to the WireMock.org mapping json file.</param>
-        [PublicAPI]
-        public void ReadStaticWireMockOrgMappingAndAddOrUpdate(string path)
+        Guard.NotNull(path, nameof(path));
+
+        string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
+
+        if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
         {
-            Guard.NotNull(path, nameof(path));
-
-            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
-
-            if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
+            var mappings = DeserializeJsonToArray<OrgMappings>(value);
+            foreach (var mapping in mappings)
             {
-                var mappings = DeserializeJsonToArray<OrgMapping>(value);
-                foreach (var mapping in mappings)
+                if (mappings.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
                 {
-                    if (mappings.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
-                    {
-                        ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, guidFromFilename, path);
-                    }
-                    else
-                    {
-                        ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, null, path);
-                    }
+                    ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, guidFromFilename, path);
+                }
+                else
+                {
+                    ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, null, path);
                 }
             }
         }
+    }
 
-        private IResponseMessage MappingsPostWireMockOrg(IRequestMessage requestMessage)
+    private IResponseMessage MappingsPostWireMockOrg(IRequestMessage requestMessage)
+    {
+        try
         {
-            try
+            var mappingModels = DeserializeRequestMessageToArray<OrgMappings>(requestMessage);
+            if (mappingModels.Length == 1)
             {
-                var mappingModels = DeserializeRequestMessageToArray<OrgMapping>(requestMessage);
-                if (mappingModels.Length == 1)
-                {
-                    Guid? guid = ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModels[0]);
-                    return ResponseMessageBuilder.Create("Mapping added", 201, guid);
-                }
-
-                foreach (var mappingModel in mappingModels)
-                {
-                    ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModel);
-                }
-
-                return ResponseMessageBuilder.Create("Mappings added", 201);
+                Guid? guid = ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModels[0]);
+                return ResponseMessageBuilder.Create("Mapping added", 201, guid);
             }
-            catch (ArgumentException a)
+
+            foreach (var mappingModel in mappingModels)
             {
-                _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
-                return ResponseMessageBuilder.Create(a.Message, 400);
+                ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModel);
             }
-            catch (Exception e)
+
+            return ResponseMessageBuilder.Create("Mappings added", 201);
+        }
+        catch (ArgumentException a)
+        {
+            _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
+            return ResponseMessageBuilder.Create(a.Message, 400);
+        }
+        catch (Exception e)
+        {
+            _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
+            return ResponseMessageBuilder.Create(e.ToString(), 500);
+        }
+    }
+
+    private Guid? ConvertWireMockOrgMappingAndRegisterAsRespondProvider(OrgMappings mapping, Guid? guid = null, string? path = null)
+    {
+        var requestBuilder = Request.Create();
+
+        var request = mapping.Request;
+        if (request != null)
+        {
+            if (request.Url != null)
             {
-                _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
-                return ResponseMessageBuilder.Create(e.ToString(), 500);
+                requestBuilder = requestBuilder.WithUrl(request.Url);
+            }
+            else if (request.UrlPattern != null)
+            {
+                requestBuilder = requestBuilder.WithUrl(new RegexMatcher(request.UrlPattern));
+            }
+            else if (request.UrlPath != null)
+            {
+                requestBuilder = requestBuilder.WithPath(request.UrlPath);
+            }
+            else if (request.UrlPathPattern != null)
+            {
+                requestBuilder = requestBuilder.WithPath(new RegexMatcher(request.UrlPathPattern));
+            }
+
+            if (request.Method != null)
+            {
+                requestBuilder = requestBuilder.UsingMethod(request.Method);
+            }
+
+            /*
+            "headers" : {
+              "Accept" : {
+                "contains" : "xml"
+              }
+            }
+            */
+            if (request.Headers is JObject headers)
+            {
+                ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) =>
+                {
+                    requestBuilder = requestBuilder.WithHeader(key, match);
+                });
+            }
+
+            if (request.Cookies is JObject cookies)
+            {
+                ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) =>
+                {
+                    requestBuilder = requestBuilder.WithCookie(key, match);
+                });
+            }
+
+            /*
+            "queryParameters" : {
+              "search_term" : {
+                "equalTo" : "WireMock"
+              }
+            }
+            */
+            if (request.QueryParameters is JObject queryParameters)
+            {
+                ProcessWireMockOrgJObjectAndUseStringMatcher(queryParameters, (key, match) =>
+                {
+                    requestBuilder = requestBuilder.WithParam(key, match);
+                });
+            }
+
+            /*
+             "bodyPatterns" : [ {
+              "equalToJson" : "{ "cityName": "São Paulo", "cityCode": 5001 },
+              "ignoreArrayOrder" : true,
+              "ignoreExtraElements" : true
+            } ]
+            */
+            if (request.BodyPatterns?.Any() == true)
+            {
+                var jObjectArray = request.BodyPatterns.Cast<JObject>();
+                var bodyPattern = jObjectArray.First();
+                ProcessWireMockOrgJObjectAndUseIMatcher(bodyPattern, match =>
+                {
+                    requestBuilder = requestBuilder.WithBody(match);
+                });
             }
         }
 
-        private Guid? ConvertWireMockOrgMappingAndRegisterAsRespondProvider(OrgMapping mapping, Guid? guid = null, string path = null)
+        IResponseBuilder responseBuilder = Response.Create();
+
+        var response = mapping.Response;
+        if (response != null)
         {
-            var requestBuilder = Request.Create();
+            responseBuilder = responseBuilder.WithStatusCode(response.Status);
 
-            var request = mapping.Request;
-            if (request != null)
+            if (response.Headers is JObject responseHeaders)
             {
-                if (request.Url != null)
+                var rb = responseBuilder;
+                ProcessWireMockOrgJObjectAndConvertToIDictionary(responseHeaders, headers =>
                 {
-                    requestBuilder = requestBuilder.WithUrl(request.Url);
-                }
-                else if (request.UrlPattern != null)
-                {
-                    requestBuilder = requestBuilder.WithUrl(new RegexMatcher(request.UrlPattern));
-                }
-                else if (request.UrlPath != null)
-                {
-                    requestBuilder = requestBuilder.WithPath(request.Url);
-                }
-                else if (request.UrlPathPattern != null)
-                {
-                    requestBuilder = requestBuilder.WithPath(new RegexMatcher(request.UrlPathPattern));
-                }
-
-                if (request.Method != null)
-                {
-                    requestBuilder = requestBuilder.UsingMethod(request.Method);
-                }
-
-                /*
-                "headers" : {
-                  "Accept" : {
-                    "contains" : "xml"
-                  }
-                }
-                */
-                if (request.Headers is JObject headers)
-                {
-                    ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) =>
-                    {
-                        requestBuilder = requestBuilder.WithHeader(key, match);
-                    });
-                }
-
-                if (request.Cookies is JObject cookies)
-                {
-                    ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) =>
-                    {
-                        requestBuilder = requestBuilder.WithCookie(key, match);
-                    });
-                }
-
-                /*
-                "queryParameters" : {
-                  "search_term" : {
-                    "equalTo" : "WireMock"
-                  }
-                }
-                */
-                if (request.QueryParameters is JObject queryParameters)
-                {
-                    ProcessWireMockOrgJObjectAndUseStringMatcher(queryParameters, (key, match) =>
-                    {
-                        requestBuilder = requestBuilder.WithParam(key, match);
-                    });
-                }
-
-                /*
-                 "bodyPatterns" : [ {
-                  "equalToJson" : "{ "cityName": "São Paulo", "cityCode": 5001 },
-                  "ignoreArrayOrder" : true,
-                  "ignoreExtraElements" : true
-                } ]
-                */
-                if (request.BodyPatterns?.Any() == true)
-                {
-                    var jObjectArray = request.BodyPatterns.Cast<JObject>();
-                    var bodyPattern = jObjectArray.First();
-                    ProcessWireMockOrgJObjectAndUseIMatcher(bodyPattern, (match) =>
-                    {
-                        requestBuilder = requestBuilder.WithBody(match);
-                    });
-                }
+                    rb = rb.WithHeaders(headers);
+                });
             }
 
-            IResponseBuilder responseBuilder = Response.Create();
-
-            var response = mapping.Response;
-            if (response != null)
+            if (response.Transformers != null)
             {
-                responseBuilder = responseBuilder.WithStatusCode(response.Status);
-
-                if (response.Headers is JObject responseHeaders)
-                {
-                    ProcessWireMockOrgJObjectAndConvertToIDictionary(responseHeaders, (headers) =>
-                    {
-                        responseBuilder = responseBuilder.WithHeaders(headers);
-                    });
-                }
-
-                if (response.Transformers != null)
-                {
-                    responseBuilder = responseBuilder.WithTransformer();
-                }
-
-                if (response.Body != null)
-                {
-                    responseBuilder = responseBuilder.WithBody(response.Body);
-                }
-
-                if (response.JsonBody != null)
-                {
-                    responseBuilder = responseBuilder.WithBodyAsJson(response.JsonBody);
-                }
-
-                if (response.Base64Body != null)
-                {
-                    responseBuilder = responseBuilder.WithBody(Encoding.UTF8.GetString(Convert.FromBase64String(response.Base64Body)));
-                }
-
-                if (response.BodyFileName != null)
-                {
-                    responseBuilder = responseBuilder.WithBodyFromFile(response.BodyFileName);
-                }
+                responseBuilder = responseBuilder.WithTransformer();
             }
 
-            var respondProvider = Given(requestBuilder);
-            if (guid != null)
+            if (response.Body != null)
             {
-                respondProvider = respondProvider.WithGuid(guid.Value);
-            }
-            else if (!string.IsNullOrEmpty(mapping.Uuid))
-            {
-                respondProvider = respondProvider.WithGuid(new Guid(mapping.Uuid));
+                responseBuilder = responseBuilder.WithBody(response.Body);
             }
 
-            if (mapping.Name != null)
+            if (response.JsonBody != null)
             {
-                respondProvider = respondProvider.WithTitle(mapping.Name);
+                responseBuilder = responseBuilder.WithBodyAsJson(response.JsonBody);
             }
 
-            if (path != null)
+            if (response.Base64Body != null)
             {
-                respondProvider = respondProvider.WithPath(path);
+                responseBuilder = responseBuilder.WithBody(Encoding.UTF8.GetString(Convert.FromBase64String(response.Base64Body)));
             }
 
-            respondProvider.RespondWith(responseBuilder);
-
-            return respondProvider.Guid;
-        }
-
-        private void ProcessWireMockOrgJObjectAndConvertToIDictionary(JObject items, Action<IDictionary<string, string>> action)
-        {
-            var dict = new Dictionary<string, string>();
-            foreach (var item in items)
+            if (response.BodyFileName != null)
             {
-                var key = item.Key;
-                var valueAsString = item.Value.Value<string>();
-                dict.Add(key, valueAsString);
-            }
-
-            action(dict);
-        }
-
-        private void ProcessWireMockOrgJObjectAndUseStringMatcher(JObject items, Action<string, IStringMatcher> action)
-        {
-            foreach (var item in items)
-            {
-                var key = item.Key;
-                var match = item.Value.First as JProperty;
-                var valueAsString = match?.Value.Value<string>();
-                if (string.IsNullOrEmpty(valueAsString))
-                {
-                    continue;
-                }
-
-                var matcher = ProcessAsStringMatcher(match, valueAsString);
-                if (matcher != null)
-                {
-                    action(key, matcher);
-                }
+                responseBuilder = responseBuilder.WithBodyFromFile(response.BodyFileName);
             }
         }
 
-        private void ProcessWireMockOrgJObjectAndUseIMatcher(JObject items, Action<IMatcher> action)
+        var respondProvider = Given(requestBuilder);
+        if (guid != null)
         {
-            if (!(items.First is JProperty firstItem))
+            respondProvider = respondProvider.WithGuid(guid.Value);
+        }
+        else if (!string.IsNullOrEmpty(mapping.Uuid))
+        {
+            respondProvider = respondProvider.WithGuid(new Guid(mapping.Uuid));
+        }
+
+        if (mapping.Name != null)
+        {
+            respondProvider = respondProvider.WithTitle(mapping.Name);
+        }
+
+        if (path != null)
+        {
+            respondProvider = respondProvider.WithPath(path);
+        }
+
+        respondProvider.RespondWith(responseBuilder);
+
+        return respondProvider.Guid;
+    }
+
+    private void ProcessWireMockOrgJObjectAndConvertToIDictionary(JObject items, Action<IDictionary<string, string>> action)
+    {
+        var dict = new Dictionary<string, string>();
+        foreach (var item in items)
+        {
+            var key = item.Key;
+            var valueAsString = item.Value?.Value<string>();
+            if (valueAsString == null)
+            {
+                // Skip if the item.Value is null or when the string value is null
+                continue;
+            }
+
+            dict.Add(key, valueAsString);
+        }
+
+        action(dict);
+    }
+
+    private void ProcessWireMockOrgJObjectAndUseStringMatcher(JObject items, Action<string, IStringMatcher> action)
+    {
+        foreach (var item in items)
+        {
+            var key = item.Key;
+            var match = item.Value?.First as JProperty;
+            if (match == null)
+            {
+                continue;
+            }
+
+            var valueAsString = match.Value.Value<string>();
+            if (string.IsNullOrEmpty(valueAsString))
+            {
+                continue;
+            }
+
+            var matcher = ProcessAsStringMatcher(match, valueAsString!);
+            if (matcher != null)
+            {
+                action(key, matcher);
+            }
+        }
+    }
+
+    private static void ProcessWireMockOrgJObjectAndUseIMatcher(JObject items, Action<IMatcher> action)
+    {
+        if (items.First is not JProperty firstItem)
+        {
+            return;
+        }
+
+        IMatcher? matcher;
+        if (firstItem.Name == "equalToJson")
+        {
+            matcher = new JsonMatcher(firstItem.Value);
+        }
+        else
+        {
+            if ((firstItem.Value as JValue)?.Value is not string valueAsString)
             {
                 return;
             }
 
-            IMatcher matcher;
-            if (firstItem.Name == "equalToJson")
-            {
-                matcher = new JsonMatcher(firstItem.Value);
-            }
-            else
-            {
-                var valueAsString = (firstItem.Value as JValue)?.Value as string;
-                if (valueAsString == null)
-                {
-                    return;
-                }
-
-                matcher = ProcessAsStringMatcher(firstItem, valueAsString);
-            }
-
-            if (matcher != null)
-            {
-                action(matcher);
-            }
+            matcher = ProcessAsStringMatcher(firstItem, valueAsString);
         }
 
-        private static IStringMatcher ProcessAsStringMatcher(JProperty match, string valueAsString)
+        if (matcher != null)
         {
-            switch (match?.Name)
-            {
-                case "contains":
-                    return new WildcardMatcher(valueAsString);
-
-                case "matches":
-                    return new RegexMatcher(valueAsString);
-
-                case "equalTo":
-                    return new ExactMatcher(valueAsString);
-
-                default:
-                    return null;
-            }
+            action(matcher);
         }
     }
+
+    private static IStringMatcher? ProcessAsStringMatcher(JProperty match, string valueAsString)
+    {
+        return match.Name switch
+        {
+            "contains" => new WildcardMatcher(valueAsString),
+            "matches" => new RegexMatcher(valueAsString),
+            "equalTo" => new ExactMatcher(valueAsString),
+            _ => null,
+        };
+    }
 }

src/WireMock.Net/Server/WireMockServer.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
@@ -12,6 +13,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Authentication;
 using WireMock.Exceptions;
 using WireMock.Handlers;
+using WireMock.Http;
 using WireMock.Logging;
 using WireMock.Matchers.Request;
 using WireMock.Owin;
@@ -101,6 +103,43 @@ public partial class WireMockServer : IWireMockServer
     }
     #endregion
 
+    #region HttpClient
+    /// <summary>
+    /// Create a <see cref="HttpClient"/> which can be used to call this instance.
+    /// </summary>
+    [PublicAPI]
+    public HttpClient CreateClient()
+    {
+        if (!IsStarted)
+        {
+            throw new InvalidOperationException("Unable to create HttpClient because the service is not started.");
+        }
+
+        var client = HttpClientFactory2.Create();
+        client.BaseAddress = new Uri(Url!);
+        return client;
+    }
+
+    /// <summary>
+    /// Create <see cref="HttpClient"/>s (one for each URL) which can be used to call this instance.
+    /// </summary>
+    [PublicAPI]
+    public HttpClient[] CreateClients()
+    {
+        if (!IsStarted)
+        {
+            throw new InvalidOperationException("Unable to create HttpClients because the service is not started.");
+        }
+
+        return Urls.Select(url =>
+        {
+            var client = HttpClientFactory2.Create();
+            client.BaseAddress = new Uri(url);
+            return client;
+        }).ToArray();
+    }
+    #endregion
+
     #region Start/Stop
     /// <summary>
     /// Starts this WireMockServer with the specified settings.

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,53 +1,52 @@
 using JetBrains.Annotations;
 
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+/// <summary>
+/// ProxyAndRecordSettings
+/// </summary>
+public class ProxyAndRecordSettings : HttpClientSettings
 {
     /// <summary>
-    /// ProxyAndRecordSettings
+    /// The URL to proxy.
     /// </summary>
-    public class ProxyAndRecordSettings : HttpClientSettings
-    {
-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
-        [PublicAPI]
-        public string Url { get; set; }
+    [PublicAPI]
+    public string Url { get; set; } = null!;
 
-        /// <summary>
-        /// Save the mapping for each request/response to the internal Mappings.
-        /// </summary>
-        [PublicAPI]
-        public bool SaveMapping { get; set; }
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    [PublicAPI]
+    public bool SaveMapping { get; set; }
 
-        /// <summary>
-        /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-        /// </summary>
-        [PublicAPI]
-        public bool SaveMappingToFile { get; set; }
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    [PublicAPI]
+    public bool SaveMappingToFile { get; set; }
 
-        /// <summary>
-        /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-        /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-        /// </summary>
-        [PublicAPI]
-        public string SaveMappingForStatusCodePattern { get; set; } = "*";
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    [PublicAPI]
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
 
-        /// <summary>
-        /// Defines a list from headers which will be excluded from the saved mappings.
-        /// </summary>
-        [PublicAPI]
-        public string[] ExcludedHeaders { get; set; }
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedHeaders { get; set; }
 
-        /// <summary>
-        /// Defines a list of cookies which will be excluded from the saved mappings.
-        /// </summary>
-        [PublicAPI]
-        public string[] ExcludedCookies { get; set; }
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedCookies { get; set; }
 
-        /// <summary>
-        /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-        /// </summary>
-        //[PublicAPI]
-        //public bool PreferProxyMapping { get; set; }
-    }
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    //[PublicAPI]
+    //public bool PreferProxyMapping { get; set; }
 }

src/WireMock.Net/Settings/WebProxySettings.cs

@@ -1,28 +1,27 @@
 using JetBrains.Annotations;
 
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+/// <summary>
+/// WebProxySettings
+/// </summary>
+public class WebProxySettings
 {
     /// <summary>
-    /// WebProxySettings
+    /// A string instance that contains the address of the proxy server.
     /// </summary>
-    public class WebProxySettings
-    {
-        /// <summary>
-        /// A string instance that contains the address of the proxy server.
-        /// </summary>
-        [PublicAPI]
-        public string Address { get; set; }
+    [PublicAPI]
+    public string Address { get; set; } = null!;
 
-        /// <summary>
-        /// The user name associated with the credentials.
-        /// </summary>
-        [PublicAPI]
-        public string UserName { get; set; }
+    /// <summary>
+    /// The user name associated with the credentials.
+    /// </summary>
+    [PublicAPI]
+    public string? UserName { get; set; }
 
-        /// <summary>
-        /// The password for the user name associated with the credentials.
-        /// </summary>
-        [PublicAPI]
-        public string Password { get; set; }
-    }
+    /// <summary>
+    /// The password for the user name associated with the credentials.
+    /// </summary>
+    [PublicAPI]
+    public string? Password { get; set; }
 }

src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs

@@ -1,35 +1,33 @@
 using System;
 using HandlebarsDotNet;
-using JetBrains.Annotations;
 using Stef.Validation;
 using WireMock.Handlers;
 
-namespace WireMock.Transformers.Handlebars
+namespace WireMock.Transformers.Handlebars;
+
+internal class HandlebarsContextFactory : ITransformerContextFactory
 {
-    internal class HandlebarsContextFactory : ITransformerContextFactory
+    private readonly IFileSystemHandler _fileSystemHandler;
+    private readonly Action<IHandlebars, IFileSystemHandler>? _action;
+
+    public HandlebarsContextFactory(IFileSystemHandler fileSystemHandler, Action<IHandlebars, IFileSystemHandler>? action)
     {
-        private readonly IFileSystemHandler _fileSystemHandler;
-        private readonly Action<IHandlebars, IFileSystemHandler> _action;
+        _fileSystemHandler = Guard.NotNull(fileSystemHandler);
+        _action = action;
+    }
 
-        public HandlebarsContextFactory([NotNull] IFileSystemHandler fileSystemHandler, [CanBeNull] Action<IHandlebars, IFileSystemHandler> action)
+    public ITransformerContext Create()
+    {
+        var handlebars = HandlebarsDotNet.Handlebars.Create();
+
+        WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);
+
+        _action?.Invoke(handlebars, _fileSystemHandler);
+
+        return new HandlebarsContext
         {
-            _fileSystemHandler = Guard.NotNull(fileSystemHandler);
-            _action = action;
-        }
-
-        public ITransformerContext Create()
-        {
-            var handlebars = HandlebarsDotNet.Handlebars.Create();
-
-            WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);
-
-            _action?.Invoke(handlebars, _fileSystemHandler);
-
-            return new HandlebarsContext
-            {
-                Handlebars = handlebars,
-                FileSystemHandler = _fileSystemHandler
-            };
-        }
+            Handlebars = handlebars,
+            FileSystemHandler = _fileSystemHandler
+        };
     }
 }

src/WireMock.Net/Transformers/ITransformer.cs

@@ -1,14 +1,12 @@
-using System;
 using System.Collections.Generic;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock.Transformers
-{
-    interface ITransformer
-    {
-        ResponseMessage Transform(IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options);
+namespace WireMock.Transformers;
 
-        (IBodyData BodyData, IDictionary<string, WireMockList<string>> Headers) Transform(IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, IBodyData bodyData, IDictionary<string, WireMockList<string>> headers, ReplaceNodeOptions options);
-    }
+interface ITransformer
+{
+    ResponseMessage Transform(IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options);
+
+    (IBodyData? BodyData, IDictionary<string, WireMockList<string>>? Headers) Transform(IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, IBodyData? bodyData, IDictionary<string, WireMockList<string>>? headers, ReplaceNodeOptions options);
 }

src/WireMock.Net/Transformers/Transformer.cs

@@ -1,270 +1,274 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Stef.Validation;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock.Transformers
+namespace WireMock.Transformers;
+
+internal class Transformer : ITransformer
 {
-    internal class Transformer : ITransformer
+    private readonly ITransformerContextFactory _factory;
+
+    public Transformer(ITransformerContextFactory factory)
     {
-        private readonly ITransformerContextFactory _factory;
+        _factory = Guard.NotNull(factory);
+    }
 
-        public Transformer([NotNull] ITransformerContextFactory factory)
+    public (IBodyData? BodyData, IDictionary<string, WireMockList<string>>? Headers) Transform(
+        IRequestMessage originalRequestMessage,
+        IResponseMessage originalResponseMessage,
+        IBodyData? bodyData,
+        IDictionary<string, WireMockList<string>>? headers,
+        ReplaceNodeOptions options)
+    {
+        var transformerContext = _factory.Create();
+
+        var model = new
         {
-            _factory = factory ?? throw new ArgumentNullException(nameof(factory));
+            request = originalRequestMessage,
+            response = originalResponseMessage
+        };
+
+        IBodyData? newBodyData = null;
+        if (bodyData?.DetectedBodyType != null)
+        {
+            newBodyData = TransformBodyData(transformerContext, options, model, bodyData, false);
         }
 
-        public (IBodyData BodyData, IDictionary<string, WireMockList<string>> Headers) Transform(IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage, IBodyData bodyData, IDictionary<string, WireMockList<string>> headers, ReplaceNodeOptions options)
+        return (newBodyData, TransformHeaders(transformerContext, model, headers));
+    }
+
+    public ResponseMessage Transform(IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options)
+    {
+        var transformerContext = _factory.Create();
+
+        var responseMessage = new ResponseMessage();
+
+        var model = new
         {
-            var transformerContext = _factory.Create();
+            request = requestMessage
+        };
 
-            var model = new
-            {
-                request = originalRequestMessage,
-                response = originalResponseMessage
-            };
+        if (original.BodyData?.DetectedBodyType != null)
+        {
+            responseMessage.BodyData = TransformBodyData(transformerContext, options, model, original.BodyData, useTransformerForBodyAsFile);
 
-            IBodyData newBodyData = null;
-            if (bodyData?.DetectedBodyType != null)
+            if (original.BodyData.DetectedBodyType == BodyType.String)
             {
-                newBodyData = TransformBodyData(transformerContext, options, model, bodyData, false);
+                responseMessage.BodyOriginal = original.BodyData.BodyAsString;
             }
-
-            return (newBodyData, TransformHeaders(transformerContext, model, headers));
         }
 
-        public ResponseMessage Transform(IRequestMessage requestMessage, IResponseMessage original, bool useTransformerForBodyAsFile, ReplaceNodeOptions options)
+        responseMessage.FaultType = original.FaultType;
+        responseMessage.FaultPercentage = original.FaultPercentage;
+
+        responseMessage.Headers = TransformHeaders(transformerContext, model, original.Headers);
+
+        switch (original.StatusCode)
         {
-            var transformerContext = _factory.Create();
+            case int statusCodeAsInteger:
+                responseMessage.StatusCode = statusCodeAsInteger;
+                break;
 
-            var responseMessage = new ResponseMessage();
+            case string statusCodeAsString:
+                responseMessage.StatusCode = transformerContext.ParseAndRender(statusCodeAsString, model);
+                break;
+        }
 
-            var model = new
-            {
-                request = requestMessage
-            };
+        return responseMessage;
+    }
 
-            if (original.BodyData?.DetectedBodyType != null)
-            {
-                responseMessage.BodyData = TransformBodyData(transformerContext, options, model, original.BodyData, useTransformerForBodyAsFile);
+    private static IBodyData TransformBodyData(ITransformerContext transformerContext, ReplaceNodeOptions options, object model, IBodyData original, bool useTransformerForBodyAsFile)
+    {
+        switch (original?.DetectedBodyType)
+        {
+            case BodyType.Json:
+                return TransformBodyAsJson(transformerContext, options, model, original);
 
-                if (original.BodyData.DetectedBodyType == BodyType.String)
+            case BodyType.File:
+                return TransformBodyAsFile(transformerContext, model, original, useTransformerForBodyAsFile);
+
+            case BodyType.String:
+                return TransformBodyAsString(transformerContext, model, original);
+
+            default:
+                return null;
+        }
+    }
+
+    private static IDictionary<string, WireMockList<string>> TransformHeaders(ITransformerContext transformerContext, object model, IDictionary<string, WireMockList<string>>? original)
+    {
+        if (original == null)
+        {
+            return new Dictionary<string, WireMockList<string>>();
+        }
+
+        var newHeaders = new Dictionary<string, WireMockList<string>>();
+        foreach (var header in original)
+        {
+            var headerKey = transformerContext.ParseAndRender(header.Key, model);
+            var templateHeaderValues = header.Value.Select(text => transformerContext.ParseAndRender(text, model)).ToArray();
+
+            newHeaders.Add(headerKey, new WireMockList<string>(templateHeaderValues));
+        }
+
+        return newHeaders;
+    }
+
+    private static IBodyData TransformBodyAsJson(ITransformerContext handlebarsContext, ReplaceNodeOptions options, object model, IBodyData original)
+    {
+        JToken? jToken = null;
+        switch (original.BodyAsJson)
+        {
+            case JObject bodyAsJObject:
+                jToken = bodyAsJObject.DeepClone();
+                WalkNode(handlebarsContext, options, jToken, model);
+                break;
+
+            case JArray bodyAsJArray:
+                jToken = bodyAsJArray.DeepClone();
+                WalkNode(handlebarsContext, options, jToken, model);
+                break;
+
+            case Array bodyAsArray:
+                jToken = JArray.FromObject(bodyAsArray);
+                WalkNode(handlebarsContext, options, jToken, model);
+                break;
+
+            case string bodyAsString:
+                jToken = ReplaceSingleNode(handlebarsContext, options, bodyAsString, model);
+                break;
+
+            case not null:
+                jToken = JObject.FromObject(original.BodyAsJson);
+                WalkNode(handlebarsContext, options, jToken, model);
+                break;
+        }
+
+        return new BodyData
+        {
+            Encoding = original.Encoding,
+            DetectedBodyType = original.DetectedBodyType,
+            DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+            BodyAsJson = jToken
+        };
+    }
+
+    private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, string stringValue, object model)
+    {
+        string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
+
+        if (!string.Equals(stringValue, transformedString))
+        {
+            const string property = "_";
+            JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
+            JToken node = dummy[property];
+
+            ReplaceNodeValue(options, node, transformedString);
+
+            return dummy[property];
+        }
+
+        return stringValue;
+    }
+
+    private static void WalkNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, JToken node, object model)
+    {
+        switch (node.Type)
+        {
+            case JTokenType.Object:
+                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (var child in node.Children<JProperty>().ToArray())
                 {
-                    responseMessage.BodyOriginal = original.BodyData.BodyAsString;
+                    WalkNode(handlebarsContext, options, child.Value, model);
                 }
-            }
+                break;
 
-            responseMessage.FaultType = original.FaultType;
-            responseMessage.FaultPercentage = original.FaultPercentage;
-
-            responseMessage.Headers = TransformHeaders(transformerContext, model, original.Headers);
-
-            switch (original.StatusCode)
-            {
-                case int statusCodeAsInteger:
-                    responseMessage.StatusCode = statusCodeAsInteger;
-                    break;
-
-                case string statusCodeAsString:
-                    responseMessage.StatusCode = transformerContext.ParseAndRender(statusCodeAsString, model);
-                    break;
-            }
-
-            return responseMessage;
-        }
-
-        private static IBodyData TransformBodyData(ITransformerContext transformerContext, ReplaceNodeOptions options, object model, IBodyData original, bool useTransformerForBodyAsFile)
-        {
-            switch (original?.DetectedBodyType)
-            {
-                case BodyType.Json:
-                    return TransformBodyAsJson(transformerContext, options, model, original);
-
-                case BodyType.File:
-                    return TransformBodyAsFile(transformerContext, model, original, useTransformerForBodyAsFile);
-
-                case BodyType.String:
-                    return TransformBodyAsString(transformerContext, model, original);
-
-                default:
-                    return null;
-            }
-        }
-
-        private static IDictionary<string, WireMockList<string>> TransformHeaders(ITransformerContext transformerContext, object model, IDictionary<string, WireMockList<string>> original)
-        {
-            if (original == null)
-            {
-                return new Dictionary<string, WireMockList<string>>();
-            }
-
-            var newHeaders = new Dictionary<string, WireMockList<string>>();
-            foreach (var header in original)
-            {
-                var headerKey = transformerContext.ParseAndRender(header.Key, model);
-                var templateHeaderValues = header.Value.Select(text => transformerContext.ParseAndRender(text, model)).ToArray();
-
-                newHeaders.Add(headerKey, new WireMockList<string>(templateHeaderValues));
-            }
-
-            return newHeaders;
-        }
-
-        private static IBodyData TransformBodyAsJson(ITransformerContext handlebarsContext, ReplaceNodeOptions options, object model, IBodyData original)
-        {
-            JToken jToken;
-            switch (original.BodyAsJson)
-            {
-                case JObject bodyAsJObject:
-                    jToken = bodyAsJObject.DeepClone();
-                    WalkNode(handlebarsContext, options, jToken, model);
-                    break;
-
-                case JArray bodyAsJArray:
-                    jToken = bodyAsJArray.DeepClone();
-                    WalkNode(handlebarsContext, options, jToken, model);
-                    break;
-
-                case Array bodyAsArray:
-                    jToken = JArray.FromObject(bodyAsArray);
-                    WalkNode(handlebarsContext, options, jToken, model);
-                    break;
-
-                case string bodyAsString:
-                    jToken = ReplaceSingleNode(handlebarsContext, options, bodyAsString, model);
-                    break;
-
-                default:
-                    jToken = JObject.FromObject(original.BodyAsJson);
-                    WalkNode(handlebarsContext, options, jToken, model);
-                    break;
-            }
-
-            return new BodyData
-            {
-                Encoding = original.Encoding,
-                DetectedBodyType = original.DetectedBodyType,
-                DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-                BodyAsJson = jToken
-            };
-        }
-
-        private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, string stringValue, object model)
-        {
-            string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
-
-            if (!string.Equals(stringValue, transformedString))
-            {
-                const string property = "_";
-                JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
-                JToken node = dummy[property];
-
-                ReplaceNodeValue(options, node, transformedString);
-
-                return dummy[property];
-            }
-
-            return stringValue;
-        }
-
-        private static void WalkNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, JToken node, object model)
-        {
-            switch (node.Type)
-            {
-                case JTokenType.Object:
-                    // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
-                    foreach (var child in node.Children<JProperty>().ToArray())
-                    {
-                        WalkNode(handlebarsContext, options, child.Value, model);
-                    }
-                    break;
-
-                case JTokenType.Array:
-                    // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
-                    foreach (var child in node.Children().ToArray())
-                    {
-                        WalkNode(handlebarsContext, options, child, model);
-                    }
-                    break;
-
-                case JTokenType.String:
-                    // In case of string, try to transform the value.
-                    string stringValue = node.Value<string>();
-                    if (string.IsNullOrEmpty(stringValue))
-                    {
-                        return;
-                    }
-
-                    string transformed = handlebarsContext.ParseAndRender(stringValue, model);
-                    if (!string.Equals(stringValue, transformed))
-                    {
-                        ReplaceNodeValue(options, node, transformed);
-                    }
-                    break;
-            }
-        }
-
-        private static void ReplaceNodeValue(ReplaceNodeOptions options, JToken node, string transformedString)
-        {
-            StringUtils.TryParseQuotedString(transformedString, out var result, out _);
-            if (bool.TryParse(result, out var valueAsBoolean) || bool.TryParse(transformedString, out valueAsBoolean))
-            {
-                node.Replace(valueAsBoolean);
-                return;
-            }
-
-            JToken value;
-            try
-            {
-                // Try to convert this string into a JsonObject
-                value = JToken.Parse(transformedString);
-            }
-            catch (JsonException)
-            {
-                // Ignore JsonException and just keep string value and convert to JToken
-                value = transformedString;
-            }
-
-            node.Replace(value);
-        }
-
-        private static IBodyData TransformBodyAsString(ITransformerContext handlebarsContext, object model, IBodyData original)
-        {
-            return new BodyData
-            {
-                Encoding = original.Encoding,
-                DetectedBodyType = original.DetectedBodyType,
-                DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-                BodyAsString = handlebarsContext.ParseAndRender(original.BodyAsString, model)
-            };
-        }
-
-        private static IBodyData TransformBodyAsFile(ITransformerContext handlebarsContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
-        {
-            string transformedBodyAsFilename = handlebarsContext.ParseAndRender(original.BodyAsFile, model);
-
-            if (!useTransformerForBodyAsFile)
-            {
-                return new BodyData
+            case JTokenType.Array:
+                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
+                foreach (var child in node.Children().ToArray())
                 {
-                    DetectedBodyType = original.DetectedBodyType,
-                    DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-                    BodyAsFile = transformedBodyAsFilename
-                };
-            }
+                    WalkNode(handlebarsContext, options, child, model);
+                }
+                break;
 
-            string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
+            case JTokenType.String:
+                // In case of string, try to transform the value.
+                var stringValue = node.Value<string>();
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    return;
+                }
+
+                string transformed = handlebarsContext.ParseAndRender(stringValue!, model);
+                if (!string.Equals(stringValue, transformed))
+                {
+                    ReplaceNodeValue(options, node, transformed);
+                }
+                break;
+        }
+    }
+
+    private static void ReplaceNodeValue(ReplaceNodeOptions options, JToken node, string transformedString)
+    {
+        StringUtils.TryParseQuotedString(transformedString, out var result, out _);
+        if (bool.TryParse(result, out var valueAsBoolean) || bool.TryParse(transformedString, out valueAsBoolean))
+        {
+            node.Replace(valueAsBoolean);
+            return;
+        }
+
+        JToken value;
+        try
+        {
+            // Try to convert this string into a JsonObject
+            value = JToken.Parse(transformedString);
+        }
+        catch (JsonException)
+        {
+            // Ignore JsonException and just keep string value and convert to JToken
+            value = transformedString;
+        }
+
+        node.Replace(value);
+    }
+
+    private static IBodyData TransformBodyAsString(ITransformerContext handlebarsContext, object model, IBodyData original)
+    {
+        return new BodyData
+        {
+            Encoding = original.Encoding,
+            DetectedBodyType = original.DetectedBodyType,
+            DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+            BodyAsString = handlebarsContext.ParseAndRender(original.BodyAsString, model)
+        };
+    }
+
+    private static IBodyData TransformBodyAsFile(ITransformerContext handlebarsContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
+    {
+        string transformedBodyAsFilename = handlebarsContext.ParseAndRender(original.BodyAsFile, model);
+
+        if (!useTransformerForBodyAsFile)
+        {
             return new BodyData
             {
-                DetectedBodyType = BodyType.String,
+                DetectedBodyType = original.DetectedBodyType,
                 DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-                BodyAsString = handlebarsContext.ParseAndRender(text, model),
                 BodyAsFile = transformedBodyAsFilename
             };
         }
+
+        string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
+        return new BodyData
+        {
+            DetectedBodyType = BodyType.String,
+            DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
+            BodyAsString = handlebarsContext.ParseAndRender(text, model),
+            BodyAsFile = transformedBodyAsFilename
+        };
     }
 }

src/WireMock.Net/Util/JsonUtils.cs

@@ -87,7 +87,7 @@ internal static class JsonUtils
     /// </summary>
     /// <param name="json">A System.String that contains JSON.</param>
     /// <returns>A Newtonsoft.Json.Linq.JToken populated from the string that contains JSON.</returns>
-    public static JToken Parse(string json)
+    public static JToken? Parse(string json)
     {
         return JsonConvert.DeserializeObject<JToken>(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
     }
@@ -98,7 +98,7 @@ internal static class JsonUtils
     /// </summary>
     /// <param name="json">A System.String that contains JSON.</param>
     /// <returns>The deserialized object from the JSON string.</returns>
-    public static object DeserializeObject(string json)
+    public static object? DeserializeObject(string json)
     {
         return JsonConvert.DeserializeObject(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
     }
@@ -109,21 +109,18 @@ internal static class JsonUtils
     /// </summary>
     /// <param name="json">A System.String that contains JSON.</param>
     /// <returns>The deserialized object from the JSON string.</returns>
-    public static T DeserializeObject<T>(string json)
+    public static T? DeserializeObject<T>(string json)
     {
         return JsonConvert.DeserializeObject<T>(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
     }
 
-    public static T ParseJTokenToObject<T>(object value)
+    public static T? ParseJTokenToObject<T>(object value)
     {
-        switch (value)
+        return value switch
         {
-            case JToken tokenValue:
-                return tokenValue.ToObject<T>();
-
-            default:
-                return default(T);
-        }
+            JToken tokenValue => tokenValue.ToObject<T>(),
+            _ => default
+        };
     }
 
     public static string GenerateDynamicLinqStatement(JToken jsonObject)

src/WireMock.Net/Util/StringUtils.cs

@@ -1,42 +1,51 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.RegularExpressions;
+using WireMock.Matchers;
 
-namespace WireMock.Util
+namespace WireMock.Util;
+
+internal static class StringUtils
 {
-    internal static class StringUtils
+    public static MatchOperator ParseMatchOperator(string? value)
     {
-        public static bool TryParseQuotedString(string value, out string result, out char quote)
+        return value != null && Enum.TryParse<MatchOperator>(value, out var matchOperator)
+            ? matchOperator
+            : MatchOperator.Or;
+    }
+
+    public static bool TryParseQuotedString(string? value, [NotNullWhen(true)] out string? result, out char quote)
+    {
+        result = null;
+        quote = '\0';
+
+        if (value == null || value.Length < 2)
         {
-            result = null;
-            quote = '\0';
-
-            if (value == null || value.Length < 2)
-            {
-                return false;
-            }
-
-            quote = value[0]; // This can be single or a double quote
-            if (quote != '"' && quote != '\'')
-            {
-                return false;
-            }
-
-            if (value.Last() != quote)
-            {
-                return false;
-            }
-
-            try
-            {
-                result = Regex.Unescape(value.Substring(1, value.Length - 2));
-                return true;
-            }
-            catch
-            {
-                // Ignore Exception, just continue and return false.
-            }
-
             return false;
         }
+
+        quote = value[0]; // This can be single or a double quote
+        if (quote != '"' && quote != '\'')
+        {
+            return false;
+        }
+
+        if (value.Last() != quote)
+        {
+            return false;
+        }
+
+        try
+        {
+            result = Regex.Unescape(value.Substring(1, value.Length - 2));
+            return true;
+        }
+        catch
+        {
+            // Ignore Exception, just continue and return false.
+        }
+
+        return false;
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -79,6 +79,7 @@
     <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
         <PackageReference Include="XPath2.Extensions" Version="1.1.3" />
         <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.12.2" />
+        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
@@ -145,6 +146,12 @@
         </Compile>
     </ItemGroup>
 
+    <ItemGroup>
+        <Compile Update="RequestBuilders\Request.*.cs">
+            <DependentUpon>Request.cs</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.5" />
         <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.5" />
@@ -159,4 +166,4 @@
         <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />
     </ItemGroup>
-</Project>
+</Project>

src/WireMock.Org.Abstractions/GetAdminMappingsByStubMappingIdResult.cs

@@ -0,0 +1,59 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminMappingsByStubMappingIdResult
+    {
+        /// <summary>
+        /// This stub mapping's unique identifier
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Alias for the id
+        /// </summary>
+        public string Uuid { get; set; }
+
+        /// <summary>
+        /// The stub mapping's name
+        /// </summary>
+        public string Name { get; set; }
+
+        public WireMockOrgRequest Request { get; set; }
+
+        public WireMockOrgResponse Response { get; set; }
+
+        /// <summary>
+        /// Indicates that the stub mapping should be persisted immediately on create/update/delete and survive resets to default.
+        /// </summary>
+        public bool Persistent { get; set; }
+
+        /// <summary>
+        /// This stub mapping's priority relative to others. 1 is highest.
+        /// </summary>
+        public int Priority { get; set; }
+
+        /// <summary>
+        /// The name of the scenario that this stub mapping is part of
+        /// </summary>
+        public string ScenarioName { get; set; }
+
+        /// <summary>
+        /// The required state of the scenario in order for this stub to be matched.
+        /// </summary>
+        public string RequiredScenarioState { get; set; }
+
+        /// <summary>
+        /// The new state for the scenario to be updated to after this stub is served.
+        /// </summary>
+        public string NewScenarioState { get; set; }
+
+        /// <summary>
+        /// A map of the names of post serve action extensions to trigger and their parameters.
+        /// </summary>
+        public object PostServeActions { get; set; }
+
+        /// <summary>
+        /// Arbitrary metadata to be used for e.g. tagging, documentation. Can also be used to find and remove stubs.
+        /// </summary>
+        public object Metadata { get; set; }
+    }
+}

src/WireMock.Org.Abstractions/GetAdminMappingsResponse.cs

@@ -1,9 +0,0 @@
-namespace WireMock.Org.Abstractions
-{
-    public class GetAdminMappingsResponse
-    {
-        public Mapping[] Mappings { get; set; }
-
-        public Meta Meta { get; set; }
-    }
-}

src/WireMock.Org.Abstractions/GetAdminMappingsResult.cs

@@ -0,0 +1,9 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminMappingsResult
+    {
+        public Mappings Mappings { get; set; }
+
+        public Meta Meta { get; set; }
+    }
+}

src/WireMock.Org.Abstractions/GetAdminRecordingsStatusResult.cs

@@ -1,7 +1,7 @@
 namespace WireMock.Org.Abstractions
 {
-    public class GetAdminRecordingsStatusResponse
+    public class GetAdminRecordingsStatusResult
     {
         public string Status { get; set; }
     }
-}
+}