1.5.28

* WireMock.Net.Testcontainers

* .

* logger?

* .

* .

* WatchStaticMappings

* linux

* .

* --

* ContainerInfo

* .

* 02

* .

* fix

* .

CHANGELOG.md

@@ -1,3 +1,45 @@
+# 1.5.28 (11 June 2023)
+- [#948](https://github.com/WireMock-Net/WireMock.Net/pull/948) - WireMock.Net.Testcontainers [feature] contributed by [StefH](https://github.com/StefH)
+- [#951](https://github.com/WireMock-Net/WireMock.Net/pull/951) - Allow setting the Content-Length header for a HTTP method HEAD [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.27 (03 June 2023)
+- [#946](https://github.com/WireMock-Net/WireMock.Net/pull/946) - Add warning logging when sending a request to a Webhook does not return status 200 [feature] contributed by [StefH](https://github.com/StefH)
+- [#949](https://github.com/WireMock-Net/WireMock.Net/pull/949) - Add ".NET Framework 4.7" to WireMock.Net.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#928](https://github.com/WireMock-Net/WireMock.Net/issues/928) - TypeLoadException when using WithHeader method. [bug]
+- [#945](https://github.com/WireMock-Net/WireMock.Net/issues/945) - Webhook logging [feature]
+
+# 1.5.26 (25 May 2023)
+- [#938](https://github.com/WireMock-Net/WireMock.Net/pull/938) - Add more unitests for CSharpFormatter utils [test] contributed by [StefH](https://github.com/StefH)
+- [#939](https://github.com/WireMock-Net/WireMock.Net/pull/939) - WireMockMiddleware should use HandleRequestsSynchronously correctly [bug] contributed by [StefH](https://github.com/StefH)
+- [#940](https://github.com/WireMock-Net/WireMock.Net/pull/940) - Code generator improvements contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#942](https://github.com/WireMock-Net/WireMock.Net/pull/942) - Add GetParameter method to IRequestMessage [feature] contributed by [StefH](https://github.com/StefH)
+- [#941](https://github.com/WireMock-Net/WireMock.Net/issues/941) - RequestMessage.GetParameter method missing from IRequestMessage interface [feature]
+
+# 1.5.25 (13 May 2023)
+- [#934](https://github.com/WireMock-Net/WireMock.Net/pull/934) - Code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.24 (07 May 2023)
+- [#926](https://github.com/WireMock-Net/WireMock.Net/pull/926) - Fix C# mapping code generator for header names [bug] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#927](https://github.com/WireMock-Net/WireMock.Net/pull/927) - Enrich generated code with status code [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#930](https://github.com/WireMock-Net/WireMock.Net/pull/930) - Update C# mapping code generator for WithStatusCode [feature] contributed by [StefH](https://github.com/StefH)
+- [#931](https://github.com/WireMock-Net/WireMock.Net/pull/931) - Add property 'IsStartedWithAdminInterface' to 'IWireMockServer' [feature] contributed by [StefH](https://github.com/StefH)
+- [#933](https://github.com/WireMock-Net/WireMock.Net/pull/933) - C# code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.23 (23 April 2023)
+- [#922](https://github.com/WireMock-Net/WireMock.Net/pull/922) - Add WithProbability [feature] contributed by [StefH](https://github.com/StefH)
+- [#924](https://github.com/WireMock-Net/WireMock.Net/pull/924) - Allow removal of prefix when proxying to another server (#630) [feature] contributed by [nudejustin](https://github.com/nudejustin)
+- [#925](https://github.com/WireMock-Net/WireMock.Net/pull/925) - Add IgnoreCase option to ProxyUrlReplaceSettings [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.22 (08 April 2023)
+- [#914](https://github.com/WireMock-Net/WireMock.Net/pull/914) - #912 add excluded params to proxy mapping [feature] contributed by [walidhaidarii](https://github.com/walidhaidarii)
+- [#916](https://github.com/WireMock-Net/WireMock.Net/pull/916) - Include WireMockOpenApiParser project [feature] contributed by [StefH](https://github.com/StefH)
+- [#912](https://github.com/WireMock-Net/WireMock.Net/issues/912) - Feature: adding excluded params to proxy and records settings [feature]
+
+# 1.5.21 (22 March 2023)
+- [#908](https://github.com/WireMock-Net/WireMock.Net/pull/908) - RequestBuilder : add WithBodyAsJson and WithBody (with IJsonConverter) [feature] contributed by [StefH](https://github.com/StefH)
+- [#911](https://github.com/WireMock-Net/WireMock.Net/pull/911) - Fixed QueryStringParser for UrlEncoded values [bug] contributed by [StefH](https://github.com/StefH)
+- [#901](https://github.com/WireMock-Net/WireMock.Net/issues/901) - Matching one form-urlencoded value [feature]
+
 # 1.5.20 (19 March 2023)
 - [#905](https://github.com/WireMock-Net/WireMock.Net/pull/905) - Add DeserializeFormUrl Encoded to the settings [feature] contributed by [StefH](https://github.com/StefH)
 - [#907](https://github.com/WireMock-Net/WireMock.Net/pull/907) - Fix issue with application/x-www-form-urlencoded and ExactMatcher [bug] contributed by [StefH](https://github.com/StefH)
@@ -6,7 +48,6 @@
 # 1.5.19 (17 March 2023)
 - [#903](https://github.com/WireMock-Net/WireMock.Net/pull/903) - Add WithBody with IDictionary (form-urlencoded values) [feature] contributed by [StefH](https://github.com/StefH)
 - [#904](https://github.com/WireMock-Net/WireMock.Net/pull/904) - Update Handlebars.Net.Helpers to 2.3.15 [feature] contributed by [StefH](https://github.com/StefH)
-- [#901](https://github.com/WireMock-Net/WireMock.Net/issues/901) - Matching one form-urlencoded value [feature]
 
 # 1.5.18 (09 March 2023)
 - [#893](https://github.com/WireMock-Net/WireMock.Net/pull/893) - Add 'Data' to response which can be used during transforming the response [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.20</VersionPrefix>
+        <VersionPrefix>1.5.28</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -12,6 +12,7 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+        <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
         <LangVersion>Latest</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -29,7 +30,7 @@
 
     <ItemGroup>
         <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
-        <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
+        <None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
     <Choose>

Generate-ReleaseNotes.cmd

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

PackageReadme.md

@@ -0,0 +1,55 @@
+## WireMock.Net
+Lightweight Http Mocking Server for .NET, inspired by [WireMock(http://WireMock.org) from the Java landscape.
+
+### :star: Key Features
+* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
+* Library can be used in unit tests and integration tests
+* Runs as a standalone process, as windows service, as Azure/IIS or as docker
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
+* Record/playback of stubs (proxying)
+* Per-request conditional proxying
+* Stateful behaviour simulation
+* Response templating / transformation using Handlebars and extensions
+* Can be used locally or in CI/CD scenarios
+
+### :star: Stubbing
+A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
+See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
+
+### :star: Request Matching
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
+
+### :star: Response Templating
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
+
+### :star: Admin API Reference
+The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+
+### :star: Using
+WireMock.Net can be used in several ways:
+
+#### UnitTesting
+You can use your favorite test framework and use WireMock within your tests, see
+[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+
+#### As a dotnet tool
+It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+
+#### As standalone process / console application
+This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+
+#### As a Windows Service
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+
+#### As a Web Job in Azure or application in IIS
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+
+#### In a docker container
+There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
+For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).
+
+#### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+
+## :books: Documentation
+For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).

PackageReleaseNotes.txt

@@ -1,6 +1,5 @@
-# 1.5.20 (19 March 2023)
-- #905 Add DeserializeFormUrl Encoded to the settings [feature]
-- #907 Fix issue with application/x-www-form-urlencoded and ExactMatcher [bug]
-- #906 Upgrade to 1.5.19 breaks a form data test [bug]
+# 1.5.28 (11 June 2023)
+- #948 WireMock.Net.Testcontainers [feature]
+- #951 Allow setting the Content-Length header for a HTTP method HEAD [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -1,24 +1,28 @@
 # WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock.org](http://WireMock.org).
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://WireMock.org).
 
 For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).
 
-## Key Features
+## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
 * Library can be used in unit tests and integration tests
 * Runs as a standalone process, as windows service, as Azure/IIS or as docker
-* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
 * Record/playback of stubs (proxying)
 * Per-request conditional proxying
 * Stateful behaviour simulation
 * Response templating / transformation using Handlebars and extensions
 * Can be used locally or in CI/CD scenarios
 
-## Info
+## :memo: Blogs
+- [mStack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode/)
+
+
+## :computer: Project Info
 | | |
 | --- | --- |
 | ***Project*** |   |
-|   **Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+|   **Chat** | [![Slack](https://badgen.net/badge/icon/slack?icon=slack&label)](https://slack.wiremock.org/) [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
 |   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
 | | |
 | ***Quality*** |   |
@@ -27,7 +31,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 |   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
 |   **Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)|
 
-### NuGet packages
+### :package: NuGet packages
 
 | | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
@@ -38,39 +42,42 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 |   **WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 |   **WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 |   **WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+|   **WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
 |   **WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
 
 
-## Development
+## :memo: Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
 
-## Stubbing
+## :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
 See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
 
-## Request Matching
+## :star: Request Matching
 WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
 
-## Response Templating
+## :star: Response Templating
 The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
 
-## Admin API Reference
+## :star: Admin API Reference
 The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
 
-## Using
+## :star: Using
 WireMock.Net can be used in several ways:
 
 ### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
 
+### Unit/Integration Testing using Testcontainers.DotNet
+You can use [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+
 ### As a dotnet tool
 It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
 
 ### As standalone process / console application
 This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
 
-
 ### As a Windows Service
 You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
 

WireMock.Net Solution.sln

@@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\FUNDING.yml = .github\FUNDING.yml
 		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
 		nuget.config = nuget.config
+		PackageReadme.md = PackageReadme.md
 		PackageReleaseNotes.template = PackageReleaseNotes.template
 		PackageReleaseNotes.txt = PackageReleaseNotes.txt
 		README.md = README.md
@@ -110,6 +111,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Testcontainers", "src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj", "{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TestcontainersExample", "examples\WireMock.Net.TestcontainersExample\WireMock.Net.TestcontainersExample.csproj", "{56A38798-C48B-4A4A-B805-071E05C02CE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -264,6 +269,14 @@ Global
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -308,6 +321,8 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{56A38798-C48B-4A4A-B805-071E05C02CE1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

WireMock.Net Solution.sln.DotSettings

@@ -10,6 +10,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
@@ -27,10 +28,12 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sheyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>

examples/WireMock.Net.OpenApiParser.ConsoleApp/DynamicDataGeneration.cs

@@ -11,7 +11,7 @@ public class DynamicDataGeneration : WireMockOpenApiParserDynamicExampleValues
         get
         {
             // Since you have your Schema, you can get if max-length is set. You can generate accurate examples with this settings
-            var maxLength = Schema.MaxLength ?? 9;
+            var maxLength = Schema?.MaxLength ?? 9;
 
             return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex
             {

examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs

@@ -17,7 +17,7 @@ class Program
 
     private static void RunMockServerWithDynamicExampleGeneration()
     {
-        //Run your mocking framework specifieing youur Example Values generator class.
+        // Run your mocking framework specifying your Example Values generator class.
         var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), Types.ExampleValueType.Value, Types.ExampleValueType.Value);
         Console.WriteLine("Press any key to stop the servers");
 
@@ -27,15 +27,15 @@ class Program
 
     private static void RunOthersOpenApiParserExample()
     {
-        var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "https://localhost:9091/");
-        var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "https://localhost:9092/");
-        var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "https://localhost:9093/");
-        var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "https://localhost:9094/");
-        var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "https://localhost:9095/");
-        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "https://localhost:9096/");
-        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "https://localhost:9097/");
-        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "https://localhost:9098/");
-        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "https://localhost:9099/");
+        var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "http://localhost:9091/");
+        var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "http://localhost:9092/");
+        var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "http://localhost:9093/");
+        var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "http://localhost:9094/");
+        var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "http://localhost:9095/");
+        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "http://localhost:9096/");
+        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "http://localhost:9097/");
+        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "http://localhost:9098/");
+        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "http://localhost:9099/");
 
         testopenapifile_json
             .Given(Request.Create().WithPath("/x").UsingGet())

examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs

@@ -9,64 +9,70 @@ using WireMock.Net.OpenApiParser.Types;
 using WireMock.Server;
 using WireMock.Settings;
 
-namespace WireMock.Net.OpenApiParser.ConsoleApp
+namespace WireMock.Net.OpenApiParser.ConsoleApp;
+
+public static class Run
 {
-    public static class Run
+    public static WireMockServer RunServer(
+        string path,
+        string url,
+        bool dynamicExamples = true,
+        IWireMockOpenApiParserExampleValues? examplesValuesGenerator = null,
+        ExampleValueType pathPatternToUse = ExampleValueType.Wildcard,
+        ExampleValueType headerPatternToUse = ExampleValueType.Wildcard
+    )
     {
-        public static WireMockServer RunServer(string path, string url, bool dynamicExamples = true, IWireMockOpenApiParserExampleValues examplesValuesGenerator =  null, ExampleValueType pathPatternToUse = ExampleValueType.Wildcard, ExampleValueType headerPatternToUse = ExampleValueType.Wildcard)
+        var server = WireMockServer.Start(new WireMockServerSettings
         {
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url },
-                StartAdminInterface = true,
-                ReadStaticMappings = true,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-                SaveUnmatchedRequests = true
-            });
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url },
+            StartAdminInterface = true,
+            ReadStaticMappings = true,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+            SaveUnmatchedRequests = true
+        });
 
-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
 
-            //server.SetBasicAuthentication("a", "b");
+        //server.SetBasicAuthentication("a", "b");
 
-            var settings = new WireMockOpenApiParserSettings
-            {
-                DynamicExamples = dynamicExamples,
-                ExampleValues = examplesValuesGenerator,
-                PathPatternToUse = pathPatternToUse,
-                HeaderPatternToUse = headerPatternToUse,
-            };
-
-            server.WithMappingFromOpenApiFile(path, settings, out var diag);
-
-            return server;
-        }
-
-        public static void RunServer(IEnumerable<MappingModel> mappings)
+        var settings = new WireMockOpenApiParserSettings
         {
-            string url1 = "http://localhost:9091/";
+            DynamicExamples = dynamicExamples,
+            ExampleValues = examplesValuesGenerator,
+            PathPatternToUse = pathPatternToUse,
+            HeaderPatternToUse = headerPatternToUse,
+        };
 
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1 },
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-            });
-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        server.WithMappingFromOpenApiFile(path, settings, out var diag);
 
-            server.SetBasicAuthentication("a", "b");
+        return server;
+    }
 
-            server.WithMapping(mappings.ToArray());
+    public static void RunServer(IEnumerable<MappingModel> mappings)
+    {
+        string url1 = "http://localhost:9091/";
 
-            Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url1 },
+            StartAdminInterface = true,
+            ReadStaticMappings = false,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+        });
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+
+        server.SetBasicAuthentication("a", "b");
+
+        server.WithMapping(mappings.ToArray());
+
+        Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
     }
 }

examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs

@@ -24,8 +24,8 @@ static class Program
 
     static async Task Main(string[] args)
     {
-        await TestAsync().ConfigureAwait(false);
-        return;
+        //await TestAsync().ConfigureAwait(false);
+        //return;
 
         XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
 

examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs

@@ -1,44 +1,43 @@
-using System;
+using System;
 using log4net;
 using Newtonsoft.Json;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
 
-namespace WireMock.Net.StandAlone.NETCoreApp
+namespace WireMock.Net.StandAlone.NETCoreApp;
+
+internal class WireMockLog4NetLogger : IWireMockLogger
 {
-    internal class WireMockLog4NetLogger : IWireMockLogger
+    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    public void Debug(string formatString, params object[] args)
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        Log.DebugFormat(formatString, args);
+    }
 
-        public void Debug(string formatString, params object[] args)
-        {
-            Log.DebugFormat(formatString, args);
-        }
+    public void Info(string formatString, params object[] args)
+    {
+        Log.InfoFormat(formatString, args);
+    }
 
-        public void Info(string formatString, params object[] args)
-        {
-            Log.InfoFormat(formatString, args);
-        }
+    public void Warn(string formatString, params object[] args)
+    {
+        Log.WarnFormat(formatString, args);
+    }
 
-        public void Warn(string formatString, params object[] args)
-        {
-            Log.WarnFormat(formatString, args);
-        }
+    public void Error(string formatString, params object[] args)
+    {
+        Log.ErrorFormat(formatString, args);
+    }
 
-        public void Error(string formatString, params object[] args)
-        {
-            Log.ErrorFormat(formatString, args);
-        }
+    public void Error(string message, Exception exception)
+    {
+        Log.Error(message, exception);
+    }
 
-        public void Error(string message, Exception exception)
-        {
-            Log.Error(message, exception);
-        }
-
-        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
-        {
-            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-            Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
-        }
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
     }
 }

examples/WireMock.Net.TestcontainersExample/Program.cs

@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using Testcontainers.MsSql;
+using WireMock.Net.Testcontainers;
+
+namespace WireMock.Net.TestcontainersExample;
+
+internal class Program
+{
+    private static async Task Main(string[] args)
+    {
+        var container = new WireMockContainerBuilder()
+            .WithAdminUserNameAndPassword("x", "y")
+            .WithMappings(@"C:\Dev\GitHub\WireMock.Net\examples\WireMock.Net.Console.NET6\__admin\mappings")
+            .WithWatchStaticMappings(true)
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+
+        await container.StartAsync().ConfigureAwait(false);
+
+        var logs = await container.GetLogsAsync(DateTime.Now.AddDays(-1)).ConfigureAwait(false);
+        Console.WriteLine("logs = " + logs.Stdout);
+
+        var restEaseApiClient = container.CreateWireMockAdminClient();
+
+        var settings = await restEaseApiClient.GetSettingsAsync();
+        Console.WriteLine("settings = " + JsonConvert.SerializeObject(settings, Formatting.Indented));
+
+        var mappings = await restEaseApiClient.GetMappingsAsync();
+        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
+
+        var client = container.CreateClient();
+        var result = await client.GetStringAsync("/static/mapping");
+        Console.WriteLine("result = " + result);
+
+        await container.StopAsync();
+
+        var sql = new MsSqlBuilder()
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+    }
+}

examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Testcontainers.MsSql" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

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

@@ -19,12 +19,12 @@ public class CookieModel
     public IList<MatcherModel>? Matchers { get; set; }
 
     /// <summary>
-    /// Gets or sets the ignore case.
+    /// Gets or sets the ignore case for the Cookie Name.
     /// </summary>
     public bool? IgnoreCase { get; set; }
 
     /// <summary>
-    /// Reject on match.
+    /// Gets or sets the Reject on match for the Cookie Name.
     /// </summary>
     public bool? RejectOnMatch { get; set; }
 

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

@@ -1,19 +1,18 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Fault Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class FaultModel
 {
     /// <summary>
-    /// Fault Model
+    /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE or MALFORMED_RESPONSE_CHUNK.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class FaultModel
-    {
-        /// <summary>
-        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
-        /// </summary>
-        public string Type { get; set; }
+    public string? Type { get; set; }
 
-        /// <summary>
-        /// Gets or sets the fault percentage.
-        /// </summary>
-        public double? Percentage { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the fault percentage.
+    /// </summary>
+    public double? Percentage { get; set; }
 }

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

@@ -9,7 +9,7 @@ namespace WireMock.Admin.Mappings;
 public class HeaderModel
 {
     /// <summary>
-    /// Gets or sets the name.
+    /// Gets or sets the name (key).
     /// </summary>
     public string Name { get; set; } = null!;
 
@@ -19,12 +19,12 @@ public class HeaderModel
     public IList<MatcherModel>? Matchers { get; set; }
 
     /// <summary>
-    /// Gets or sets the ignore case.
+    /// Gets or sets the ignore case for the Header Key.
     /// </summary>
     public bool? IgnoreCase { get; set; }
 
     /// <summary>
-    /// Reject on match.
+    /// Gets or sets the Reject on match for the Header Key.
     /// </summary>
     public bool? RejectOnMatch { get; set; }
 

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using WireMock.Models;
 
 namespace WireMock.Admin.Mappings;
@@ -94,4 +93,9 @@ public class MappingModel
     /// </example>
     /// </summary>
     public object? Data { get; set; }
+
+    /// <summary> 
+    /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
+    /// </summary>
+    public double? Probability { get; set; }
 }

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

@@ -1,71 +1,76 @@
-namespace WireMock.Admin.Settings;
-
-[FluentBuilder.AutoGenerateBuilder]
-public class ProxyAndRecordSettingsModel
-{
-    /// <summary>
-    /// The clientCertificate thumbprint or subject name fragment to use.
-    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-    /// </summary>
-    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
-    /// <summary>
-    /// Defines the WebProxySettings.
-    /// </summary>
-    public WebProxySettingsModel WebProxySettings { get; set; }
-
-    /// <summary>
-    /// Proxy requests should follow redirection (30x).
-    /// </summary>
-    public bool? AllowAutoRedirect { get; set; }
-
-    /// <summary>
-    /// The URL to proxy.
-    /// </summary>
-    public string Url { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response to the internal Mappings.
-    /// </summary>
-    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>
-    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>
-    public string SaveMappingForStatusCodePattern { get; set; } = "*";
-
-    /// <summary>
-    /// Defines a list from headers which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedHeaders { get; set; }
-
-    /// <summary>
-    /// Defines a list of cookies which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedCookies { get; set; }
-
-    /// <summary>
-    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-    /// </summary>
-    // public bool PreferProxyMapping { get; set; }
-
-    /// <summary>
-    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-    /// - <c>false</c>, the default matchers will be used.
-    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-    ///
-    /// Default value is false.
-    /// </summary>
-    public bool UseDefinedRequestMatchers { get; set; }
-
-    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
-    /// </summary>
-    public bool AppendGuidToSavedMappingFile { get; set; }
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
+{
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }
+
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }
+
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    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>
+    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>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }
+
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
+
+    /// <summary>
+    /// Defines the Replace Settings
+    /// </summary>
+    public ProxyUrlReplaceSettingsModel? ReplaceSettings { get; set; }
 }

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

@@ -0,0 +1,23 @@
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// Defines an old path param and a new path param to be replaced when proxying.
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyUrlReplaceSettingsModel
+{
+    /// <summary>
+    /// The old path value to be replaced by the new path value
+    /// </summary>
+    public string OldValue { get; set; } = null!;
+
+    /// <summary>
+    /// The new path value to replace the old value with
+    /// </summary>
+    public string NewValue { get; set; } = null!;
+
+    /// <summary>
+    /// Defines if the case should be ignore when replacing.
+    /// </summary>
+    public bool IgnoreCase { get; set; }
+}

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -143,6 +143,14 @@ public interface IRequestMessage
     /// </summary>
     string Origin { get; }
 
+    /// <summary>
+    /// Get a query parameter.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <returns>The query parameter value as WireMockList or null when not found.</returns>
+    WireMockList<string>? GetParameter(string key, bool ignoreCase = false);
+
 #if NETSTANDARD1_3_OR_GREATER || NET461
     /// <summary>
     /// Gets the connection's client certificate

src/WireMock.Net.Abstractions/ResponseBuilders/FaultType.cs

@@ -1,23 +1,23 @@
-namespace WireMock.ResponseBuilders
+// ReSharper disable InconsistentNaming
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// The FaultType enumeration
+/// </summary>
+public enum FaultType
 {
     /// <summary>
-    /// The FaultType enumeration
+    /// No Fault
     /// </summary>
-    public enum FaultType
-    {
-        /// <summary>
-        /// No Fault
-        /// </summary>
-        NONE,
+    NONE,
 
-        /// <summary>
-        /// Return a completely empty response.
-        /// </summary>
-        EMPTY_RESPONSE,
+    /// <summary>
+    /// Return a completely empty response.
+    /// </summary>
+    EMPTY_RESPONSE,
 
-        /// <summary>
-        /// Send a defined status header, then garbage, then close the connection.
-        /// </summary>
-        MALFORMED_RESPONSE_CHUNK
-    }
+    /// <summary>
+    /// Send a defined status header, then garbage, then close the connection.
+    /// </summary>
+    MALFORMED_RESPONSE_CHUNK
 }

src/WireMock.Net.Abstractions/Server/IWireMockServer.cs

@@ -17,6 +17,11 @@ public interface IWireMockServer : IDisposable
     /// </summary>
     bool IsStarted { get; }
 
+    /// <summary>
+    /// Gets a value indicating whether this server is started with the admin interface enabled.
+    /// </summary>
+    bool IsStartedWithAdminInterface { get; }
+
     /// <summary>
     /// Gets the request logs.
     /// </summary>

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.7.0">
+        <PackageReference Include="FluentBuilder" Version="0.9.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj

@@ -1,49 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<Description>FluentAssertions extensions for WireMock.Net</Description>
-		<AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
-		<Authors>Mahmoud Ali;Stef Heyenrath</Authors>
-		<TargetFrameworks>net451;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
-		<PackageId>WireMock.Net.FluentAssertions</PackageId>
-		<PackageTags>wiremock;FluentAssertions;UnitTest;Assert;Assertions</PackageTags>
-		<RootNamespace>WireMock.FluentAssertions</RootNamespace>
-		<ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A95}</ProjectGuid>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-		<CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-		<!--<DelaySign>true</DelaySign>-->
-		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <LangVersion>10</LangVersion>
-	</PropertyGroup>
+    <PropertyGroup>
+        <Description>FluentAssertions extensions for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
+        <Authors>Mahmoud Ali;Stef Heyenrath</Authors>
+        <TargetFrameworks>net451;net47;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
+        <PackageId>WireMock.Net.FluentAssertions</PackageId>
+        <PackageTags>wiremock;FluentAssertions;UnitTest;Assert;Assertions</PackageTags>
+        <RootNamespace>WireMock.FluentAssertions</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A95}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+    </PropertyGroup>
 
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
+        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
-    <PackageReference Include="FluentAssertions" Version="6.5.1" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
+        <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    </ItemGroup>
 
-	<ItemGroup>
-	  <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>
 
 </Project>

src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs

@@ -31,13 +31,13 @@ public static class WireMockServerExtensions
     /// </summary>
     /// <param name="server">The WireMockServer instance</param>
     /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
     /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
     [PublicAPI]
     public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
     {
-        Guard.NotNull(server, nameof(server));
-        Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNull(server);
+        Guard.NotNullOrEmpty(path);
 
         var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);
 
@@ -80,9 +80,9 @@ public static class WireMockServerExtensions
     /// </summary>
     /// <param name="server">The WireMockServer instance</param>
     /// <param name="document">The OpenAPI document to use as mappings.</param>
-    /// <param name="settings">Additional settings [optional]</param>
+    /// <param name="settings">Additional settings [optional].</param>
     [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings settings)
+    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
     {
         Guard.NotNull(server);
         Guard.NotNull(document);

src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs

@@ -5,53 +5,69 @@ using Microsoft.OpenApi.Readers;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Settings;
 
-namespace WireMock.Net.OpenApiParser
+namespace WireMock.Net.OpenApiParser;
+
+/// <summary>
+/// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+/// </summary>
+public interface IWireMockOpenApiParser
 {
     /// <summary>
-    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
     /// </summary>
-    public interface IWireMockOpenApiParser
-    {
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
-        /// </summary>
-        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
+    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
 
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
-        /// </summary>
-        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
-        /// <param name="settings">Additional settings</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
+    /// </summary>
+    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
 
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
-        /// </summary>
-        /// <param name="document">The source OpenApiDocument</param>
-        /// <param name="settings">Additional settings [optional]</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
+    /// </summary>
+    /// <param name="document">The source OpenApiDocument</param>
+    /// <param name="settings">Additional settings [optional]</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
 
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The source stream</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// </summary>
+    /// <param name="stream">The source stream</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
 
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The source stream</param>
-        /// <param name="settings">Additional settings</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
-    }
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// </summary>
+    /// <param name="stream">The source stream</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
+    /// </summary>
+    /// <param name="text">The source text</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic);
+
+    /// <summary>
+    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
+    /// </summary>
+    /// <param name="text">The source text</param>
+    /// <param name="settings">Additional settings</param>
+    /// <param name="diagnostic">OpenApiDiagnostic output</param>
+    /// <returns>MappingModel</returns>
+    IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
 }

src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs

@@ -31,19 +31,29 @@ internal class OpenApiPathsMapper
         _exampleValueGenerator = new ExampleValueGenerator(settings);
     }
 
-    public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
+    public IReadOnlyList<MappingModel> ToMappingModels(OpenApiPaths? paths, IList<OpenApiServer> servers)
     {
-        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        return paths?
+            .OrderBy(p => p.Key)
+            .Select(p => MapPath(p.Key, p.Value, servers))
+            .SelectMany(x => x)
+            .ToArray() ??
+               Array.Empty<MappingModel>();
     }
 
-    private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
+    private IReadOnlyList<MappingModel> MapPaths(OpenApiPaths? paths, IList<OpenApiServer> servers)
     {
-        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        return paths?
+            .OrderBy(p => p.Key)
+            .Select(p => MapPath(p.Key, p.Value, servers))
+            .SelectMany(x => x)
+            .ToArray() ??
+               Array.Empty<MappingModel>();
     }
 
-    private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
+    private IReadOnlyList<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
     {
-        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
+        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers)).ToArray();
     }
 
     private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
@@ -123,7 +133,7 @@ internal class OpenApiPathsMapper
         };
     }
 
-    private bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
+    private static bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
     {
         openApiMediaType = null;
         contentType = null;
@@ -305,19 +315,19 @@ internal class OpenApiPathsMapper
         return JObject.Parse(outputString.ToString());
     }
 
-    private IDictionary<string, object?>? MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+    private IDictionary<string, object>? MapHeaders(string? responseContentType, IDictionary<string, OpenApiHeader>? headers)
     {
-        var mappedHeaders = headers.ToDictionary(
+        var mappedHeaders = headers?.ToDictionary(
             item => item.Key,
-            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
+            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern!
         );
 
         if (!string.IsNullOrEmpty(responseContentType))
         {
-            mappedHeaders.TryAdd(HeaderContentType, responseContentType);
+            mappedHeaders.TryAdd(HeaderContentType, responseContentType!);
         }
 
-        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
+        return mappedHeaders?.Keys.Any() == true ? mappedHeaders : null;
     }
 
     private IList<ParamModel>? MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
@@ -360,9 +370,18 @@ internal class OpenApiPathsMapper
     {
         return type switch
         {
-            ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },
+            ExampleValueType.Value => new MatcherModel
+            {
+                Name = "ExactMatcher",
+                Pattern = GetExampleValueAsStringForSchemaType(schema),
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            },
 
-            _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
+            _ => new MatcherModel
+            {
+                Name = "WildcardMatcher",
+                Pattern = "*"
+            }
         };
     }
 

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

@@ -36,5 +36,5 @@ public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleV
     public virtual string String { get; set; } = "example-string";
 
     /// <inheritdoc />
-    public virtual OpenApiSchema? Schema { get; set; } = new OpenApiSchema();
+    public virtual OpenApiSchema? Schema { get; set; } = new();
 }

src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Linq;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Stef.Validation;
@@ -11,116 +10,108 @@ namespace WireMock.Net.OpenApiParser.Utils;
 
 internal class ExampleValueGenerator
 {
-    private readonly WireMockOpenApiParserSettings _settings;
+    private readonly IWireMockOpenApiParserExampleValues _exampleValues;
 
     public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
     {
-        _settings = Guard.NotNull(settings);
+        Guard.NotNull(settings);
 
         // Check if user provided an own implementation
         if (settings.ExampleValues is null)
         {
-            if (_settings.DynamicExamples)
+            if (settings.DynamicExamples)
             {
-                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
+                _exampleValues = new WireMockOpenApiParserDynamicExampleValues();
             }
             else
             {
-                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+                _exampleValues = new WireMockOpenApiParserExampleValues();
             }
         }
+        else
+        {
+            _exampleValues = settings.ExampleValues;
+        }
     }
 
     public object GetExampleValue(OpenApiSchema? schema)
     {
         var schemaExample = schema?.Example;
-        var schemaEnum = GetRandomEnumValue(schema?.Enum);
+        var schemaEnum = schema?.Enum?.FirstOrDefault();
 
-        _settings.ExampleValues.Schema = schema;
+        _exampleValues.Schema = schema;
 
         switch (schema?.GetSchemaType())
         {
             case SchemaType.Boolean:
                 var exampleBoolean = schemaExample as OpenApiBoolean;
-                return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
+                return exampleBoolean?.Value ?? _exampleValues.Boolean;
 
             case SchemaType.Integer:
                 switch (schema?.GetSchemaFormat())
                 {
                     case SchemaFormat.Int64:
-                        var exampleLong = (OpenApiLong)schemaExample;
-                        var enumLong = (OpenApiLong)schemaEnum;
-                        var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
-                        return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+                        var exampleLong = schemaExample as OpenApiLong;
+                        var enumLong = schemaEnum as OpenApiLong;
+                        var valueLongEnumOrExample = enumLong?.Value ?? exampleLong?.Value;
+                        return valueLongEnumOrExample ?? _exampleValues.Integer;
 
                     default:
-                        var exampleInteger = (OpenApiInteger)schemaExample;
-                        var enumInteger = (OpenApiInteger)schemaEnum;
-                        var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
-                        return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                        var exampleInteger = schemaExample as OpenApiInteger;
+                        var enumInteger = schemaEnum as OpenApiInteger;
+                        var valueIntegerEnumOrExample = enumInteger?.Value ?? exampleInteger?.Value;
+                        return valueIntegerEnumOrExample ?? _exampleValues.Integer;
                 }
 
             case SchemaType.Number:
                 switch (schema?.GetSchemaFormat())
                 {
                     case SchemaFormat.Float:
-                        var exampleFloat = (OpenApiFloat)schemaExample;
-                        var enumFloat = (OpenApiFloat)schemaEnum;
-                        var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
-                        return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
+                        var exampleFloat = schemaExample as OpenApiFloat;
+                        var enumFloat = schemaEnum as OpenApiFloat;
+                        var valueFloatEnumOrExample = enumFloat?.Value ?? exampleFloat?.Value;
+                        return valueFloatEnumOrExample ?? _exampleValues.Float;
 
                     default:
-                        var exampleDouble = (OpenApiDouble)schemaExample;
-                        var enumDouble = (OpenApiDouble)schemaEnum;
-                        var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
-                        return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
+                        var exampleDouble = schemaExample as OpenApiDouble;
+                        var enumDouble = schemaEnum as OpenApiDouble;
+                        var valueDoubleEnumOrExample = enumDouble?.Value ?? exampleDouble?.Value;
+                        return valueDoubleEnumOrExample ?? _exampleValues.Double;
                 }
 
             default:
                 switch (schema?.GetSchemaFormat())
                 {
                     case SchemaFormat.Date:
-                        var exampleDate = (OpenApiDate)schemaExample;
-                        var enumDate = (OpenApiDate)schemaEnum;
-                        var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
-                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
+                        var exampleDate = schemaExample as OpenApiDate;
+                        var enumDate = schemaEnum as OpenApiDate;
+                        var valueDateEnumOrExample = enumDate?.Value ?? exampleDate?.Value;
+                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _exampleValues.Date());
 
                     case SchemaFormat.DateTime:
-                        var exampleDateTime = (OpenApiDateTime)schemaExample;
-                        var enumDateTime = (OpenApiDateTime)schemaEnum;
-                        var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
-                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
+                        var exampleDateTime = schemaExample as OpenApiDateTime;
+                        var enumDateTime = schemaEnum as OpenApiDateTime;
+                        var valueDateTimeEnumOrExample = enumDateTime?.Value ?? exampleDateTime?.Value;
+                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _exampleValues.DateTime());
 
                     case SchemaFormat.Byte:
-                        var exampleByte = (OpenApiByte)schemaExample;
-                        var enumByte = (OpenApiByte)schemaEnum;
-                        var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
-                        return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
+                        var exampleByte = schemaExample as OpenApiByte;
+                        var enumByte = schemaEnum as OpenApiByte;
+                        var valueByteEnumOrExample = enumByte?.Value ?? exampleByte?.Value;
+                        return valueByteEnumOrExample ?? _exampleValues.Bytes;
 
                     case SchemaFormat.Binary:
-                        var exampleBinary = (OpenApiBinary)schemaExample;
-                        var enumBinary = (OpenApiBinary)schemaEnum;
-                        var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
-                        return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
+                        var exampleBinary = schemaExample as OpenApiBinary;
+                        var enumBinary = schemaEnum as OpenApiBinary;
+                        var valueBinaryEnumOrExample = enumBinary?.Value ?? exampleBinary?.Value;
+                        return valueBinaryEnumOrExample ?? _exampleValues.Object;
 
                     default:
-                        var exampleString = (OpenApiString)schemaExample;
-                        var enumString = (OpenApiString)schemaEnum;
-                        var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
-                        return valueStringEnumOrExample ?? _settings.ExampleValues.String;
+                        var exampleString = schemaExample as OpenApiString;
+                        var enumString = schemaEnum as OpenApiString;
+                        var valueStringEnumOrExample = enumString?.Value ?? exampleString?.Value;
+                        return valueStringEnumOrExample ?? _exampleValues.String;
                 }
         }
     }
-
-    private static IOpenApiAny? GetRandomEnumValue(IList<IOpenApiAny>? schemaEnum)
-    {
-        if (schemaEnum?.Count > 0)
-        {
-            int maxValue = schemaEnum.Count - 1;
-            int randomEnum = new Random().Next(0, maxValue);
-            return schemaEnum[randomEnum];
-        }
-
-        return null;
-    }
 }

src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj

@@ -4,7 +4,7 @@
         <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
         <TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageTags>wiremock;openapi;OAS;converter;parser;openapiparser</PackageTags>
+        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E5AADAD}</ProjectGuid>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>

src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
@@ -16,18 +17,18 @@ namespace WireMock.Net.OpenApiParser;
 /// </summary>
 public class WireMockOpenApiParser : IWireMockOpenApiParser
 {
-    private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();
+    private readonly OpenApiStreamReader _reader = new();
 
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
     [PublicAPI]
-    public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
     {
         return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
     }
 
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
     [PublicAPI]
-    public IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
     {
         OpenApiDocument document;
         if (Path.GetExtension(path).EndsWith("raml", StringComparison.OrdinalIgnoreCase))
@@ -44,24 +45,38 @@ public class WireMockOpenApiParser : IWireMockOpenApiParser
         return FromDocument(document, settings);
     }
 
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
     [PublicAPI]
-    public IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
+    {
+        return new OpenApiPathsMapper(settings ?? new WireMockOpenApiParserSettings()).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
+    }
+
+    /// <inheritdoc  />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
     {
         return FromDocument(_reader.Read(stream, out diagnostic));
     }
 
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    /// <inheritdoc />
     [PublicAPI]
-    public IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    public IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
     {
         return FromDocument(_reader.Read(stream, out diagnostic), settings);
     }
 
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
+    /// <inheritdoc  />
     [PublicAPI]
-    public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
+    public IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic)
     {
-        return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
+        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), out diagnostic);
+    }
+
+    /// <inheritdoc />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), settings, out diagnostic);
     }
 }

src/WireMock.Net.RestClient/IWireMockAdminApi.cs

@@ -280,4 +280,20 @@ public interface IWireMockAdminApi
     /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Head("files/{filename}")]
     Task FileExistsAsync([Path] string filename, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Convert an OpenApi / RAML document to mappings.
+    /// </summary>
+    /// <param name="text">The OpenApi or RAML document as text.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Post("openapi/convert")]
+    Task<IReadOnlyList<MappingModel>> OpenApiConvertAsync([Body] string text, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Convert an OpenApi / RAML document to mappings and save these.
+    /// </summary>
+    /// <param name="text">The OpenApi or RAML document as text.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Post("openapi/save")]
+    Task<StatusModel> OpenApiSaveAsync([Body] string text, CancellationToken cancellationToken = default);
 }

src/WireMock.Net.Testcontainers/Models/ContainerInfo.cs

@@ -0,0 +1,7 @@
+namespace WireMock.Net.Testcontainers.Models;
+
+internal record ContainerInfo
+(
+    string Image,
+    string MappingsPath
+);

src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>A fluent testcontainer builder for the Docker version of WireMock.Net</Description>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;docker;testcontainer;testcontainers</PackageTags>
+        <ProjectGuid>{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <LangVersion>10</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="IsExternalInit" Version="1.0.3">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="Testcontainers" Version="3.2.0" />
+        <PackageReference Include="JetBrains.Annotations" VersionOverride="2022.3.1" PrivateAssets="All" Version="2022.3.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
+    </ItemGroup>
+</Project>

src/WireMock.Net.Testcontainers/WireMockConfiguration.cs

@@ -0,0 +1,66 @@
+using Docker.DotNet.Models;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using JetBrains.Annotations;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <inheritdoc cref="ContainerConfiguration" />
+[PublicAPI]
+public sealed class WireMockConfiguration : ContainerConfiguration
+{
+#pragma warning disable CS1591
+    public string? Username { get; }
+
+    public string? Password { get; }
+
+    public bool HasBasicAuthentication => !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);
+
+    public WireMockConfiguration(
+        string? username = null,
+        string? password = null
+    )
+    {
+        Username = username;
+        Password = password;
+    }
+#pragma warning restore CS1591
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(IResourceConfiguration<CreateContainerParameters> resourceConfiguration) : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(IContainerConfiguration resourceConfiguration) : base(resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
+    public WireMockConfiguration(WireMockConfiguration resourceConfiguration) : this(new WireMockConfiguration(), resourceConfiguration)
+    {
+        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
+    /// </summary>
+    /// <param name="oldValue">The old Docker resource configuration.</param>
+    /// <param name="newValue">The new Docker resource configuration.</param>
+    public WireMockConfiguration(WireMockConfiguration oldValue, WireMockConfiguration newValue) : base(oldValue, newValue)
+    {
+        Username = BuildConfiguration.Combine(oldValue.Username, newValue.Username);
+        Password = BuildConfiguration.Combine(oldValue.Password, newValue.Password);
+    }
+}

src/WireMock.Net.Testcontainers/WireMockContainer.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using DotNet.Testcontainers.Containers;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Logging;
+using RestEase;
+using Stef.Validation;
+using WireMock.Client;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <summary>
+/// A container for running WireMock in a docker environment.
+/// </summary>
+public sealed class WireMockContainer : DockerContainer
+{
+    internal const int ContainerPort = 80;
+
+    private readonly WireMockConfiguration _configuration;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
+    /// </summary>
+    /// <param name="configuration">The container configuration.</param>
+    /// <param name="logger">The logger.</param>
+    public WireMockContainer(WireMockConfiguration configuration, ILogger logger) : base(configuration, logger)
+    {
+        _configuration = Guard.NotNull(configuration);
+    }
+
+    /// <summary>
+    /// Gets the public Url.
+    /// </summary>
+    [PublicAPI]
+    public string GetPublicUrl() => GetPublicUri().ToString();
+
+    /// <summary>
+    /// Create a RestEase Admin client which can be used to call the admin REST endpoint.
+    /// </summary>
+    /// <returns>A <see cref="IWireMockAdminApi"/></returns>
+    [PublicAPI]
+    public IWireMockAdminApi CreateWireMockAdminClient()
+    {
+        ValidateIfRunning();
+
+        var api = RestClient.For<IWireMockAdminApi>(GetPublicUri());
+
+        if (_configuration.HasBasicAuthentication)
+        {
+            api.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{_configuration.Username}:{_configuration.Password}")));
+        }
+
+        return api;
+    }
+
+    /// <summary>
+    /// Create a <see cref="HttpClient"/> which can be used to call this instance.
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
+    /// </summary>
+    [PublicAPI]
+    public HttpClient CreateClient(params DelegatingHandler[] handlers)
+    {
+        ValidateIfRunning();
+
+        var client = HttpClientFactory.Create(handlers);
+        client.BaseAddress = GetPublicUri();
+        return client;
+    }
+
+    /// <summary>
+    /// Create a <see cref="HttpClient"/> (one for each URL) which can be used to call this instance.
+    /// <param name="innerHandler">The inner handler represents the destination of the HTTP message channel.</param>
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
+    /// </summary>
+    [PublicAPI]
+    public HttpClient CreateClient(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
+    {
+        ValidateIfRunning();
+
+        var client = HttpClientFactory.Create(innerHandler, handlers);
+        client.BaseAddress = GetPublicUri();
+        return client;
+    }
+
+    private void ValidateIfRunning()
+    {
+        if (State != TestcontainersStates.Running)
+        {
+            throw new InvalidOperationException("Unable to create HttpClient because the WireMock.Net is not yet running.");
+        }
+    }
+
+    private Uri GetPublicUri() => new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(ContainerPort)).Uri;
+}

src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Docker.DotNet.Models;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
+using JetBrains.Annotations;
+using Stef.Validation;
+using WireMock.Net.Testcontainers.Models;
+
+namespace WireMock.Net.Testcontainers;
+
+/// <summary>
+/// An specific fluent Docker container builder for WireMock.Net
+/// </summary>
+public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContainerBuilder, WireMockContainer, WireMockConfiguration>
+{
+    private readonly Dictionary<bool, ContainerInfo> _info = new()
+    {
+        { false, new ContainerInfo("sheyenrath/wiremock.net:latest", "/app/__admin/mappings") },
+        { true, new ContainerInfo("sheyenrath/wiremock.net-windows:latest", @"c:\app\__admin\mappings") }
+    };
+
+    private const string DefaultLogger = "WireMockConsoleLogger";
+
+    private readonly Lazy<Task<bool>> _isWindowsAsLazy = new(async () =>
+    {
+        using var dockerClientConfig = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientConfiguration();
+        using var dockerClient = dockerClientConfig.CreateClient();
+
+        var version = await dockerClient.System.GetVersionAsync();
+        return version.Os.IndexOf("Windows", StringComparison.OrdinalIgnoreCase) > -1;
+    });
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContainerBuilder" /> class.
+    /// </summary>
+    public WireMockContainerBuilder() : this(new WireMockConfiguration())
+    {
+        DockerResourceConfiguration = Init().DockerResourceConfiguration;
+    }
+
+    /// <summary>
+    /// Automatically set the correct image (Linux or Windows) for WireMock which to create the container.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithImage()
+    {
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+        return WithImage(_info[isWindows].Image);
+    }
+
+    /// <summary>
+    /// Set the admin username and password for the container (basic authentication).
+    /// </summary>
+    /// <param name="username">The admin username.</param>
+    /// <param name="password">The admin password.</param>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    public WireMockContainerBuilder WithAdminUserNameAndPassword(string username, string password)
+    {
+        Guard.NotNull(username);
+        Guard.NotNull(password);
+
+        if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password))
+        {
+            return this;
+        }
+
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(username, password))
+            .WithCommand($"--AdminUserName {username}", $"--AdminPassword {password}");
+    }
+
+    /// <summary>
+    /// Use the WireMockNullLogger.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithNullLogger()
+    {
+        return WithCommand("--WireMockLogger WireMockNullLogger");
+    }
+
+    /// <summary>
+    /// Defines if the static mappings should be read at startup (default set to false).
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithReadStaticMappings()
+    {
+        return WithCommand("--ReadStaticMappings true");
+    }
+
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithWatchStaticMappings(bool includeSubDirectories)
+    {
+        return WithCommand("--WatchStaticMappings true").WithCommand($"--WatchStaticMappingsInSubdirectories {includeSubDirectories}");
+    }
+
+    /// <summary>
+    /// Specifies the path for the (static) mapping json files.
+    /// </summary>
+    /// <param name="path">The path</param>
+    /// <returns></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithMappings(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+
+        return WithReadStaticMappings().WithBindMount(path, _info[isWindows].MappingsPath);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockContainerBuilder" /> class.
+    /// </summary>
+    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
+    private WireMockContainerBuilder(WireMockConfiguration dockerResourceConfiguration) : base(dockerResourceConfiguration)
+    {
+        DockerResourceConfiguration = dockerResourceConfiguration;
+    }
+
+    /// <inheritdoc />
+    protected override WireMockConfiguration DockerResourceConfiguration { get; }
+
+    /// <inheritdoc />
+    public override WireMockContainer Build()
+    {
+        Validate();
+
+        return new WireMockContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Init()
+    {
+        var builder = base.Init();
+
+        // In case no image has been set, set the image using internal logic.
+        if (builder.DockerResourceConfiguration.Image == null)
+        {
+            builder = builder.WithImage();
+        }
+
+        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
+        var waitForContainerOS = isWindows ? Wait.ForWindowsContainer() : Wait.ForUnixContainer();
+        return builder
+            .WithPortBinding(WireMockContainer.ContainerPort, true)
+            .WithCommand($"--WireMockLogger {DefaultLogger}")
+            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("By Stef Heyenrath"));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Clone(IContainerConfiguration resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
+    {
+        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
+    }
+
+    /// <inheritdoc />
+    protected override WireMockContainerBuilder Merge(WireMockConfiguration oldValue, WireMockConfiguration newValue)
+    {
+        return new WireMockContainerBuilder(new WireMockConfiguration(oldValue, newValue));
+    }
+}

src/WireMock.Net/.filenesting.json

@@ -0,0 +1,17 @@
+{
+    "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+    "root": true,
+
+    "dependentFileProviders": {
+        "add": {
+            "addedExtension": {},
+            "pathSegment": {
+                "add": {
+                    ".*": [
+                        ".cs"
+                    ]
+                }
+            }
+        }
+    }
+}

src/WireMock.Net/Compatibility/StringExtensions.cs

@@ -0,0 +1,15 @@
+#if NET451 || NET452 || NET46 || NET451 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+using System.Text.RegularExpressions;
+
+// ReSharper disable once CheckNamespace
+namespace System;
+
+internal static class StringExtensions
+{
+    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
+    {
+        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
+        return Regex.Replace(text, oldValue, newValue, options);
+    }
+}
+#endif

src/WireMock.Net/Exceptions/WireMockException.cs

@@ -1,35 +1,34 @@
-using System;
+using System;
 
-namespace WireMock.Exceptions
+namespace WireMock.Exceptions;
+
+/// <summary>
+/// WireMockException
+/// </summary>
+/// <seealso cref="Exception" />
+public class WireMockException : Exception
 {
     /// <summary>
-    /// WireMockException
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
     /// </summary>
-    /// <seealso cref="Exception" />
-    public class WireMockException : Exception
+    public WireMockException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        public WireMockException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public WireMockException(string message) : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public WireMockException(string message) : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockException"/> class.
-        /// </summary>
-        /// <param name="message">The message.</param>
-        /// <param name="inner">The inner.</param>
-        public WireMockException(string message, Exception inner) : base(message, inner)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockException"/> class.
+    /// </summary>
+    /// <param name="message">The message.</param>
+    /// <param name="inner">The inner.</param>
+    public WireMockException(string message, Exception inner) : base(message, inner)
+    {
     }
 }

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -3,179 +3,178 @@ using System.IO;
 using WireMock.Util;
 using Stef.Validation;
 
-namespace WireMock.Handlers
+namespace WireMock.Handlers;
+
+/// <summary>
+/// Default implementation for a handler to interact with the local file system to read and write static mapping files.
+/// </summary>
+public class LocalFileSystemHandler : IFileSystemHandler
 {
+    private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+    private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
+
+    private readonly string _rootFolder;
+
     /// <summary>
-    /// Default implementation for a handler to interact with the local file system to read and write static mapping files.
+    /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
     /// </summary>
-    public class LocalFileSystemHandler : IFileSystemHandler
+    public LocalFileSystemHandler() : this(Directory.GetCurrentDirectory())
     {
-        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
-        private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
+    }
 
-        private readonly string _rootFolder;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
+    /// </summary>
+    /// <param name="rootFolder">The root folder.</param>
+    public LocalFileSystemHandler(string rootFolder)
+    {
+        _rootFolder = rootFolder;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        public LocalFileSystemHandler() : this(Directory.GetCurrentDirectory())
+    /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
+    public virtual bool FolderExists(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return Directory.Exists(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
+    public virtual void CreateFolder(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        Directory.CreateDirectory(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
+    public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
+    public virtual string GetMappingFolder()
+    {
+        return Path.Combine(_rootFolder, AdminMappingsFolder);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
+    public virtual string ReadMappingFile(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+
+        return File.ReadAllText(path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile(string, string)"/>
+    public virtual void WriteMappingFile(string path, string text)
+    {
+        Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNull(text, nameof(text));
+
+        File.WriteAllText(path, text);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
+    public virtual byte[] ReadResponseBodyAsFile(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+        path = PathUtils.CleanPath(path);
+        // If the file exists at the given path relative to the MappingsFolder, then return that.
+        // Else the path will just be as-is.
+        return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
+    public virtual string ReadResponseBodyAsString(string path)
+    {
+        Guard.NotNullOrEmpty(path);
+        path = PathUtils.CleanPath(path);
+        // In case the path is a filename, the path will be adjusted to the MappingFolder.
+        // Else the path will just be as-is.
+        return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
+    public virtual bool FileExists(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        return File.Exists(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc />
+    public virtual void WriteFile(string filename, byte[] bytes)
+    {
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(bytes);
+
+        File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
+    }
+
+    /// <inheritdoc />
+    public virtual void WriteFile(string folder, string filename, byte[] bytes)
+    {
+        Guard.NotNullOrEmpty(folder);
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(bytes);
+
+        File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
+    public virtual void DeleteFile(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        File.Delete(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
+    public virtual byte[] ReadFile(string filename)
+    {
+        Guard.NotNullOrEmpty(filename);
+
+        return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
+    public virtual string ReadFileAsString(string filename)
+    {
+        return File.ReadAllText(AdjustPathForMappingFolder(Guard.NotNullOrEmpty(filename, nameof(filename))));
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
+    public virtual string GetUnmatchedRequestsFolder()
+    {
+        return Path.Combine(_rootFolder, UnmatchedRequestsFolder);
+    }
+
+    /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
+    public virtual void WriteUnmatchedRequest(string filename, string text)
+    {
+        Guard.NotNullOrEmpty(filename);
+        Guard.NotNull(text);
+
+        var folder = GetUnmatchedRequestsFolder();
+        if (!FolderExists(folder))
         {
+            CreateFolder(folder);
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        /// <param name="rootFolder">The root folder.</param>
-        public LocalFileSystemHandler(string rootFolder)
-        {
-            _rootFolder = rootFolder;
-        }
+        File.WriteAllText(Path.Combine(folder, filename), text);
+    }
 
-        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
-        public virtual bool FolderExists(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return Directory.Exists(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
-        public virtual void CreateFolder(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            Directory.CreateDirectory(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
-        public virtual string GetMappingFolder()
-        {
-            return Path.Combine(_rootFolder, AdminMappingsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
-        public virtual string ReadMappingFile(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-
-            return File.ReadAllText(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile(string, string)"/>
-        public virtual void WriteMappingFile(string path, string text)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            Guard.NotNull(text, nameof(text));
-
-            File.WriteAllText(path, text);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public virtual byte[] ReadResponseBodyAsFile(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            path = PathUtils.CleanPath(path);
-            // If the file exists at the given path relative to the MappingsFolder, then return that.
-            // Else the path will just be as-is.
-            return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
-        public virtual string ReadResponseBodyAsString(string path)
-        {
-            Guard.NotNullOrEmpty(path, nameof(path));
-            path = PathUtils.CleanPath(path);
-            // In case the path is a filename, the path will be adjusted to the MappingFolder.
-            // Else the path will just be as-is.
-            return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
-        public virtual bool FileExists(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            return File.Exists(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc />
-        public virtual void WriteFile(string filename, byte[] bytes)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-            Guard.NotNull(bytes, nameof(bytes));
-
-            File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
-        }
-
-        /// <inheritdoc />
-        public virtual void WriteFile(string folder, string filename, byte[] bytes)
-        {
-            Guard.NotNullOrEmpty(folder);
-            Guard.NotNullOrEmpty(filename);
-            Guard.NotNull(bytes);
-
-            File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
-        public virtual void DeleteFile(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            File.Delete(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
-        public virtual byte[] ReadFile(string filename)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-
-            return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
-        public virtual string ReadFileAsString(string filename)
-        {
-            return File.ReadAllText(AdjustPathForMappingFolder(Guard.NotNullOrEmpty(filename, nameof(filename))));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
-        public virtual string GetUnmatchedRequestsFolder()
-        {
-            return Path.Combine(_rootFolder, UnmatchedRequestsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
-        public virtual void WriteUnmatchedRequest(string filename, string text)
-        {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
-            Guard.NotNull(text, nameof(text));
-
-            var folder = GetUnmatchedRequestsFolder();
-            if (!FolderExists(folder))
-            {
-                CreateFolder(folder);
-            }
-
-            File.WriteAllText(Path.Combine(folder, filename), text);
-        }
-
-        /// <summary>
-        /// Adjusts the path to the MappingFolder.
-        /// </summary>
-        /// <param name="filename">The path.</param>
-        /// <returns>Adjusted path</returns>
-        private string AdjustPathForMappingFolder(string filename)
-        {
-            return Path.Combine(GetMappingFolder(), filename);
-        }
+    /// <summary>
+    /// Adjusts the path to the MappingFolder.
+    /// </summary>
+    /// <param name="filename">The path.</param>
+    /// <returns>Adjusted path</returns>
+    private string AdjustPathForMappingFolder(string filename)
+    {
+        return Path.Combine(GetMappingFolder(), filename);
     }
 }

src/WireMock.Net/Http/HttpRequestMessageHelper.cs

@@ -5,12 +5,18 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
 using Stef.Validation;
+using WireMock.Constants;
 using WireMock.Types;
 
 namespace WireMock.Http;
 
 internal static class HttpRequestMessageHelper
 {
+    private static readonly IDictionary<string, bool> ContentLengthHeaderAllowed = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase)
+    {
+        { HttpRequestMethod.HEAD, true }
+    };
+
     internal static HttpRequestMessage Create(IRequestMessage requestMessage, string url)
     {
         Guard.NotNull(requestMessage);
@@ -50,7 +56,19 @@ internal static class HttpRequestMessageHelper
             return httpRequestMessage;
         }
 
-        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host, HttpKnownHeaderNames.ContentLength };
+        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host };
+
+        var contentLengthHeaderAllowed = ContentLengthHeaderAllowed.TryGetValue(requestMessage.Method, out var allowed) && allowed;
+        if (contentLengthHeaderAllowed)
+        {
+            // Set Content to empty ByteArray to be able to set the Content-Length on the content in case of a HEAD method.
+            httpRequestMessage.Content ??= new ByteArrayContent(EmptyArray<byte>.Value);
+        }
+        else
+        {
+            excludeHeaders.Add(HttpKnownHeaderNames.ContentLength);
+        }
+
         if (contentType != null)
         {
             // Content-Type should be set on the content

src/WireMock.Net/IMapping.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using WireMock.Matchers.Request;
 using WireMock.Models;
@@ -121,7 +120,7 @@ public interface IMapping
     /// <summary>
     /// Use Fire and Forget for the defined webhook(s). [Optional]
     /// </summary>
-    bool? UseWebhooksFireAndForget { get; set; }
+    bool? UseWebhooksFireAndForget { get; }
 
     /// <summary>
     /// Data Object which can be used when WithTransformer is used.
@@ -130,7 +129,12 @@ public interface IMapping
     /// lookup data "1"
     /// </example>
     /// </summary>
-    object? Data { get; set; }
+    object? Data { get; }
+
+    /// <summary> 
+    /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
+    /// </summary>
+    double? Probability { get; }
 
     /// <summary>
     /// ProvideResponseAsync

src/WireMock.Net/Json/DynamicPropertyWithValue.cs

@@ -4,7 +4,7 @@ using System.Linq.Dynamic.Core;
 
 namespace WireMock.Json;
 
-public class DynamicPropertyWithValue : DynamicProperty
+internal class DynamicPropertyWithValue : DynamicProperty
 {
     public object? Value { get; }
 

src/WireMock.Net/Mapping.cs

@@ -67,13 +67,16 @@ public class Mapping : IMapping
     public IWebhook[]? Webhooks { get; }
 
     /// <inheritdoc />
-    public bool? UseWebhooksFireAndForget { get; set; }
+    public bool? UseWebhooksFireAndForget { get; }
 
     /// <inheritdoc />
     public ITimeSettings? TimeSettings { get; }
 
     /// <inheritdoc />
-    public object? Data { get; set; }
+    public object? Data { get; }
+
+    /// <inheritdoc />
+    public double? Probability { get; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Mapping"/> class.
@@ -95,6 +98,7 @@ public class Mapping : IMapping
     /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     /// <param name="data">The data object. [Optional]</param>
+    /// <param name="probability">Define the probability when this request should be matched. [Optional]</param>
     public Mapping(
         Guid guid,
         DateTime updatedAt,
@@ -112,7 +116,8 @@ public class Mapping : IMapping
         IWebhook[]? webhooks,
         bool? useWebhooksFireAndForget,
         ITimeSettings? timeSettings,
-        object? data)
+        object? data,
+        double? probability)
     {
         Guid = guid;
         UpdatedAt = updatedAt;
@@ -131,6 +136,7 @@ public class Mapping : IMapping
         UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
         Data = data;
+        Probability = probability;
     }
 
     /// <inheritdoc cref="IMapping.ProvideResponseAsync" />

src/WireMock.Net/MappingBuilder.cs

@@ -69,12 +69,7 @@ public class MappingBuilder : IMappingBuilder
     /// <inheritdoc />
     public MappingModel[] GetMappings()
     {
-        return GetMappingsInternal().Select(_mappingConverter.ToMappingModel).ToArray();
-    }
-
-    internal IMapping[] GetMappingsInternal()
-    {
-        return _options.Mappings.Values.ToArray().Where(m => !m.IsAdminInterface).ToArray();
+        return GetNonAdminMappings().Select(_mappingConverter.ToMappingModel).ToArray();
     }
 
     /// <inheritdoc />
@@ -86,7 +81,7 @@ public class MappingBuilder : IMappingBuilder
     /// <inheritdoc />
     public string? ToCSharpCode(Guid guid, MappingConverterType converterType)
     {
-        var mapping = GetMappingsInternal().FirstOrDefault(m => m.Guid == guid);
+        var mapping = GetNonAdminMappings().FirstOrDefault(m => m.Guid == guid);
         if (mapping is null)
         {
             return null;
@@ -101,7 +96,7 @@ public class MappingBuilder : IMappingBuilder
     {
         var sb = new StringBuilder();
         bool addStart = true;
-        foreach (var mapping in GetMappingsInternal())
+        foreach (var mapping in GetNonAdminMappings())
         {
             sb.AppendLine(_mappingConverter.ToCSharpCode(mapping, new MappingConverterSettings { AddStart = addStart, ConverterType = converterType }));
 
@@ -123,7 +118,7 @@ public class MappingBuilder : IMappingBuilder
     /// <inheritdoc />
     public void SaveMappingsToFolder(string? folder)
     {
-        foreach (var mapping in GetNonAdminMappings().Where(m => !m.IsAdminInterface))
+        foreach (var mapping in GetNonAdminMappings())
         {
             _mappingToFileSaver.SaveMappingToFile(mapping, folder);
         }
@@ -131,7 +126,7 @@ public class MappingBuilder : IMappingBuilder
 
     private IMapping[] GetNonAdminMappings()
     {
-        return _options.Mappings.Values.ToArray();
+        return _options.Mappings.Values.Where(m => !m.IsAdminInterface).OrderBy(m => m.UpdatedAt).ToArray();
     }
 
     private void RegisterMapping(IMapping mapping, bool saveToFile)

src/WireMock.Net/Matchers/ContentTypeMatcher.cs

@@ -1,6 +1,5 @@
 using System.Net.Http.Headers;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using WireMock.Models;
 
 namespace WireMock.Matchers;

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 using Stef.Validation;
 
 namespace WireMock.Matchers.Request;
@@ -25,9 +24,9 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
     /// </summary>
     /// <param name="requestMatchers">The request matchers.</param>
     /// <param name="type">The CompositeMatcherType type (Defaults to 'And')</param>
-    protected RequestMessageCompositeMatcher([NotNull] IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And)
+    protected RequestMessageCompositeMatcher(IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And)
     {
-        Guard.NotNull(requestMatchers, nameof(requestMatchers));
+        Guard.NotNull(requestMatchers);
 
         _type = type;
         RequestMatchers = requestMatchers;

src/WireMock.Net/Models/TimeSettings.cs

@@ -1,19 +1,18 @@
 using System;
 
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// TimeSettingsModel: Start, End and TTL
+/// </summary>
+public class TimeSettings : ITimeSettings
 {
-    /// <summary>
-    /// TimeSettingsModel: Start, End and TTL
-    /// </summary>
-    public class TimeSettings : ITimeSettings
-    {
-        /// <inheritdoc />
-        public DateTime? Start { get; set; }
+    /// <inheritdoc />
+    public DateTime? Start { get; set; }
 
-        /// <inheritdoc />
-        public DateTime? End { get; set; }
+    /// <inheritdoc />
+    public DateTime? End { get; set; }
 
-        /// <inheritdoc />
-        public int? TTL { get; set; }
-    }
+    /// <inheritdoc />
+    public int? TTL { get; set; }
 }

src/WireMock.Net/Models/UrlDetails.cs

@@ -1,51 +1,47 @@
-using System;
+using System;
 using Stef.Validation;
 
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// UrlDetails
+/// </summary>
+public class UrlDetails
 {
     /// <summary>
-    /// UrlDetails
+    /// Gets the url (relative).
     /// </summary>
-    public class UrlDetails
+    public Uri Url { get; }
+
+    /// <summary>
+    /// Gets the AbsoluteUrl.
+    /// </summary>
+    public Uri AbsoluteUrl { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UrlDetails"/> class.
+    /// </summary>
+    /// <param name="url">The URL.</param>
+    public UrlDetails(string url) : this(new Uri(url))
     {
-        /// <summary>
-        /// Gets the url (relative).
-        /// </summary>
-        public Uri Url { get; }
+    }
 
-        /// <summary>
-        /// Gets the AbsoluteUrl.
-        /// </summary>
-        public Uri AbsoluteUrl { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UrlDetails"/> class.
+    /// </summary>
+    /// <param name="url">The URL.</param>
+    public UrlDetails(Uri url) : this(url, url)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UrlDetails"/> class.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        public UrlDetails(string url) : this(new Uri(url))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UrlDetails"/> class.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        public UrlDetails(Uri url) : this(url, url)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UrlDetails"/> class.
-        /// </summary>
-        /// <param name="absoluteUrl">The absolute URL.</param>
-        /// <param name="url">The URL (relative).</param>
-        public UrlDetails(Uri absoluteUrl, Uri url)
-        {
-            Guard.NotNull(absoluteUrl, nameof(absoluteUrl));
-            Guard.NotNull(url, nameof(url));
-
-            AbsoluteUrl = absoluteUrl;
-            Url = url;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UrlDetails"/> class.
+    /// </summary>
+    /// <param name="absoluteUrl">The absolute URL.</param>
+    /// <param name="url">The URL (relative).</param>
+    public UrlDetails(Uri absoluteUrl, Uri url)
+    {
+        AbsoluteUrl = Guard.NotNull(absoluteUrl);
+        Url = Guard.NotNull(url);
     }
 }

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -11,6 +11,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Stef.Validation;
 using WireMock.Logging;
 using WireMock.Owin.Mappers;
+using WireMock.Services;
 using WireMock.Util;
 
 namespace WireMock.Owin
@@ -66,6 +67,7 @@ namespace WireMock.Owin
                 {
                     services.AddSingleton(_wireMockMiddlewareOptions);
                     services.AddSingleton<IMappingMatcher, MappingMatcher>();
+                    services.AddSingleton<IRandomizerDoubleBetween0And1, RandomizerDoubleBetween0And1>();
                     services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                     services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
 

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

@@ -62,11 +62,11 @@ namespace WireMock.Owin.Mappers
             switch (responseMessage.FaultType)
             {
                 case FaultType.EMPTY_RESPONSE:
-                    bytes = IsFault(responseMessage) ? new byte[0] : GetNormalBody(responseMessage);
+                    bytes = IsFault(responseMessage) ? EmptyArray<byte>.Value : GetNormalBody(responseMessage);
                     break;
 
                 case FaultType.MALFORMED_RESPONSE_CHUNK:
-                    bytes = GetNormalBody(responseMessage) ?? new byte[0];
+                    bytes = GetNormalBody(responseMessage) ?? EmptyArray<byte>.Value;
                     if (IsFault(responseMessage))
                     {
                         bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
@@ -87,7 +87,7 @@ namespace WireMock.Owin.Mappers
 
                 case { } typeAsString when typeAsString == typeof(string):
                     // Note: this case will also match on null 
-                    int.TryParse(responseMessage.StatusCode as string, out int result);
+                    int.TryParse(responseMessage.StatusCode as string, out var result);
                     response.StatusCode = MapStatusCode(result);
                     break;
 

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -1,18 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using WireMock.Extensions;
 using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Services;
 
 namespace WireMock.Owin;
 
 internal class MappingMatcher : IMappingMatcher
 {
     private readonly IWireMockMiddlewareOptions _options;
+    private readonly IRandomizerDoubleBetween0And1 _randomizerDoubleBetween0And1;
 
-    public MappingMatcher(IWireMockMiddlewareOptions options)
+    public MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDoubleBetween0And1 randomizerDoubleBetween0And1)
     {
         _options = Guard.NotNull(options);
+        _randomizerDoubleBetween0And1 = Guard.NotNull(randomizerDoubleBetween0And1);
     }
 
     public (MappingMatcherResult? Match, MappingMatcherResult? Partial) FindBestMatch(RequestMessage request)
@@ -21,7 +24,12 @@ internal class MappingMatcher : IMappingMatcher
 
         var possibleMappings = new List<MappingMatcherResult>();
 
-        foreach (var mapping in _options.Mappings.Values.Where(m => m.TimeSettings.IsValid()))
+        var mappings = _options.Mappings.Values
+            .Where(m => m.TimeSettings.IsValid())
+            .Where(m => m.Probability is null || m.Probability <= _randomizerDoubleBetween0And1.Generate())
+            .ToArray();
+
+        foreach (var mapping in mappings)
         {
             try
             {

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -9,6 +9,9 @@ using JetBrains.Annotations;
 using WireMock.Logging;
 using WireMock.Owin.Mappers;
 using Stef.Validation;
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
+using WireMock.Services;
 
 namespace WireMock.Owin;
 
@@ -70,7 +73,7 @@ internal class OwinSelfHost : IOwinSelfHost
         {
             var requestMapper = new OwinRequestMapper();
             var responseMapper = new OwinResponseMapper(_options);
-            var matcher = new MappingMatcher(_options);
+            var matcher = new MappingMatcher(_options, new RandomizerDoubleBetween0And1());
 
             Action<IAppBuilder> startup = app =>
             {

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -60,7 +60,7 @@ namespace WireMock.Owin
         public Task Invoke(IContext ctx)
 #endif
         {
-            if (_options.HandleRequestsSynchronously.GetValueOrDefault(true))
+            if (_options.HandleRequestsSynchronously.GetValueOrDefault(false))
             {
                 lock (_lock)
                 {
@@ -216,7 +216,12 @@ namespace WireMock.Owin
                 {
                     try
                     {
-                        await webhookSender.SendAsync(httpClientForWebhook, mapping, webhookRequest, request, response).ConfigureAwait(false);
+                        var result = await webhookSender.SendAsync(httpClientForWebhook, mapping, webhookRequest, request, response).ConfigureAwait(false);
+                        if (!result.IsSuccessStatusCode)
+                        {
+                            var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+                            _options.Logger.Warn($"Sending message to Webhook [{webHookIndex}] from Mapping '{mapping.Guid}' failed. HttpStatusCode: {result.StatusCode} Content: {content}");
+                        }
                     }
                     catch (Exception ex)
                     {

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -37,7 +37,19 @@ internal class ProxyHelper
         var requiredUri = new Uri(url);
 
         // Create HttpRequestMessage
-        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
+        var replaceSettings = proxyAndRecordSettings.ReplaceSettings;
+        string proxyUrl;
+        if (replaceSettings is not null)
+        {
+            var stringComparison = replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+            proxyUrl = url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, stringComparison);
+        }
+        else
+        {
+            proxyUrl = url;
+        }
+
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, proxyUrl);
 
         // Call the URL
         var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using JsonConverter.Abstractions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Util;
@@ -46,10 +47,28 @@ public interface IBodyRequestBuilder : IRequestMatcher
     /// WithBody: Body as object
     /// </summary>
     /// <param name="body">The body.</param>
-    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
+    /// <summary>
+    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using NewtonSoft.Json).
+    /// </summary>
+    /// <param name="body">The body.</param>
+    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
+    /// <returns>A <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
+    /// </summary>
+    /// <param name="body">The body.</param>
+    /// <param name="converter">The JsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
+    /// <returns>A <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
     /// <summary>
     /// WithBody: func (string)
     /// </summary>

src/WireMock.Net/RequestBuilders/IRequestBuilder.cs

@@ -1,9 +1,8 @@
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilder
+/// </summary>
+public interface IRequestBuilder : IClientIPRequestBuilder
 {
-    /// <summary>
-    /// IRequestBuilder
-    /// </summary>
-    public interface IRequestBuilder : IClientIPRequestBuilder
-    {
-    }
 }

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

@@ -2,10 +2,12 @@
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
 using System.Collections.Generic;
+using JsonConverter.Abstractions;
+using Newtonsoft.Json;
+using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Util;
-using Stef.Validation;
 
 namespace WireMock.RequestBuilders;
 
@@ -32,6 +34,24 @@ public partial class Request
         return this;
     }
 
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        var bodyAsJsonString = JsonConvert.SerializeObject(body);
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(converter);
+
+        var bodyAsJsonString = converter.Serialize(body, options);
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
+        return this;
+    }
+
     /// <inheritdoc />
     public IRequestBuilder WithBody(IMatcher matcher)
     {

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

@@ -1,82 +1,81 @@
-using System;
+using System;
 using System.Collections.Generic;
 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="ICookiesRequestBuilder.WithCookie(string, string, MatchBehaviour)"/>
+    public IRequestBuilder WithCookie(string name, string pattern, MatchBehaviour matchBehaviour)
     {
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string, MatchBehaviour)"/>
-        public IRequestBuilder WithCookie(string name, string pattern, MatchBehaviour matchBehaviour)
-        {
-            return WithCookie(name, pattern, true, matchBehaviour);
-        }
+        return WithCookie(name, pattern, true, matchBehaviour);
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string, bool, MatchBehaviour)"/>
-        public IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(pattern, nameof(pattern));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string, bool, MatchBehaviour)"/>
+    public IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(name, nameof(name));
+        Guard.NotNull(pattern, nameof(pattern));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, pattern, ignoreCase));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, pattern, ignoreCase));
+        return this;
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string[], MatchBehaviour)"/>
-        public IRequestBuilder WithCookie(string name, string[] patterns, MatchBehaviour matchBehaviour)
-        {
-            return WithCookie(name, patterns, true, matchBehaviour);
-        }
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string[], MatchBehaviour)"/>
+    public IRequestBuilder WithCookie(string name, string[] patterns, MatchBehaviour matchBehaviour)
+    {
+        return WithCookie(name, patterns, true, matchBehaviour);
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string[], bool, MatchBehaviour)"/>
-        public IRequestBuilder WithCookie(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNull(patterns, nameof(patterns));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, string[], bool, MatchBehaviour)"/>
+    public IRequestBuilder WithCookie(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(name, nameof(name));
+        Guard.NotNull(patterns, nameof(patterns));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, ignoreCase, patterns));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, ignoreCase, patterns));
+        return this;
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, IStringMatcher[])"/>
-        public IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, IStringMatcher[])"/>
+    public IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name, nameof(name));
+        Guard.NotNullOrEmpty(matchers, nameof(matchers));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, name, false, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, name, false, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, bool, IStringMatcher[])"/>
-        public IRequestBuilder WithCookie(string name, bool ignoreCase, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, bool, IStringMatcher[])"/>
+    public IRequestBuilder WithCookie(string name, bool ignoreCase, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name, nameof(name));
+        Guard.NotNullOrEmpty(matchers, nameof(matchers));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, name, ignoreCase, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, name, ignoreCase, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, IStringMatcher[])"/>
-        public IRequestBuilder WithCookie(string name, bool ignoreCase, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(name, nameof(name));
-            Guard.NotNullOrEmpty(matchers, nameof(matchers));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(string, IStringMatcher[])"/>
+    public IRequestBuilder WithCookie(string name, bool ignoreCase, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(name, nameof(name));
+        Guard.NotNullOrEmpty(matchers, nameof(matchers));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, ignoreCase, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, ignoreCase, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(Func{IDictionary{string, string}, bool}[])"/>
-        public IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
+    /// <inheritdoc cref="ICookiesRequestBuilder.WithCookie(Func{IDictionary{string, string}, bool}[])"/>
+    public IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs)
+    {
+        Guard.NotNullOrEmpty(funcs, nameof(funcs));
 
-            _requestMatchers.Add(new RequestMessageCookieMatcher(funcs));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageCookieMatcher(funcs));
+        return this;
     }
 }

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

@@ -7,86 +7,85 @@ using WireMock.Matchers.Request;
 using WireMock.Types;
 using Stef.Validation;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+public partial class Request
 {
-    public partial class Request
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour)"/>
+    public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour)"/>
-        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            return WithParam(key, false, matchBehaviour);
-        }
+        return WithParam(key, false, matchBehaviour);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, MatchBehaviour)"/>
-        public IRequestBuilder WithParam(string key, bool ignoreCase, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            Guard.NotNull(key);
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, MatchBehaviour)"/>
+    public IRequestBuilder WithParam(string key, bool ignoreCase, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(key);
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase));
+        return this;
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, string[])"/>
-        public IRequestBuilder WithParam(string key, params string[] values)
-        {
-            return WithParam(key, MatchBehaviour.AcceptOnMatch, false, values);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, string[])"/>
+    public IRequestBuilder WithParam(string key, params string[] values)
+    {
+        return WithParam(key, MatchBehaviour.AcceptOnMatch, false, values);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, string[])"/>
-        public IRequestBuilder WithParam(string key, bool ignoreCase, params string[] values)
-        {
-            return WithParam(key, MatchBehaviour.AcceptOnMatch, ignoreCase, values);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, string[])"/>
+    public IRequestBuilder WithParam(string key, bool ignoreCase, params string[] values)
+    {
+        return WithParam(key, MatchBehaviour.AcceptOnMatch, ignoreCase, values);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, IStringMatcher[])"/>
-        public IRequestBuilder WithParam(string key, params IStringMatcher[] matchers)
-        {
-            return WithParam(key, MatchBehaviour.AcceptOnMatch, false, matchers);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, IStringMatcher[])"/>
+    public IRequestBuilder WithParam(string key, params IStringMatcher[] matchers)
+    {
+        return WithParam(key, MatchBehaviour.AcceptOnMatch, false, matchers);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, IStringMatcher[])"/>
-        public IRequestBuilder WithParam(string key, bool ignoreCase, params IStringMatcher[] matchers)
-        {
-            return WithParam(key, MatchBehaviour.AcceptOnMatch, ignoreCase, matchers);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, bool, IStringMatcher[])"/>
+    public IRequestBuilder WithParam(string key, bool ignoreCase, params IStringMatcher[] matchers)
+    {
+        return WithParam(key, MatchBehaviour.AcceptOnMatch, ignoreCase, matchers);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, string[])"/>
-        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params string[] values)
-        {
-            return WithParam(key, matchBehaviour, false, values);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, string[])"/>
+    public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params string[] values)
+    {
+        return WithParam(key, matchBehaviour, false, values);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, string[])"/>
-        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, params string[] values)
-        {
-            Guard.NotNull(key);
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, string[])"/>
+    public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase = false, params string[] values)
+    {
+        Guard.NotNull(key);
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, values));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, values));
+        return this;
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, IStringMatcher[])"/>
-        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
-        {
-            return WithParam(key, matchBehaviour, false, matchers);
-        }
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, IStringMatcher[])"/>
+    public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
+    {
+        return WithParam(key, matchBehaviour, false, matchers);
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, IStringMatcher[])"/>
-        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase, params IStringMatcher[] matchers)
-        {
-            Guard.NotNull(key);
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, bool, IStringMatcher[])"/>
+    public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, bool ignoreCase, params IStringMatcher[] matchers)
+    {
+        Guard.NotNull(key);
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, matchers));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, ignoreCase, matchers));
+        return this;
+    }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
-        public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
-        {
-            Guard.NotNullOrEmpty(funcs, nameof(funcs));
+    /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
+    public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
+    {
+        Guard.NotNullOrEmpty(funcs, nameof(funcs));
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(funcs));
-            return this;
-        }
+        _requestMatchers.Add(new RequestMessageParamMatcher(funcs));
+        return this;
     }
 }

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

@@ -3,47 +3,46 @@ using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
+
+public partial class Request
 {
-    public partial class Request
+    /// <inheritdoc />
+    public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
     {
-        /// <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;
-        }
+        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

@@ -63,5 +63,4 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
     {
         return _requestMatchers.OfType<T>().FirstOrDefault(func);
     }
-  
 }

src/WireMock.Net/RequestMessage.cs

@@ -180,12 +180,7 @@ public class RequestMessage : IRequestMessage
 #endif
     }
 
-    /// <summary>
-    /// Get a query parameter.
-    /// </summary>
-    /// <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>
+    /// <inheritdoc />
     public WireMockList<string>? GetParameter(string key, bool ignoreCase = false)
     {
         if (Query == null)

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -92,7 +92,7 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
     /// </summary>
     /// <param name="body">The body.</param>
     /// <param name="converter">The JsonConverter.</param>
-    /// <param name="options">The IJsonConverterOption [optional].</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithBody(object body, IJsonConverter converter, JsonConverterOptions? options = null);
 
@@ -102,7 +102,7 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
     /// <param name="body">The body.</param>
     /// <param name="encoding">The body encoding, can be <c>null</c>.</param>
     /// <param name="converter">The JsonConverter.</param>
-    /// <param name="options">The IJsonConverterOption [optional].</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter converter, JsonConverterOptions? options = null);
 }

src/WireMock.Net/ResponseBuilders/IProxyResponseBuilder.cs

@@ -27,7 +27,7 @@ public interface IProxyResponseBuilder : IStatusCodeResponseBuilder
     /// WithProxy using <see cref="X509Certificate2"/>.
     /// </summary>
     /// <param name="proxyUrl">The proxy url.</param>
-    /// <param name="certificate"">The X509Certificate2.</param>
+    /// <param name="certificate">The X509Certificate2.</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithProxy(string proxyUrl, X509Certificate2 certificate);
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading;
+using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Constants;
@@ -14,7 +16,9 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
+using WireMock.Util;
 
+using static WireMock.Util.CSharpFormatter;
 namespace WireMock.Serialization;
 
 internal class MappingConverter
@@ -33,7 +37,7 @@ internal class MappingConverter
         settings ??= new MappingConverterSettings();
 
         var request = (Request)mapping.RequestMatcher;
-        var response = (Response) mapping.Provider;
+        var response = (Response)mapping.Provider;
 
         var clientIPMatcher = request.GetRequestMessageMatcher<RequestMessageClientIPMatcher>();
         var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
@@ -103,11 +107,28 @@ internal class MappingConverter
 
         if (bodyMatcher is { Matchers: { } })
         {
-            var wildcardMatcher = bodyMatcher.Matchers.OfType<WildcardMatcher>().FirstOrDefault();
-            if (wildcardMatcher is { } && wildcardMatcher.GetPatterns().Any())
+            if (bodyMatcher.Matchers.OfType<WildcardMatcher>().FirstOrDefault() is { } wildcardMatcher && wildcardMatcher.GetPatterns().Any())
             {
                 sb.AppendLine($"        .WithBody({GetString(wildcardMatcher)})");
             }
+            else if (bodyMatcher.Matchers.OfType<JsonPartialMatcher>().FirstOrDefault() is { Value: { } } jsonPartialMatcher)
+            {
+                sb.AppendLine(@$"        .WithBody(new JsonPartialMatcher(
+                                            value: {ToCSharpStringLiteral(jsonPartialMatcher.Value.ToString())},
+                                            ignoreCase: {ToCSharpBooleanLiteral(jsonPartialMatcher.IgnoreCase)},
+                                            throwException: {ToCSharpBooleanLiteral(jsonPartialMatcher.ThrowException)},
+                                            regex: {ToCSharpBooleanLiteral(jsonPartialMatcher.Regex)}
+                                         ))");
+            }
+            else if (bodyMatcher.Matchers.OfType<JsonPartialWildcardMatcher>().FirstOrDefault() is { Value: { } } jsonPartialWildcardMatcher)
+            {
+                sb.AppendLine(@$"        .WithBody(new JsonPartialWildcardMatcher(
+                                            value: {ToCSharpStringLiteral(jsonPartialWildcardMatcher.Value.ToString())},
+                                            ignoreCase: {ToCSharpBooleanLiteral(jsonPartialWildcardMatcher.IgnoreCase)},
+                                            throwException: {ToCSharpBooleanLiteral(jsonPartialWildcardMatcher.ThrowException)},
+                                            regex: {ToCSharpBooleanLiteral(jsonPartialWildcardMatcher.Regex)}
+                                         ))");
+            }
         }
 
         sb.AppendLine(@"    )");
@@ -115,24 +136,50 @@ internal class MappingConverter
         // Guid
         sb.AppendLine($"    .WithGuid(\"{mapping.Guid}\")");
 
+        if (mapping.Probability != null)
+        {
+            sb.AppendLine($"    .WithProbability({mapping.Probability.Value.ToString(CultureInfoUtils.CultureInfoEnUS)})");
+        }
+
         // Response
         sb.AppendLine("    .RespondWith(Response.Create()");
 
+        if (response.ResponseMessage.StatusCode is int or string)
+        {
+            sb.AppendLine($"        .WithStatusCode({JsonConvert.SerializeObject(response.ResponseMessage.StatusCode)})");
+        }
+        else if (response.ResponseMessage.StatusCode is HttpStatusCode httpStatusCode)
+        {
+            sb.AppendLine($"        .WithStatusCode({(int)httpStatusCode})");
+        }
+
         if (response.ResponseMessage.Headers is { })
         {
             foreach (var header in response.ResponseMessage.Headers)
             {
-                sb.AppendLine($"        .WithHeader(\"{header.Key})\", {ToValueArguments(header.Value.ToArray())})");
+                sb.AppendLine($"        .WithHeader(\"{header.Key}\", {ToValueArguments(header.Value.ToArray())})");
             }
         }
 
-        if (response.ResponseMessage.BodyData is { })
+        if (response.ResponseMessage.BodyData is { } bodyData)
         {
             switch (response.ResponseMessage.BodyData.DetectedBodyType)
             {
                 case BodyType.String:
                 case BodyType.FormUrlEncoded:
-                    sb.AppendLine($"        .WithBody(\"{response.ResponseMessage.BodyData.BodyAsString}\")");
+                    sb.AppendLine($"        .WithBody({ToCSharpStringLiteral(bodyData.BodyAsString)})");
+                    break;
+                case BodyType.Json:
+                    if (bodyData.BodyAsJson is string bodyStringValue)
+                    {
+                        sb.AppendLine($"        .WithBody({ToCSharpStringLiteral(bodyStringValue)})");
+                    }
+                    else if(bodyData.BodyAsJson is {} jsonBody)
+                    {
+                        var anonymousObjectDefinition = ConvertToAnonymousObjectDefinition(jsonBody);
+                        sb.AppendLine($"        .WithBodyAsJson({anonymousObjectDefinition})");
+                    }
+
                     break;
             }
         }
@@ -183,6 +230,7 @@ internal class MappingConverter
             WhenStateIs = mapping.ExecutionConditionState,
             SetStateTo = mapping.NextState,
             Data = mapping.Data,
+            Probability = mapping.Probability,
             Request = new RequestModel
             {
                 Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
@@ -374,7 +422,7 @@ internal class MappingConverter
 
     private static string GetString(IStringMatcher stringMatcher)
     {
-        return stringMatcher.GetPatterns().Select(p => $"\"{p.GetPattern()}\"").First();
+        return stringMatcher.GetPatterns().Select(p => ToCSharpStringLiteral(p.GetPattern())).First();
     }
 
     private static string[] GetStringArray(IReadOnlyList<IStringMatcher> stringMatchers)
@@ -427,7 +475,7 @@ internal class MappingConverter
 
     private static string ToValueArguments(string[]? values, string defaultValue = "")
     {
-        return values is { } ? string.Join(", ", values.Select(v => $"\"{v}\"")) : $"\"{defaultValue}\"";
+        return values is { } ? string.Join(", ", values.Select(ToCSharpStringLiteral)) : ToCSharpStringLiteral(defaultValue);
     }
 
     private static WebProxyModel? MapWebProxy(WebProxySettings? settings)
@@ -458,4 +506,6 @@ internal class MappingConverter
 
         return newDictionary;
     }
+
+
 }

src/WireMock.Net/Serialization/ProxyMappingConverter.cs

@@ -31,6 +31,7 @@ internal class ProxyMappingConverter
         var useDefinedRequestMatchers = proxyAndRecordSettings.UseDefinedRequestMatchers;
         var excludedHeaders = new List<string>(proxyAndRecordSettings.ExcludedHeaders ?? new string[] { }) { "Cookie" };
         var excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[0];
+        var excludedParams = proxyAndRecordSettings.ExcludedParams ?? new string[0];
 
         var request = (Request?)mapping?.RequestMatcher;
         var clientIPMatcher = request?.GetRequestMessageMatcher<RequestMessageClientIPMatcher>();
@@ -74,12 +75,21 @@ internal class ProxyMappingConverter
         {
             foreach (var paramMatcher in paramMatchers)
             {
-                newRequest.WithParam(paramMatcher.Key, paramMatcher.MatchBehaviour, paramMatcher.Matchers!.ToArray());
+                if (!excludedParams.Contains(paramMatcher.Key, StringComparer.OrdinalIgnoreCase))
+                {
+                    newRequest.WithParam(paramMatcher.Key, paramMatcher.MatchBehaviour, paramMatcher.Matchers!.ToArray());
+                }
             }
         }
         else
         {
-            requestMessage.Query?.Loop((key, value) => newRequest.WithParam(key, false, value.ToArray()));
+            requestMessage.Query?.Loop((key, value) =>
+            {
+                if (!excludedParams.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    newRequest.WithParam(key, false, value.ToArray());
+                }
+            });
         }
 
         // Cookies
@@ -179,7 +189,8 @@ internal class ProxyMappingConverter
             webhooks: null,
             useWebhooksFireAndForget: null,
             timeSettings: null,
-            data: mapping?.Data
+            data: mapping?.Data,
+            probability: null
         );
     }
 }

src/WireMock.Net/Serialization/SwaggerMapper.cs

@@ -54,10 +54,12 @@ internal static class SwaggerMapper
             {
                 operation.Parameters.Add(openApiParameter);
             }
+
             foreach (var openApiParameter in MapRequestHeaders(mapping.Request.Headers))
             {
                 operation.Parameters.Add(openApiParameter);
             }
+
             foreach (var openApiParameter in MapRequestCookies(mapping.Request.Cookies))
             {
                 operation.Parameters.Add(openApiParameter);
@@ -94,7 +96,7 @@ internal static class SwaggerMapper
         return openApiDocument.ToJson(SchemaType.OpenApi3, Formatting.Indented);
     }
 
-    private static IEnumerable<OpenApiParameter> MapRequestQueryParameters(IList<ParamModel>? queryParameters)
+    private static IReadOnlyList<OpenApiParameter> MapRequestQueryParameters(IList<ParamModel>? queryParameters)
     {
         if (queryParameters == null)
         {
@@ -146,7 +148,7 @@ internal static class SwaggerMapper
             .ToList();
     }
 
-    private static IEnumerable<OpenApiParameter> MapRequestCookies(IList<CookieModel>? cookies)
+    private static IReadOnlyList<OpenApiParameter> MapRequestCookies(IList<CookieModel>? cookies)
     {
         if (cookies == null)
         {

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -175,5 +175,13 @@ public interface IRespondWithAProvider
     /// lookup data "1"
     /// </example>
     /// </summary>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
     IRespondWithAProvider WithData(object data);
+
+    /// <summary>
+    /// Define the probability when this request should be matched. Value is between 0 and 1.
+    /// </summary>
+    /// <param name="probability">The probability when this request should be matched. Value is between 0 and 1.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithProbability(double probability);
 }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -18,6 +18,12 @@ namespace WireMock.Server;
 /// </summary>
 internal class RespondWithAProvider : IRespondWithAProvider
 {
+    private readonly RegistrationCallback _registrationCallback;
+    private readonly IRequestMatcher _requestMatcher;
+    private readonly WireMockServerSettings _settings;
+    private readonly IDateTimeUtils _dateTimeUtils;
+    private readonly bool _saveToFile;
+
     private int _priority;
     private string? _title;
     private string? _description;
@@ -26,13 +32,8 @@ internal class RespondWithAProvider : IRespondWithAProvider
     private string? _nextState;
     private string? _scenario;
     private int _timesInSameState = 1;
-    private readonly RegistrationCallback _registrationCallback;
-    private readonly IRequestMatcher _requestMatcher;
-    private readonly WireMockServerSettings _settings;
-    private readonly IDateTimeUtils _dateTimeUtils;
-    private readonly bool _saveToFile;
-
     private bool? _useWebhookFireAndForget;
+    private double? _probability;
 
     public Guid Guid { get; private set; }
 
@@ -92,7 +93,8 @@ internal class RespondWithAProvider : IRespondWithAProvider
             Webhooks,
             _useWebhookFireAndForget,
             TimeSettings,
-            Data);
+            Data,
+            _probability);
 
         _registrationCallback(mapping, _saveToFile);
     }
@@ -285,6 +287,13 @@ internal class RespondWithAProvider : IRespondWithAProvider
         return this;
     }
 
+    public IRespondWithAProvider WithProbability(double probability)
+    {
+        _probability = Guard.Condition(probability, p => p is >= 0 and <= 1.0);
+
+        return this;
+    }
+
     private static IWebhook InitWebhook(
         string url,
         string method,

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

@@ -37,6 +37,8 @@ public partial class WireMockServer
     private const string AdminRequests = "/__admin/requests";
     private const string AdminSettings = "/__admin/settings";
     private const string AdminScenarios = "/__admin/scenarios";
+    private const string AdminOpenApi = "/__admin/openapi";
+
     private const string QueryParamReloadStaticMappings = "reloadStaticMappings";
 
     private static readonly Guid ProxyMappingGuid = new("e59914fd-782e-428e-91c1-4810ffb86567");
@@ -113,6 +115,10 @@ public partial class WireMockServer
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingGet()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileGet));
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingHead()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileHead));
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingDelete()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileDelete));
+
+        // __admin/openapi
+        Given(Request.Create().WithPath($"{AdminOpenApi}/convert").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiConvertToMappings));
+        Given(Request.Create().WithPath($"{AdminOpenApi}/save").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiSaveToMappings));
     }
     #endregion
 
@@ -737,7 +743,7 @@ public partial class WireMockServer
         return encodingModel != null ? Encoding.GetEncoding(encodingModel.CodePage) : null;
     }
 
-    private static ResponseMessage ToJson<T>(T result, bool keepNullValues = false)
+    private static ResponseMessage ToJson<T>(T result, bool keepNullValues = false, object? statusCode = null)
     {
         return new ResponseMessage
         {
@@ -746,7 +752,7 @@ public partial class WireMockServer
                 DetectedBodyType = BodyType.String,
                 BodyAsString = JsonConvert.SerializeObject(result, keepNullValues ? JsonSerializationConstants.JsonSerializerSettingsIncludeNullValues : JsonSerializationConstants.JsonSerializerSettingsDefault)
             },
-            StatusCode = (int)HttpStatusCode.OK,
+            StatusCode = statusCode ?? (int)HttpStatusCode.OK,
             Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>(WireMockConstants.ContentTypeJson) } }
         };
     }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
@@ -14,7 +15,7 @@ namespace WireMock.Server;
 
 public partial class WireMockServer
 {
-    private void ConvertMappingsAndRegisterAsRespondProvider(MappingModel[] mappingModels, string? path = null)
+    private void ConvertMappingsAndRegisterAsRespondProvider(IReadOnlyList<MappingModel> mappingModels, string? path = null)
     {
         var duplicateGuids = mappingModels
             .Where(m => m.Guid != null)
@@ -46,7 +47,7 @@ public partial class WireMockServer
         }
 
         var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);
-        
+
         if (guid != null)
         {
             respondProvider = respondProvider.WithGuid(guid.Value);
@@ -107,7 +108,15 @@ public partial class WireMockServer
             respondProvider = respondProvider.WithWebhook(webhooks);
         }
 
-        respondProvider.WithWebhookFireAndForget(mappingModel.UseWebhooksFireAndForget ?? false);
+        if (mappingModel.UseWebhooksFireAndForget == true)
+        {
+            respondProvider.WithWebhookFireAndForget(mappingModel.UseWebhooksFireAndForget.Value);
+        }
+
+        if (mappingModel.Probability != null)
+        {
+            respondProvider.WithProbability(mappingModel.Probability.Value);
+        }
 
         var responseBuilder = InitResponseBuilder(mappingModel.Response);
         respondProvider.RespondWith(responseBuilder);
@@ -205,11 +214,11 @@ public partial class WireMockServer
         {
             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());
+                requestBuilder = requestBuilder.WithCookie(
+                     cookieModel.Name,
+                     cookieModel.IgnoreCase == true,
+                     cookieModel.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch,
+                     cookieModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
             }
         }
 

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

@@ -0,0 +1,54 @@
+#if OPENAPIPARSER
+using System;
+using System.Linq;
+using System.Net;
+using WireMock.Net.OpenApiParser;
+#endif
+
+namespace WireMock.Server;
+
+public partial class WireMockServer
+{
+    private IResponseMessage OpenApiConvertToMappings(IRequestMessage requestMessage)
+    {
+#if OPENAPIPARSER
+        try
+        {
+            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body, out var diagnostic);
+            return diagnostic.Errors.Any() ? ToJson(diagnostic, false, HttpStatusCode.BadRequest) : ToJson(mappingModels);
+        }
+        catch (Exception e)
+        {
+            _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e);
+            return ResponseMessageBuilder.Create(e.Message, HttpStatusCode.BadRequest);
+        }
+#else
+        return ResponseMessageBuilder.Create("Not supported for .NETStandard 1.3 and .NET 4.5.2 or lower.", 400);
+#endif
+    }
+
+    private IResponseMessage OpenApiSaveToMappings(IRequestMessage requestMessage)
+    {
+#if OPENAPIPARSER
+        try
+        {
+            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body, out var diagnostic);
+            if (diagnostic.Errors.Any())
+            {
+                return ToJson(diagnostic, false, HttpStatusCode.BadRequest);
+            }
+
+            ConvertMappingsAndRegisterAsRespondProvider(mappingModels);
+
+            return ResponseMessageBuilder.Create("OpenApi document converted to Mappings", HttpStatusCode.Created);
+        }
+        catch (Exception e)
+        {
+            _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e);
+            return ResponseMessageBuilder.Create(e.Message, HttpStatusCode.BadRequest);
+        }
+#else
+        return ResponseMessageBuilder.Create("Not supported for .NETStandard 1.3 and .NET 4.5.2 or lower.", 400);
+#endif
+    }
+}

src/WireMock.Net/Server/WireMockServer.cs

@@ -43,10 +43,14 @@ public partial class WireMockServer : IWireMockServer
     private readonly IGuidUtils _guidUtils = new GuidUtils();
     private readonly IDateTimeUtils _dateTimeUtils = new DateTimeUtils();
 
-    /// <inheritdoc cref="IWireMockServer.IsStarted" />
+    /// <inheritdoc />
     [PublicAPI]
     public bool IsStarted => _httpServer is { IsStarted: true };
 
+    /// <inheritdoc />
+    [PublicAPI]
+    public bool IsStartedWithAdminInterface => IsStarted && _settings.StartAdminInterface.GetValueOrDefault();
+
     /// <inheritdoc />
     [PublicAPI]
     public List<int> Ports { get; }

src/WireMock.Net/Services/IRandomizerDoubleBetween0And1.cs

@@ -0,0 +1,6 @@
+namespace WireMock.Services;
+
+internal interface IRandomizerDoubleBetween0And1
+{
+    double Generate();
+}

src/WireMock.Net/Services/RandomizerDoubleBetween0And1.cs

@@ -0,0 +1,14 @@
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
+
+namespace WireMock.Services;
+
+internal class RandomizerDoubleBetween0And1 : IRandomizerDoubleBetween0And1
+{
+    private readonly IRandomizerNumber<double> _randomizerDoubleBetween0And1 = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
+
+    public double Generate()
+    {
+        return _randomizerDoubleBetween0And1.Generate() ?? 0;
+    }
+}

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,85 +1,97 @@
-using JetBrains.Annotations;
-
-namespace WireMock.Settings;
-
-/// <summary>
-/// ProxyAndRecordSettings
-/// </summary>
-public class ProxyAndRecordSettings : HttpClientSettings
-{
-    /// <summary>
-    /// The URL to proxy.
-    /// </summary>
-    [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 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.
-    ///
-    /// Deprecated : use SaveMappingSettings.
-    /// </summary>
-    [PublicAPI]
-    public string SaveMappingForStatusCodePattern
-    {
-        set
-        {
-            if (SaveMappingSettings is null)
-            {
-                SaveMappingSettings = new ProxySaveMappingSettings();
-            }
-
-            SaveMappingSettings.StatusCodePattern = value;
-        }
-    }
-
-    /// <summary>
-    /// Additional SaveMappingSettings.
-    /// </summary>
-    [PublicAPI]
-    public ProxySaveMappingSettings? SaveMappingSettings { 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>
-    /// 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>
-    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-    /// - <c>false</c>, the default matchers will be used.
-    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-    ///
-    /// Default value is false.
-    /// </summary>
-    public bool UseDefinedRequestMatchers { get; set; }
-
-    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
-    /// </summary>
-    public bool AppendGuidToSavedMappingFile { get; set; }
+using JetBrains.Annotations;
+
+namespace WireMock.Settings;
+
+/// <summary>
+/// ProxyAndRecordSettings
+/// </summary>
+public class ProxyAndRecordSettings : HttpClientSettings
+{
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    [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 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.
+    ///
+    /// Deprecated : use SaveMappingSettings.
+    /// </summary>
+    [PublicAPI]
+    public string SaveMappingForStatusCodePattern
+    {
+        set
+        {
+            if (SaveMappingSettings is null)
+            {
+                SaveMappingSettings = new ProxySaveMappingSettings();
+            }
+
+            SaveMappingSettings.StatusCodePattern = value;
+        }
+    }
+
+    /// <summary>
+    /// Additional SaveMappingSettings.
+    /// </summary>
+    [PublicAPI]
+    public ProxySaveMappingSettings? SaveMappingSettings { 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 params which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedParams { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Replace Settings
+    /// </summary>
+    [PublicAPI]
+    public ProxyUrlReplaceSettings? ReplaceSettings { 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>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
 }

src/WireMock.Net/Settings/ProxyUrlReplaceSettings.cs

@@ -0,0 +1,22 @@
+namespace WireMock.Settings;
+
+/// <summary>
+/// Defines an old path param and a new path param to be replaced when proxying.
+/// </summary>
+public class ProxyUrlReplaceSettings
+{
+    /// <summary>
+    /// The old path value to be replaced by the new path value
+    /// </summary>
+    public string OldValue { get; set; } = null!;
+
+    /// <summary>
+    /// The new path value to replace the old value with
+    /// </summary>
+    public string NewValue { get; set; } = null!;
+
+    /// <summary>
+    /// Defines if the case should be ignore when replacing.
+    /// </summary>
+    public bool IgnoreCase { get; set; }
+}

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -21,7 +21,8 @@ public static class WireMockServerSettingsParser
     /// <param name="logger">The logger (optional, can be null)</param>
     /// <param name="settings">The parsed settings</param>
     [PublicAPI]
-    public static bool TryParseArguments(string[] args, [NotNullWhen(true)] out WireMockServerSettings? settings, IWireMockLogger? logger = null)
+    public static bool TryParseArguments(string[] args, [NotNullWhen(true)] out WireMockServerSettings? settings,
+        IWireMockLogger? logger = null)
     {
         Guard.HasNoNulls(args);
 
@@ -70,6 +71,17 @@ public static class WireMockServerSettingsParser
         settings.AcceptAnyClientCertificate = parser.GetBoolValue(nameof(WireMockServerSettings.AcceptAnyClientCertificate));
 #endif
 
+        ParseLoggerSettings(settings, logger, parser);
+        ParsePortSettings(settings, parser);
+        ParseProxyAndRecordSettings(settings, parser);
+        ParseCertificateSettings(settings, parser);
+
+        return true;
+    }
+
+    private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger,
+        SimpleCommandLineParser parser)
+    {
         var loggerType = parser.GetStringValue("WireMockLogger");
         switch (loggerType)
         {
@@ -86,22 +98,17 @@ public static class WireMockServerSettingsParser
                 {
                     settings.Logger = logger;
                 }
+
                 break;
         }
+    }
 
-        if (parser.Contains(nameof(WireMockServerSettings.Port)))
-        {
-            settings.Port = parser.GetIntValue(nameof(WireMockServerSettings.Port));
-        }
-        else if (settings.HostingScheme is null)
-        {
-            settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
-        }
-
+    private static void ParseProxyAndRecordSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
+    {
         var proxyUrl = parser.GetStringValue("ProxyURL") ?? parser.GetStringValue("ProxyUrl");
         if (!string.IsNullOrEmpty(proxyUrl))
         {
-            settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
+            var proxyAndRecordSettings = new ProxyAndRecordSettings
             {
                 AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect"),
                 ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
@@ -121,18 +128,27 @@ public static class WireMockServerSettingsParser
                 }
             };
 
-            string? proxyAddress = parser.GetStringValue("WebProxyAddress");
-            if (!string.IsNullOrEmpty(proxyAddress))
-            {
-                settings.ProxyAndRecordSettings.WebProxySettings = new WebProxySettings
-                {
-                    Address = proxyAddress!,
-                    UserName = parser.GetStringValue("WebProxyUserName"),
-                    Password = parser.GetStringValue("WebProxyPassword")
-                };
-            }
-        }
+            ParseWebProxyAddressSettings(proxyAndRecordSettings, parser);
+            ParseProxyUrlReplaceSettings(proxyAndRecordSettings, parser);
 
+            settings.ProxyAndRecordSettings = proxyAndRecordSettings;
+        }
+    }
+
+    private static void ParsePortSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
+    {
+        if (parser.Contains(nameof(WireMockServerSettings.Port)))
+        {
+            settings.Port = parser.GetIntValue(nameof(WireMockServerSettings.Port));
+        }
+        else if (settings.HostingScheme is null)
+        {
+            settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
+        }
+    }
+
+    private static void ParseCertificateSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
+    {
         var certificateSettings = new WireMockCertificateSettings
         {
             X509StoreName = parser.GetStringValue("X509StoreName"),
@@ -145,7 +161,33 @@ public static class WireMockServerSettingsParser
         {
             settings.CertificateSettings = certificateSettings;
         }
+    }
 
-        return true;
+    private static void ParseWebProxyAddressSettings(ProxyAndRecordSettings settings, SimpleCommandLineParser parser)
+    {
+        string? proxyAddress = parser.GetStringValue("WebProxyAddress");
+        if (!string.IsNullOrEmpty(proxyAddress))
+        {
+            settings.WebProxySettings = new WebProxySettings
+            {
+                Address = proxyAddress!,
+                UserName = parser.GetStringValue("WebProxyUserName"),
+                Password = parser.GetStringValue("WebProxyPassword")
+            };
+        }
+    }
+
+    private static void ParseProxyUrlReplaceSettings(ProxyAndRecordSettings settings, SimpleCommandLineParser parser)
+    {
+        var proxyUrlReplaceOldValue = parser.GetStringValue("ProxyUrlReplaceOldValue");
+        var proxyUrlReplaceNewValue = parser.GetStringValue("ProxyUrlReplaceNewValue");
+        if (!string.IsNullOrEmpty(proxyUrlReplaceOldValue) && proxyUrlReplaceNewValue != null)
+        {
+            settings.ReplaceSettings = new ProxyUrlReplaceSettings
+            {
+                OldValue = proxyUrlReplaceOldValue!,
+                NewValue = proxyUrlReplaceNewValue!
+            };
+        }
     }
 }

src/WireMock.Net/Util/BytesEncodingUtils.cs

@@ -17,7 +17,7 @@ namespace WireMock.Util;
 /// http://www.unicode.org/versions/corrigendum1.html
 /// http://www.ietf.org/rfc/rfc2279.txt
 /// </summary>
-public static class BytesEncodingUtils
+internal static class BytesEncodingUtils
 {
     /// <summary>
     /// Tries the get the Encoding from an array of bytes.
@@ -108,7 +108,7 @@ public static class BytesEncodingUtils
             return true;
         }
 
-        if (ch >= 0xc2 && ch <= 0xdf)
+        if (ch is >= 0xc2 and <= 0xdf)
         {
             if (position >= length - 2)
             {
@@ -145,7 +145,7 @@ public static class BytesEncodingUtils
             return true;
         }
 
-        if (ch >= 0xe1 && ch <= 0xef)
+        if (ch is >= 0xe1 and <= 0xef)
         {
             if (position >= length - 3)
             {
@@ -204,7 +204,7 @@ public static class BytesEncodingUtils
             return true;
         }
 
-        if (ch >= 0xf1 && ch <= 0xf3)
+        if (ch is >= 0xf1 and <= 0xf3)
         {
             if (position >= length - 4)
             {

src/WireMock.Net/Util/CSharpFormatter.cs

@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace WireMock.Util;
+
+internal static class CSharpFormatter
+{
+    #region Reserved Keywords
+    private static readonly HashSet<string> CSharpReservedKeywords = new(new[]
+    {
+        "abstract",
+        "as",
+        "base",
+        "bool",
+        "break",
+        "byte",
+        "case",
+        "catch",
+        "char",
+        "checked",
+        "class",
+        "const",
+        "continue",
+        "decimal",
+        "default",
+        "delegate",
+        "do",
+        "double",
+        "else",
+        "enum",
+        "event",
+        "explicit",
+        "extern",
+        "false",
+        "finally",
+        "fixed",
+        "float",
+        "for",
+        "foreach",
+        "goto",
+        "if",
+        "implicit",
+        "in",
+        "int",
+        "interface",
+        "internal",
+        "is",
+        "lock",
+        "long",
+        "namespace",
+        "new",
+        "null",
+        "object",
+        "operator",
+        "out",
+        "override",
+        "params",
+        "private",
+        "protected",
+        "public",
+        "readonly",
+        "ref",
+        "return",
+        "sbyte",
+        "sealed",
+        "short",
+        "sizeof",
+        "stackalloc",
+        "static",
+        "string",
+        "struct",
+        "switch",
+        "this",
+        "throw",
+        "true",
+        "try",
+        "typeof",
+        "uint",
+        "ulong",
+        "unchecked",
+        "unsafe",
+        "ushort",
+        "using",
+        "virtual",
+        "void",
+        "volatile",
+        "while"
+    });
+    #endregion
+
+    private const string Null = "null";
+
+    public static object ConvertToAnonymousObjectDefinition(object jsonBody)
+    {
+        var serializedBody = JsonConvert.SerializeObject(jsonBody);
+        using var jsonReader = new JsonTextReader(new StringReader(serializedBody));
+        jsonReader.DateParseHandling = DateParseHandling.None;
+        var deserializedBody = JObject.Load(jsonReader);
+
+        return ConvertJsonToAnonymousObjectDefinition(deserializedBody, 2);
+    }
+
+    public static string ConvertJsonToAnonymousObjectDefinition(JToken token, int ind = 0)
+    {
+        return token switch
+        {
+            JArray jArray => FormatArray(jArray, ind),
+            JObject jObject => FormatObject(jObject, ind),
+            JProperty jProperty => $"{FormatPropertyName(jProperty.Name)} = {ConvertJsonToAnonymousObjectDefinition(jProperty.Value, ind)}",
+            JValue jValue => jValue.Type switch
+            {
+                JTokenType.None => Null,
+                JTokenType.Integer => jValue.Value != null ? string.Format(CultureInfo.InvariantCulture, "{0}", jValue.Value) : Null,
+                JTokenType.Float => jValue.Value != null ? string.Format(CultureInfo.InvariantCulture, "{0}", jValue.Value) : Null,
+                JTokenType.String => ToCSharpStringLiteral(jValue.Value?.ToString()),
+                JTokenType.Boolean => jValue.Value != null ? string.Format(CultureInfo.InvariantCulture, "{0}", jValue.Value).ToLower() : Null,
+                JTokenType.Null => Null,
+                JTokenType.Undefined => Null,
+                JTokenType.Date when jValue.Value is DateTime dateValue =>
+                    $"DateTime.Parse({ToCSharpStringLiteral(dateValue.ToString("s"))})",
+                _ => $"UNHANDLED_CASE: {jValue.Type}"
+            },
+            _ => $"UNHANDLED_CASE: {token}"
+        };
+    }
+
+    public static string ToCSharpBooleanLiteral(bool value) => value ? "true" : "false";
+
+    public static string ToCSharpStringLiteral(string? value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return "\"\"";
+        }
+
+        if (value.Contains("\n"))
+        {
+            var escapedValue = value?.Replace("\"", "\"\"") ?? string.Empty;
+            return $"@\"{escapedValue}\"";
+        }
+        else
+        {
+            var escapedValue = value?.Replace("\"", "\\\"") ?? string.Empty;
+            return $"\"{escapedValue}\"";
+        }
+    }
+
+    public static string FormatPropertyName(string propertyName)
+    {
+        return CSharpReservedKeywords.Contains(propertyName) ? "@" + propertyName : propertyName;
+    }
+
+    private static string FormatObject(JObject jObject, int ind)
+    {
+        var indStr = new string(' ', 4 * ind);
+        var indStrSub = new string(' ', 4 * (ind + 1));
+        var items = jObject.Properties().Select(x => ConvertJsonToAnonymousObjectDefinition(x, ind + 1));
+
+        return $"new\r\n{indStr}{{\r\n{indStrSub}{string.Join($",\r\n{indStrSub}", items)}\r\n{indStr}}}";
+    }
+
+    private static string FormatArray(JArray jArray, int ind)
+    {
+        var hasComplexItems = jArray.FirstOrDefault() is JObject or JArray;
+        var items = jArray.Select(x => ConvertJsonToAnonymousObjectDefinition(x, hasComplexItems ? ind + 1 : ind));
+        if (hasComplexItems)
+        {
+            var indStr = new string(' ', 4 * ind);
+            var indStrSub = new string(' ', 4 * (ind + 1));
+            return $"new []\r\n{indStr}{{\r\n{indStrSub}{string.Join($",\r\n{indStrSub}", items)}\r\n{indStr}}}";
+        }
+
+        return $"new [] {{ {string.Join(", ", items)} }}";
+    }
+}

src/WireMock.Net/Util/ConcurrentObservableCollection.cs

@@ -1,86 +1,85 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace WireMock.Util
+namespace WireMock.Util;
+
+/// <summary>
+/// A special Collection that overrides methods of <see cref="ObservableCollection{T}"/> to make them thread safe.
+/// </summary>
+/// <typeparam name="T">The type of elements in the collection.</typeparam>
+/// <inheritdoc cref="ObservableCollection{T}" />
+internal class ConcurrentObservableCollection<T> : ObservableCollection<T>
 {
+    private readonly object _lockObject = new object();
+
+    /// <summary> 
+    /// Initializes a new instance of the <see cref="T:WireMock.Util.ConcurrentObservableCollection`1" /> class. 
+    /// </summary> 
+    public ConcurrentObservableCollection() { }
+
     /// <summary>
-    /// A special Collection that overrides methods of <see cref="ObservableCollection{T}"/> to make them thread safe.
+    /// Initializes a new instance of the <see cref="ConcurrentObservableCollection{T}"/> class that contains elements copied from the specified list.
     /// </summary>
-    /// <typeparam name="T">The type of elements in the collection.</typeparam>
-    /// <inheritdoc cref="ObservableCollection{T}" />
-    internal class ConcurrentObservableCollection<T> : ObservableCollection<T>
+    /// <param name="list">The list from which the elements are copied.</param>
+    public ConcurrentObservableCollection(List<T> list) : base(list) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConcurrentObservableCollection{T}"/> class that contains elements copied from the specified collection.
+    /// </summary>
+    /// <param name="collection">The collection from which the elements are copied.</param>
+    public ConcurrentObservableCollection(IEnumerable<T> collection) : base(collection) { }
+
+    /// <inheritdoc cref="ObservableCollection{T}.ClearItems"/>
+    protected override void ClearItems()
     {
-        private readonly object _lockObject = new object();
-
-        /// <summary> 
-        /// Initializes a new instance of the <see cref="T:WireMock.Util.ConcurrentObservableCollection`1" /> class. 
-        /// </summary> 
-        public ConcurrentObservableCollection() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrentObservableCollection{T}"/> class that contains elements copied from the specified list.
-        /// </summary>
-        /// <param name="list">The list from which the elements are copied.</param>
-        public ConcurrentObservableCollection(List<T> list) : base(list) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrentObservableCollection{T}"/> class that contains elements copied from the specified collection.
-        /// </summary>
-        /// <param name="collection">The collection from which the elements are copied.</param>
-        public ConcurrentObservableCollection(IEnumerable<T> collection) : base(collection) { }
-
-        /// <inheritdoc cref="ObservableCollection{T}.ClearItems"/>
-        protected override void ClearItems()
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                base.ClearItems();
-            }
+            base.ClearItems();
         }
+    }
 
-        /// <inheritdoc cref="ObservableCollection{T}.RemoveItem"/>
-        protected override void RemoveItem(int index)
+    /// <inheritdoc cref="ObservableCollection{T}.RemoveItem"/>
+    protected override void RemoveItem(int index)
+    {
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                base.RemoveItem(index);
-            }
+            base.RemoveItem(index);
         }
+    }
 
-        /// <inheritdoc cref="ObservableCollection{T}.InsertItem"/>
-        protected override void InsertItem(int index, T item)
+    /// <inheritdoc cref="ObservableCollection{T}.InsertItem"/>
+    protected override void InsertItem(int index, T item)
+    {
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                base.InsertItem(index, item);
-            }
+            base.InsertItem(index, item);
         }
+    }
 
-        /// <inheritdoc cref="ObservableCollection{T}.SetItem"/>
-        protected override void SetItem(int index, T item)
+    /// <inheritdoc cref="ObservableCollection{T}.SetItem"/>
+    protected override void SetItem(int index, T item)
+    {
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                base.SetItem(index, item);
-            }
+            base.SetItem(index, item);
         }
+    }
 
-        /// <inheritdoc cref="ObservableCollection{T}.MoveItem"/>
-        protected override void MoveItem(int oldIndex, int newIndex)
+    /// <inheritdoc cref="ObservableCollection{T}.MoveItem"/>
+    protected override void MoveItem(int oldIndex, int newIndex)
+    {
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                base.MoveItem(oldIndex, newIndex);
-            }
+            base.MoveItem(oldIndex, newIndex);
         }
+    }
 
-        public List<T> ToList()
+    public List<T> ToList()
+    {
+        lock (_lockObject)
         {
-            lock (_lockObject)
-            {
-                return Items.ToList();
-            }
+            return Items.ToList();
         }
     }
 }

src/WireMock.Net/Util/CultureInfoExtensions.cs

@@ -5,6 +5,8 @@ namespace WireMock.Util;
 
 internal static class CultureInfoUtils
 {
+    public static readonly CultureInfo CultureInfoEnUS = new("en-US");
+
     public static CultureInfo Parse(string? value)
     {
         if (value is null)

src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs

@@ -4,251 +4,250 @@ using System.IO;
 using JetBrains.Annotations;
 using Stef.Validation;
 
-namespace WireMock.Util
+namespace WireMock.Util;
+
+/// <summary>
+/// An EnhancedFileSystemWatcher, which can be used to suppress duplicate events that fire on a single change to the file.
+/// </summary>
+/// <seealso cref="FileSystemWatcher" />
+public class EnhancedFileSystemWatcher : FileSystemWatcher
 {
+    #region Private Members
+    // Default Watch Interval in Milliseconds
+    private const int DefaultWatchInterval = 100;
+
+    // This Dictionary keeps the track of when an event occurred last for a particular file
+    private ConcurrentDictionary<string, DateTime> _lastFileEvent = new();
+
+    // Watch Interval in Milliseconds
+    private int _interval;
+
+    // Timespan created when interval is set
+    private TimeSpan _recentTimeSpan;
+    #endregion
+
+    #region Public Properties
     /// <summary>
-    /// An EnhancedFileSystemWatcher, which can be used to suppress duplicate events that fire on a single change to the file.
+    /// Interval, in milliseconds, within which events are considered "recent".
     /// </summary>
-    /// <seealso cref="FileSystemWatcher" />
-    public class EnhancedFileSystemWatcher : FileSystemWatcher
+    [PublicAPI]
+    public int Interval
     {
-        #region Private Members
-        // Default Watch Interval in Milliseconds
-        private const int DefaultWatchInterval = 100;
-
-        // This Dictionary keeps the track of when an event occurred last for a particular file
-        private ConcurrentDictionary<string, DateTime> _lastFileEvent = new();
-
-        // Watch Interval in Milliseconds
-        private int _interval;
-
-        // Timespan created when interval is set
-        private TimeSpan _recentTimeSpan;
-        #endregion
-
-        #region Public Properties
-        /// <summary>
-        /// Interval, in milliseconds, within which events are considered "recent".
-        /// </summary>
-        [PublicAPI]
-        public int Interval
+        get => _interval;
+        set
         {
-            get => _interval;
-            set
-            {
-                _interval = value;
+            _interval = value;
 
-                // Set timespan based on the value passed
-                _recentTimeSpan = new TimeSpan(0, 0, 0, 0, value);
-            }
+            // Set timespan based on the value passed
+            _recentTimeSpan = new TimeSpan(0, 0, 0, 0, value);
         }
-
-        /// <summary>
-        /// Allows user to set whether to filter recent events.
-        /// If this is set a false, this class behaves like System.IO.FileSystemWatcher class.
-        /// </summary>
-        [PublicAPI]
-        public bool FilterRecentEvents { get; set; }
-        #endregion
-
-        #region Constructors        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
-        /// </summary>
-        /// <param name="interval">The interval.</param>
-        public EnhancedFileSystemWatcher(int interval = DefaultWatchInterval)
-        {
-            Guard.Condition(interval, i => i >= 0);
-
-            InitializeMembers(interval);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
-        /// </summary>
-        /// <param name="path">The directory to monitor, in standard or Universal Naming Convention (UNC) notation.</param>
-        /// <param name="interval">The interval.</param>
-        public EnhancedFileSystemWatcher(string path, int interval = DefaultWatchInterval) : base(path)
-        {
-            Guard.NotNullOrEmpty(path);
-            Guard.Condition(interval, i => i >= 0);
-
-            InitializeMembers(interval);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
-        /// </summary>
-        /// <param name="path">The directory to monitor, in standard or Universal Naming Convention (UNC) notation.</param>
-        /// <param name="filter">The type of files to watch. For example, "*.txt" watches for changes to all text files.</param>
-        /// <param name="interval">The interval.</param>
-        public EnhancedFileSystemWatcher(string path, string filter, int interval = DefaultWatchInterval) : base(path, filter)
-        {
-            Guard.NotNullOrEmpty(path);
-            Guard.NotNullOrEmpty(filter);
-            Guard.Condition(interval, i => i >= 0);
-
-            InitializeMembers(interval);
-        }
-        #endregion
-
-        #region Events
-        // These events hide the events from the base class. 
-        // We want to raise these events appropriately and we do not want the 
-        // users of this class subscribing to these events of the base class accidentally
-
-        /// <summary>
-        /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is changed.
-        /// </summary>
-        public new event FileSystemEventHandler? Changed;
-
-        /// <summary>
-        /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is created.
-        /// </summary>
-        public new event FileSystemEventHandler? Created;
-
-        /// <summary>
-        /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is deleted.
-        /// </summary>
-        public new event FileSystemEventHandler? Deleted;
-
-        /// <summary>
-        /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is renamed.
-        /// </summary>
-        public new event RenamedEventHandler? Renamed;
-        #endregion
-
-        #region Protected Methods to raise the Events for this class        
-        /// <summary>
-        /// Raises the <see cref="E:System.IO.FileSystemWatcher.Changed" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
-        protected new virtual void OnChanged(FileSystemEventArgs e)
-        {
-            Changed?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="E:System.IO.FileSystemWatcher.Created" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
-        protected new virtual void OnCreated(FileSystemEventArgs e)
-        {
-            Created?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="E:System.IO.FileSystemWatcher.Deleted" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
-        protected new virtual void OnDeleted(FileSystemEventArgs e)
-        {
-            Deleted?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="E:System.IO.FileSystemWatcher.Renamed" /> event.
-        /// </summary>
-        /// <param name="e">A <see cref="T:System.IO.RenamedEventArgs" /> that contains the event data.</param>
-        protected new virtual void OnRenamed(RenamedEventArgs e)
-        {
-            Renamed?.Invoke(this, e);
-        }
-        #endregion
-
-        #region Private Methods
-        /// <summary>
-        /// This Method Initializes the private members.
-        /// Interval is set to its default value of 100 millisecond.
-        /// FilterRecentEvents is set to true, _lastFileEvent dictionary is initialized.
-        /// We subscribe to the base class events.
-        /// </summary>
-        private void InitializeMembers(int interval = 100)
-        {
-            Interval = interval;
-            FilterRecentEvents = true;
-            _lastFileEvent = new ConcurrentDictionary<string, DateTime>();
-
-            base.Created += OnCreated;
-            base.Changed += OnChanged;
-            base.Deleted += OnDeleted;
-            base.Renamed += OnRenamed;
-        }
-
-        /// <summary>
-        /// This method searches the dictionary to find out when the last event occurred 
-        /// for a particular file. If that event occurred within the specified timespan
-        /// it returns true, else false
-        /// </summary>
-        /// <param name="fileName">The filename to be checked</param>
-        /// <returns>True if an event has occurred within the specified interval, False otherwise</returns>
-        private bool HasAnotherFileEventOccurredRecently(string fileName)
-        {
-            // Check dictionary only if user wants to filter recent events otherwise return value stays false.
-            if (!FilterRecentEvents)
-            {
-                return false;
-            }
-
-            bool retVal = false;
-            if (_lastFileEvent.ContainsKey(fileName))
-            {
-                // If dictionary contains the filename, check how much time has elapsed
-                // since the last event occurred. If the timespan is less that the 
-                // specified interval, set return value to true 
-                // and store current datetime in dictionary for this file
-                DateTime lastEventTime = _lastFileEvent[fileName];
-                DateTime currentTime = DateTime.Now;
-                TimeSpan timeSinceLastEvent = currentTime - lastEventTime;
-                retVal = timeSinceLastEvent < _recentTimeSpan;
-                _lastFileEvent[fileName] = currentTime;
-            }
-            else
-            {
-                // If dictionary does not contain the filename, 
-                // no event has occurred in past for this file, so set return value to false
-                // and append filename along with current datetime to the dictionary
-                _lastFileEvent.TryAdd(fileName, DateTime.Now);
-            }
-
-            return retVal;
-        }
-
-        #region FileSystemWatcher EventHandlers
-        // Base class Event Handlers. Check if an event has occurred recently and call method
-        // to raise appropriate event only if no recent event is detected
-        private void OnChanged(object sender, FileSystemEventArgs e)
-        {
-            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
-            {
-                OnChanged(e);
-            }
-        }
-
-        private void OnCreated(object sender, FileSystemEventArgs e)
-        {
-            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
-            {
-                OnCreated(e);
-            }
-        }
-
-        private void OnDeleted(object sender, FileSystemEventArgs e)
-        {
-            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
-            {
-                OnDeleted(e);
-            }
-        }
-
-        private void OnRenamed(object sender, RenamedEventArgs e)
-        {
-            if (!HasAnotherFileEventOccurredRecently(e.OldFullPath))
-            {
-                OnRenamed(e);
-            }
-        }
-        #endregion
-        #endregion
     }
+
+    /// <summary>
+    /// Allows user to set whether to filter recent events.
+    /// If this is set a false, this class behaves like System.IO.FileSystemWatcher class.
+    /// </summary>
+    [PublicAPI]
+    public bool FilterRecentEvents { get; set; }
+    #endregion
+
+    #region Constructors        
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
+    /// </summary>
+    /// <param name="interval">The interval.</param>
+    public EnhancedFileSystemWatcher(int interval = DefaultWatchInterval)
+    {
+        Guard.Condition(interval, i => i >= 0);
+
+        InitializeMembers(interval);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
+    /// </summary>
+    /// <param name="path">The directory to monitor, in standard or Universal Naming Convention (UNC) notation.</param>
+    /// <param name="interval">The interval.</param>
+    public EnhancedFileSystemWatcher(string path, int interval = DefaultWatchInterval) : base(path)
+    {
+        Guard.NotNullOrEmpty(path);
+        Guard.Condition(interval, i => i >= 0);
+
+        InitializeMembers(interval);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnhancedFileSystemWatcher"/> class.
+    /// </summary>
+    /// <param name="path">The directory to monitor, in standard or Universal Naming Convention (UNC) notation.</param>
+    /// <param name="filter">The type of files to watch. For example, "*.txt" watches for changes to all text files.</param>
+    /// <param name="interval">The interval.</param>
+    public EnhancedFileSystemWatcher(string path, string filter, int interval = DefaultWatchInterval) : base(path, filter)
+    {
+        Guard.NotNullOrEmpty(path);
+        Guard.NotNullOrEmpty(filter);
+        Guard.Condition(interval, i => i >= 0);
+
+        InitializeMembers(interval);
+    }
+    #endregion
+
+    #region Events
+    // These events hide the events from the base class. 
+    // We want to raise these events appropriately and we do not want the 
+    // users of this class subscribing to these events of the base class accidentally
+
+    /// <summary>
+    /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is changed.
+    /// </summary>
+    public new event FileSystemEventHandler? Changed;
+
+    /// <summary>
+    /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is created.
+    /// </summary>
+    public new event FileSystemEventHandler? Created;
+
+    /// <summary>
+    /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is deleted.
+    /// </summary>
+    public new event FileSystemEventHandler? Deleted;
+
+    /// <summary>
+    /// Occurs when a file or directory in the specified <see cref="P:System.IO.FileSystemWatcher.Path" /> is renamed.
+    /// </summary>
+    public new event RenamedEventHandler? Renamed;
+    #endregion
+
+    #region Protected Methods to raise the Events for this class        
+    /// <summary>
+    /// Raises the <see cref="E:System.IO.FileSystemWatcher.Changed" /> event.
+    /// </summary>
+    /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
+    protected new virtual void OnChanged(FileSystemEventArgs e)
+    {
+        Changed?.Invoke(this, e);
+    }
+
+    /// <summary>
+    /// Raises the <see cref="E:System.IO.FileSystemWatcher.Created" /> event.
+    /// </summary>
+    /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
+    protected new virtual void OnCreated(FileSystemEventArgs e)
+    {
+        Created?.Invoke(this, e);
+    }
+
+    /// <summary>
+    /// Raises the <see cref="E:System.IO.FileSystemWatcher.Deleted" /> event.
+    /// </summary>
+    /// <param name="e">A <see cref="T:System.IO.FileSystemEventArgs" /> that contains the event data.</param>
+    protected new virtual void OnDeleted(FileSystemEventArgs e)
+    {
+        Deleted?.Invoke(this, e);
+    }
+
+    /// <summary>
+    /// Raises the <see cref="E:System.IO.FileSystemWatcher.Renamed" /> event.
+    /// </summary>
+    /// <param name="e">A <see cref="T:System.IO.RenamedEventArgs" /> that contains the event data.</param>
+    protected new virtual void OnRenamed(RenamedEventArgs e)
+    {
+        Renamed?.Invoke(this, e);
+    }
+    #endregion
+
+    #region Private Methods
+    /// <summary>
+    /// This Method Initializes the private members.
+    /// Interval is set to its default value of 100 millisecond.
+    /// FilterRecentEvents is set to true, _lastFileEvent dictionary is initialized.
+    /// We subscribe to the base class events.
+    /// </summary>
+    private void InitializeMembers(int interval = 100)
+    {
+        Interval = interval;
+        FilterRecentEvents = true;
+        _lastFileEvent = new ConcurrentDictionary<string, DateTime>();
+
+        base.Created += OnCreated;
+        base.Changed += OnChanged;
+        base.Deleted += OnDeleted;
+        base.Renamed += OnRenamed;
+    }
+
+    /// <summary>
+    /// This method searches the dictionary to find out when the last event occurred 
+    /// for a particular file. If that event occurred within the specified timespan
+    /// it returns true, else false
+    /// </summary>
+    /// <param name="fileName">The filename to be checked</param>
+    /// <returns>True if an event has occurred within the specified interval, False otherwise</returns>
+    private bool HasAnotherFileEventOccurredRecently(string fileName)
+    {
+        // Check dictionary only if user wants to filter recent events otherwise return value stays false.
+        if (!FilterRecentEvents)
+        {
+            return false;
+        }
+
+        bool retVal = false;
+        if (_lastFileEvent.ContainsKey(fileName))
+        {
+            // If dictionary contains the filename, check how much time has elapsed
+            // since the last event occurred. If the timespan is less that the 
+            // specified interval, set return value to true 
+            // and store current datetime in dictionary for this file
+            DateTime lastEventTime = _lastFileEvent[fileName];
+            DateTime currentTime = DateTime.Now;
+            TimeSpan timeSinceLastEvent = currentTime - lastEventTime;
+            retVal = timeSinceLastEvent < _recentTimeSpan;
+            _lastFileEvent[fileName] = currentTime;
+        }
+        else
+        {
+            // If dictionary does not contain the filename, 
+            // no event has occurred in past for this file, so set return value to false
+            // and append filename along with current datetime to the dictionary
+            _lastFileEvent.TryAdd(fileName, DateTime.Now);
+        }
+
+        return retVal;
+    }
+
+    #region FileSystemWatcher EventHandlers
+    // Base class Event Handlers. Check if an event has occurred recently and call method
+    // to raise appropriate event only if no recent event is detected
+    private void OnChanged(object sender, FileSystemEventArgs e)
+    {
+        if (!HasAnotherFileEventOccurredRecently(e.FullPath))
+        {
+            OnChanged(e);
+        }
+    }
+
+    private void OnCreated(object sender, FileSystemEventArgs e)
+    {
+        if (!HasAnotherFileEventOccurredRecently(e.FullPath))
+        {
+            OnCreated(e);
+        }
+    }
+
+    private void OnDeleted(object sender, FileSystemEventArgs e)
+    {
+        if (!HasAnotherFileEventOccurredRecently(e.FullPath))
+        {
+            OnDeleted(e);
+        }
+    }
+
+    private void OnRenamed(object sender, RenamedEventArgs e)
+    {
+        if (!HasAnotherFileEventOccurredRecently(e.OldFullPath))
+        {
+            OnRenamed(e);
+        }
+    }
+    #endregion
+    #endregion
 }

src/WireMock.Net/Util/PortUtils.cs

@@ -9,7 +9,7 @@ namespace WireMock.Util;
 /// <summary>
 /// Port Utility class
 /// </summary>
-public static class PortUtils
+internal static class PortUtils
 {
     private static readonly Regex UrlDetailsRegex = new(@"^((?<proto>\w+)://)(?<host>[^/]+?):(?<port>\d+)\/?$", RegexOptions.Compiled);
 

src/WireMock.Net/Util/QueryStringParser.cs

@@ -32,7 +32,7 @@ internal static class QueryStringParser
         {
             if (part.Length == 2)
             {
-                nameValueCollection.Add(part[0], part[1]);
+                nameValueCollection.Add(part[0], WebUtility.UrlDecode(part[1]));
             }
         }
 

src/WireMock.Net/Util/RegexUtils.cs

@@ -25,7 +25,7 @@ internal static class RegexUtils
         return namedGroupsDictionary;
     }
 
-    public static (bool IsValid, bool Result) MatchRegex(string pattern, string input, bool useRegexExtended = true)
+    public static (bool IsValid, bool Result) MatchRegex(string? pattern, string input, bool useRegexExtended = true)
     {
         if (string.IsNullOrEmpty(pattern))
         {

src/WireMock.Net/Util/TinyMapperUtils.cs

@@ -1,29 +1,31 @@
-using Nelibur.ObjectMapper;
-using WireMock.Admin.Settings;
-using WireMock.Settings;
-
-namespace WireMock.Util;
-
-internal sealed class TinyMapperUtils
-{
-    public static TinyMapperUtils Instance { get; } = new();
-
-    private TinyMapperUtils()
-    {
-        TinyMapper.Bind<ProxyAndRecordSettings, ProxyAndRecordSettingsModel>();
-        TinyMapper.Bind<WebProxySettings, WebProxySettingsModel>();
-
-        TinyMapper.Bind<ProxyAndRecordSettingsModel, ProxyAndRecordSettings>();
-        TinyMapper.Bind<WebProxySettingsModel, WebProxySettings>();
-    }
-
-    public ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance)
-    {
-        return instance == null ? null : TinyMapper.Map<ProxyAndRecordSettingsModel>(instance);
-    }
-
-    public ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model)
-    {
-        return model == null ? null : TinyMapper.Map<ProxyAndRecordSettings>(model);
-    }
+using Nelibur.ObjectMapper;
+using WireMock.Admin.Settings;
+using WireMock.Settings;
+
+namespace WireMock.Util;
+
+internal sealed class TinyMapperUtils
+{
+    public static TinyMapperUtils Instance { get; } = new();
+
+    private TinyMapperUtils()
+    {
+        TinyMapper.Bind<ProxyAndRecordSettings, ProxyAndRecordSettingsModel>();
+        TinyMapper.Bind<WebProxySettings, WebProxySettingsModel>();
+        TinyMapper.Bind<ProxyUrlReplaceSettings, ProxyUrlReplaceSettingsModel>();
+
+        TinyMapper.Bind<ProxyAndRecordSettingsModel, ProxyAndRecordSettings>();
+        TinyMapper.Bind<WebProxySettingsModel, WebProxySettings>();
+        TinyMapper.Bind<ProxyUrlReplaceSettingsModel, ProxyUrlReplaceSettings>();
+    }
+
+    public ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance)
+    {
+        return instance == null ? null : TinyMapper.Map<ProxyAndRecordSettingsModel>(instance);
+    }
+
+    public ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model)
+    {
+        return model == null ? null : TinyMapper.Map<ProxyAndRecordSettings>(model);
+    }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -35,15 +35,19 @@
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-        <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+        <DefineConstants>$(DefineConstants);NETSTANDARD;USE_ASPNETCORE</DefineConstants>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0'or '$(TargetFramework)' == 'net7.0' ">
-        <DefineConstants>USE_ASPNETCORE</DefineConstants>
+        <DefineConstants>$(DefineConstants);USE_ASPNETCORE</DefineConstants>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-        <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+        <DefineConstants>$(DefineConstants);USE_ASPNETCORE;NET46</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452'">
+        <DefineConstants>$(DefineConstants);OPENAPIPARSER</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
@@ -189,4 +193,8 @@
         <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />
     </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452'">
+        <ProjectReference Include="..\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj" />
+    </ItemGroup>
 </Project>

src/WireMock.Org.Abstractions/MappingsResponseFaultConstants.cs

@@ -1,16 +1,11 @@
-namespace WireMock.Org.Abstractions
+namespace WireMock.Org.Abstractions;
+
+/// <summary>
+/// The fault to apply (instead of a full, valid response).
+/// </summary>
+public static class MappingsResponseFaultConstants
 {
-    /// <summary>
-    /// The fault to apply (instead of a full, valid response).
-    /// </summary>
-    public static class MappingsResponseFaultConstants
-    {
-        public const string CONNECTIONRESETBYPEER = "CONNECTION_RESET_BY_PEER";
+    public const string EMPTYRESPONSE = "EMPTY_RESPONSE";
 
-        public const string EMPTYRESPONSE = "EMPTY_RESPONSE";
-
-        public const string MALFORMEDRESPONSECHUNK = "MALFORMED_RESPONSE_CHUNK";
-
-        public const string RANDOMDATATHENCLOSE = "RANDOM_DATA_THEN_CLOSE";
-    }
-}
+    public const string MALFORMEDRESPONSECHUNK = "MALFORMED_RESPONSE_CHUNK";
+}

test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs

@@ -1,7 +1,9 @@
 using NFluent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using FluentAssertions;
 using WireMock.Http;
 using WireMock.Models;
 using WireMock.Types;
@@ -160,4 +162,29 @@ public class HttpRequestMessageHelperTests
         // Assert
         Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii");
     }
+
+    [Theory]
+    [InlineData("HEAD", true)]
+    [InlineData("GET", false)]
+    [InlineData("PUT", false)]
+    [InlineData("POST", false)]
+    [InlineData("DELETE", false)]
+    [InlineData("TRACE", false)]
+    [InlineData("OPTIONS", false)]
+    [InlineData("CONNECT", false)]
+    [InlineData("PATCH", false)]
+    public void HttpRequestMessageHelper_Create_ContentLengthAllowedForMethod(string method, bool resultShouldBe)
+    {
+        // Arrange
+        var key = "Content-Length";
+        var value = 1234;
+        var headers = new Dictionary<string, string[]> { { key, new[] { "1234" } } };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), method, ClientIp, null, headers);
+
+        // Act
+        var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+        // Assert
+        message.Content?.Headers.ContentLength.Should().Be(resultShouldBe ? value : null);
+    }
 }

test/WireMock.Net.Tests/OpenApiParser/petstore-openapi3.json

@@ -0,0 +1,840 @@
+{
+	"openapi": "3.0.2",
+	"info": {
+		"title": "Swagger Petstore - OpenAPI 3.0",
+		"description": "This is a sample Pet Store Server based on the OpenAPI 3.0 specification.  You can find out more about\nSwagger at [http://swagger.io](http://swagger.io). In the third iteration of the pet store, we've switched to the design first approach!\nYou can now help us improve the API whether it's by making changes to the definition itself or to the code.\nThat way, with time, we can improve the API in general, and expose some of the new features in OAS3.\n\nSome useful links:\n- [The Pet Store repository](https://github.com/swagger-api/swagger-petstore)\n- [The source API definition for the Pet Store](https://github.com/swagger-api/swagger-petstore/blob/master/src/main/resources/openapi.yaml) ",
+		"termsOfService": "http://swagger.io/terms/",
+		"contact": { "email": "apiteam@swagger.io" },
+		"license": {
+			"name": "Apache 2.0",
+			"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+		},
+		"version": "1.0.4"
+	},
+	"externalDocs": {
+		"description": "Find out more about Swagger",
+		"url": "http://swagger.io"
+	},
+	"servers": [ { "url": "/api/v3" } ],
+	"tags": [
+		{
+			"name": "pet",
+			"description": "Everything about your Pets",
+			"externalDocs": {
+				"description": "Find out more",
+				"url": "http://swagger.io"
+			}
+		},
+		{
+			"name": "store",
+			"description": "Operations about user"
+		},
+		{
+			"name": "user",
+			"description": "Access to Petstore orders",
+			"externalDocs": {
+				"description": "Find out more about our store",
+				"url": "http://swagger.io"
+			}
+		}
+	],
+	"paths": {
+		"/pet": {
+			"put": {
+				"tags": [ "pet" ],
+				"summary": "Update an existing pet",
+				"description": "Update an existing pet by Id",
+				"operationId": "updatePet",
+				"requestBody": {
+					"description": "Update an existent pet in the store",
+					"content": {
+						"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } },
+						"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } },
+						"application/x-www-form-urlencoded": { "schema": { "$ref": "#/components/schemas/Pet" } }
+					},
+					"required": true
+				},
+				"responses": {
+					"200": {
+						"description": "Successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } }
+						}
+					},
+					"400": { "description": "Invalid ID supplied" },
+					"404": { "description": "Pet not found" },
+					"405": { "description": "Validation exception" }
+				},
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			},
+			"post": {
+				"tags": [ "pet" ],
+				"summary": "Add a new pet to the store",
+				"description": "Add a new pet to the store",
+				"operationId": "addPet",
+				"requestBody": {
+					"description": "Create a new pet in the store",
+					"content": {
+						"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } },
+						"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } },
+						"application/x-www-form-urlencoded": { "schema": { "$ref": "#/components/schemas/Pet" } }
+					},
+					"required": true
+				},
+				"responses": {
+					"200": {
+						"description": "Successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } }
+						}
+					},
+					"405": { "description": "Invalid input" }
+				},
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			}
+		},
+		"/pet/findByStatus": {
+			"get": {
+				"tags": [ "pet" ],
+				"summary": "Finds Pets by status",
+				"description": "Multiple status values can be provided with comma separated strings",
+				"operationId": "findPetsByStatus",
+				"parameters": [
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Status values that need to be considered for filter",
+						"required": false,
+						"explode": true,
+						"schema": {
+							"type": "string",
+							"default": "available",
+							"enum": [ "available", "pending", "sold" ]
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/xml": {
+								"schema": {
+									"type": "array",
+									"items": { "$ref": "#/components/schemas/Pet" }
+								}
+							},
+							"application/json": {
+								"schema": {
+									"type": "array",
+									"items": { "$ref": "#/components/schemas/Pet" }
+								}
+							}
+						}
+					},
+					"400": { "description": "Invalid status value" }
+				},
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			}
+		},
+		"/pet/findByTags": {
+			"get": {
+				"tags": [ "pet" ],
+				"summary": "Finds Pets by tags",
+				"description": "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
+				"operationId": "findPetsByTags",
+				"parameters": [
+					{
+						"name": "tags",
+						"in": "query",
+						"description": "Tags to filter by",
+						"required": false,
+						"explode": true,
+						"schema": {
+							"type": "array",
+							"items": { "type": "string" }
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/xml": {
+								"schema": {
+									"type": "array",
+									"items": { "$ref": "#/components/schemas/Pet" }
+								}
+							},
+							"application/json": {
+								"schema": {
+									"type": "array",
+									"items": { "$ref": "#/components/schemas/Pet" }
+								}
+							}
+						}
+					},
+					"400": { "description": "Invalid tag value" }
+				},
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			}
+		},
+		"/pet/{petId}": {
+			"get": {
+				"tags": [ "pet" ],
+				"summary": "Find pet by ID",
+				"description": "Returns a single pet",
+				"operationId": "getPetById",
+				"parameters": [
+					{
+						"name": "petId",
+						"in": "path",
+						"description": "ID of pet to return",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } }
+						}
+					},
+					"400": { "description": "Invalid ID supplied" },
+					"404": { "description": "Pet not found" }
+				},
+				"security": [
+					{ "api_key": [] },
+					{ "petstore_auth": [ "write:pets", "read:pets" ] }
+				]
+			},
+			"post": {
+				"tags": [ "pet" ],
+				"summary": "Updates a pet in the store with form data",
+				"description": "",
+				"operationId": "updatePetWithForm",
+				"parameters": [
+					{
+						"name": "petId",
+						"in": "path",
+						"description": "ID of pet that needs to be updated",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					},
+					{
+						"name": "name",
+						"in": "query",
+						"description": "Name of pet that needs to be updated",
+						"schema": { "type": "string" }
+					},
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Status of pet that needs to be updated",
+						"schema": { "type": "string" }
+					}
+				],
+				"responses": { "405": { "description": "Invalid input" } },
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			},
+			"delete": {
+				"tags": [ "pet" ],
+				"summary": "Deletes a pet",
+				"description": "",
+				"operationId": "deletePet",
+				"parameters": [
+					{
+						"name": "api_key",
+						"in": "header",
+						"description": "",
+						"required": false,
+						"schema": { "type": "string" }
+					},
+					{
+						"name": "petId",
+						"in": "path",
+						"description": "Pet id to delete",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					}
+				],
+				"responses": { "400": { "description": "Invalid pet value" } },
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			}
+		},
+		"/pet/{petId}/uploadImage": {
+			"post": {
+				"tags": [ "pet" ],
+				"summary": "uploads an image",
+				"description": "",
+				"operationId": "uploadFile",
+				"parameters": [
+					{
+						"name": "petId",
+						"in": "path",
+						"description": "ID of pet to update",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					},
+					{
+						"name": "additionalMetadata",
+						"in": "query",
+						"description": "Additional Metadata",
+						"required": false,
+						"schema": { "type": "string" }
+					}
+				],
+				"requestBody": {
+					"content": {
+						"application/octet-stream": {
+							"schema": {
+								"type": "string",
+								"format": "binary"
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": { "application/json": { "schema": { "$ref": "#/components/schemas/ApiResponse" } } }
+					}
+				},
+				"security": [ { "petstore_auth": [ "write:pets", "read:pets" ] } ]
+			}
+		},
+		"/store/inventory": {
+			"get": {
+				"tags": [ "store" ],
+				"summary": "Returns pet inventories by status",
+				"description": "Returns a map of status codes to quantities",
+				"operationId": "getInventory",
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/json": {
+								"schema": {
+									"type": "object",
+									"additionalProperties": {
+										"type": "integer",
+										"format": "int32"
+									}
+								}
+							}
+						}
+					}
+				},
+				"security": [ { "api_key": [] } ]
+			}
+		},
+		"/store/order": {
+			"post": {
+				"tags": [ "store" ],
+				"summary": "Place an order for a pet",
+				"description": "Place a new order in the store",
+				"operationId": "placeOrder",
+				"requestBody": {
+					"content": {
+						"application/json": { "schema": { "$ref": "#/components/schemas/Order" } },
+						"application/xml": { "schema": { "$ref": "#/components/schemas/Order" } },
+						"application/x-www-form-urlencoded": { "schema": { "$ref": "#/components/schemas/Order" } }
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": { "application/json": { "schema": { "$ref": "#/components/schemas/Order" } } }
+					},
+					"405": { "description": "Invalid input" }
+				}
+			}
+		},
+		"/store/order/{orderId}": {
+			"get": {
+				"tags": [ "store" ],
+				"summary": "Find purchase order by ID",
+				"description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+				"operationId": "getOrderById",
+				"parameters": [
+					{
+						"name": "orderId",
+						"in": "path",
+						"description": "ID of order that needs to be fetched",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/Order" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/Order" } }
+						}
+					},
+					"400": { "description": "Invalid ID supplied" },
+					"404": { "description": "Order not found" }
+				}
+			},
+			"delete": {
+				"tags": [ "store" ],
+				"summary": "Delete purchase order by ID",
+				"description": "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
+				"operationId": "deleteOrder",
+				"parameters": [
+					{
+						"name": "orderId",
+						"in": "path",
+						"description": "ID of the order that needs to be deleted",
+						"required": true,
+						"schema": {
+							"type": "integer",
+							"format": "int64"
+						}
+					}
+				],
+				"responses": {
+					"400": { "description": "Invalid ID supplied" },
+					"404": { "description": "Order not found" }
+				}
+			}
+		},
+		"/user": {
+			"post": {
+				"tags": [ "user" ],
+				"summary": "Create user",
+				"description": "This can only be done by the logged in user.",
+				"operationId": "createUser",
+				"requestBody": {
+					"description": "Created user object",
+					"content": {
+						"application/json": { "schema": { "$ref": "#/components/schemas/User" } },
+						"application/xml": { "schema": { "$ref": "#/components/schemas/User" } },
+						"application/x-www-form-urlencoded": { "schema": { "$ref": "#/components/schemas/User" } }
+					}
+				},
+				"responses": {
+					"default": {
+						"description": "successful operation",
+						"content": {
+							"application/json": { "schema": { "$ref": "#/components/schemas/User" } },
+							"application/xml": { "schema": { "$ref": "#/components/schemas/User" } }
+						}
+					}
+				}
+			}
+		},
+		"/user/createWithList": {
+			"post": {
+				"tags": [ "user" ],
+				"summary": "Creates list of users with given input array",
+				"description": "Creates list of users with given input array",
+				"operationId": "createUsersWithListInput",
+				"requestBody": {
+					"content": {
+						"application/json": {
+							"schema": {
+								"type": "array",
+								"items": { "$ref": "#/components/schemas/User" }
+							}
+						}
+					}
+				},
+				"responses": {
+					"200": {
+						"description": "Successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/User" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/User" } }
+						}
+					},
+					"default": { "description": "successful operation" }
+				}
+			}
+		},
+		"/user/login": {
+			"get": {
+				"tags": [ "user" ],
+				"summary": "Logs user into the system",
+				"description": "",
+				"operationId": "loginUser",
+				"parameters": [
+					{
+						"name": "username",
+						"in": "query",
+						"description": "The user name for login",
+						"required": false,
+						"schema": { "type": "string" }
+					},
+					{
+						"name": "password",
+						"in": "query",
+						"description": "The password for login in clear text",
+						"required": false,
+						"schema": { "type": "string" }
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"headers": {
+							"X-Rate-Limit": {
+								"description": "calls per hour allowed by the user",
+								"schema": {
+									"type": "integer",
+									"format": "int32"
+								}
+							},
+							"X-Expires-After": {
+								"description": "date in UTC when toekn expires",
+								"schema": {
+									"type": "string",
+									"format": "date-time"
+								}
+							}
+						},
+						"content": {
+							"application/xml": { "schema": { "type": "string" } },
+							"application/json": { "schema": { "type": "string" } }
+						}
+					},
+					"400": { "description": "Invalid username/password supplied" }
+				}
+			}
+		},
+		"/user/logout": {
+			"get": {
+				"tags": [ "user" ],
+				"summary": "Logs out current logged in user session",
+				"description": "",
+				"operationId": "logoutUser",
+				"parameters": [],
+				"responses": { "default": { "description": "successful operation" } }
+			}
+		},
+		"/user/{username}": {
+			"get": {
+				"tags": [ "user" ],
+				"summary": "Get user by user name",
+				"description": "",
+				"operationId": "getUserByName",
+				"parameters": [
+					{
+						"name": "username",
+						"in": "path",
+						"description": "The name that needs to be fetched. Use user1 for testing. ",
+						"required": true,
+						"schema": { "type": "string" }
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "successful operation",
+						"content": {
+							"application/xml": { "schema": { "$ref": "#/components/schemas/User" } },
+							"application/json": { "schema": { "$ref": "#/components/schemas/User" } }
+						}
+					},
+					"400": { "description": "Invalid username supplied" },
+					"404": { "description": "User not found" }
+				}
+			},
+			"put": {
+				"tags": [ "user" ],
+				"summary": "Update user",
+				"description": "This can only be done by the logged in user.",
+				"operationId": "updateUser",
+				"parameters": [
+					{
+						"name": "username",
+						"in": "path",
+						"description": "name that need to be deleted",
+						"required": true,
+						"schema": { "type": "string" }
+					}
+				],
+				"requestBody": {
+					"description": "Update an existent user in the store",
+					"content": {
+						"application/json": { "schema": { "$ref": "#/components/schemas/User" } },
+						"application/xml": { "schema": { "$ref": "#/components/schemas/User" } },
+						"application/x-www-form-urlencoded": { "schema": { "$ref": "#/components/schemas/User" } }
+					}
+				},
+				"responses": { "default": { "description": "successful operation" } }
+			},
+			"delete": {
+				"tags": [ "user" ],
+				"summary": "Delete user",
+				"description": "This can only be done by the logged in user.",
+				"operationId": "deleteUser",
+				"parameters": [
+					{
+						"name": "username",
+						"in": "path",
+						"description": "The name that needs to be deleted",
+						"required": true,
+						"schema": { "type": "string" }
+					}
+				],
+				"responses": {
+					"400": { "description": "Invalid username supplied" },
+					"404": { "description": "User not found" }
+				}
+			}
+		}
+	},
+	"components": {
+		"schemas": {
+			"Order": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64",
+						"example": 10
+					},
+					"petId": {
+						"type": "integer",
+						"format": "int64",
+						"example": 198772
+					},
+					"quantity": {
+						"type": "integer",
+						"format": "int32",
+						"example": 7
+					},
+					"shipDate": {
+						"type": "string",
+						"format": "date-time"
+					},
+					"status": {
+						"type": "string",
+						"description": "Order Status",
+						"example": "approved",
+						"enum": [ "placed", "approved", "delivered" ]
+					},
+					"complete": { "type": "boolean" }
+				},
+				"xml": { "name": "order" }
+			},
+			"Customer": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64",
+						"example": 100000
+					},
+					"username": {
+						"type": "string",
+						"example": "fehguy"
+					},
+					"address": {
+						"type": "array",
+						"xml": {
+							"name": "addresses",
+							"wrapped": true
+						},
+						"items": { "$ref": "#/components/schemas/Address" }
+					}
+				},
+				"xml": { "name": "customer" }
+			},
+			"Address": {
+				"type": "object",
+				"properties": {
+					"street": {
+						"type": "string",
+						"example": "437 Lytton"
+					},
+					"city": {
+						"type": "string",
+						"example": "Palo Alto"
+					},
+					"state": {
+						"type": "string",
+						"example": "CA"
+					},
+					"zip": {
+						"type": "string",
+						"example": "94301"
+					}
+				},
+				"xml": { "name": "address" }
+			},
+			"Category": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64",
+						"example": 1
+					},
+					"name": {
+						"type": "string",
+						"example": "Dogs"
+					}
+				},
+				"xml": { "name": "category" }
+			},
+			"User": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64",
+						"example": 10
+					},
+					"username": {
+						"type": "string",
+						"example": "theUser"
+					},
+					"firstName": {
+						"type": "string",
+						"example": "John"
+					},
+					"lastName": {
+						"type": "string",
+						"example": "James"
+					},
+					"email": {
+						"type": "string",
+						"example": "john@email.com"
+					},
+					"password": {
+						"type": "string",
+						"example": "12345"
+					},
+					"phone": {
+						"type": "string",
+						"example": "12345"
+					},
+					"userStatus": {
+						"type": "integer",
+						"description": "User Status",
+						"format": "int32",
+						"example": 1
+					}
+				},
+				"xml": { "name": "user" }
+			},
+			"Tag": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64"
+					},
+					"name": { "type": "string" }
+				},
+				"xml": { "name": "tag" }
+			},
+			"Pet": {
+				"required": [ "name", "photoUrls" ],
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64",
+						"example": 10
+					},
+					"name": {
+						"type": "string",
+						"example": "doggie"
+					},
+					"category": { "$ref": "#/components/schemas/Category" },
+					"photoUrls": {
+						"type": "array",
+						"xml": { "wrapped": true },
+						"items": {
+							"type": "string",
+							"xml": { "name": "photoUrl" }
+						}
+					},
+					"tags": {
+						"type": "array",
+						"xml": { "wrapped": true },
+						"items": { "$ref": "#/components/schemas/Tag" }
+					},
+					"status": {
+						"type": "string",
+						"description": "pet status in the store",
+						"enum": [ "available", "pending", "sold" ]
+					}
+				},
+				"xml": { "name": "pet" }
+			},
+			"ApiResponse": {
+				"type": "object",
+				"properties": {
+					"code": {
+						"type": "integer",
+						"format": "int32"
+					},
+					"type": { "type": "string" },
+					"message": { "type": "string" }
+				},
+				"xml": { "name": "##default" }
+			}
+		},
+		"requestBodies": {
+			"Pet": {
+				"description": "Pet object that needs to be added to the store",
+				"content": {
+					"application/json": { "schema": { "$ref": "#/components/schemas/Pet" } },
+					"application/xml": { "schema": { "$ref": "#/components/schemas/Pet" } }
+				}
+			},
+			"UserArray": {
+				"description": "List of user object",
+				"content": {
+					"application/json": {
+						"schema": {
+							"type": "array",
+							"items": { "$ref": "#/components/schemas/User" }
+						}
+					}
+				}
+			}
+		},
+		"securitySchemes": {
+			"petstore_auth": {
+				"type": "oauth2",
+				"flows": {
+					"implicit": {
+						"authorizationUrl": "https://petstore.swagger.io/oauth/authorize",
+						"scopes": {
+							"write:pets": "modify pets in your account",
+							"read:pets": "read your pets"
+						}
+					}
+				}
+			},
+			"api_key": {
+				"type": "apiKey",
+				"name": "api_key",
+				"in": "header"
+			}
+		}
+	}
+}

test/WireMock.Net.Tests/OpenApiParser/petstore.yml

@@ -0,0 +1,730 @@
+swagger: '2.0'
+info:
+  description: 'This is a sample server Petstore server. Copied from https://github.com/swagger-api/swagger-codegen/blob/master/modules/swagger-codegen/src/test/resources/2_0/petstore.yaml.'
+  version: 1.0.0
+  title: Swagger Petstore
+  termsOfService: 'http://swagger.io/terms/'
+  contact:
+    email: apiteam@swagger.io
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+host: petstore.swagger.io
+basePath: /v2
+tags:
+  - name: pet
+    description: Everything about your Pets
+    externalDocs:
+      description: Find out more
+      url: 'http://swagger.io'
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+    externalDocs:
+      description: Find out more about our store
+      url: 'http://swagger.io'
+schemes:
+  - http
+paths:
+  /pet:
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ''
+      operationId: addPet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          schema:
+            $ref: '#/definitions/Pet'
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+    put:
+      tags:
+        - pet
+      summary: Update an existing pet
+      description: ''
+      operationId: updatePet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          schema:
+            $ref: '#/definitions/Pet'
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+        '405':
+          description: Validation exception
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByStatus:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by status
+      description: Multiple status values can be provided with comma separated strings
+      operationId: findPetsByStatus
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: status
+          in: query
+          description: Status values that need to be considered for filter
+          required: true
+          type: array
+          items:
+            type: string
+            enum:
+              - available
+              - pending
+              - sold
+            default: available
+          collectionFormat: csv
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid status value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByTags:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by tags
+      description: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.'
+      operationId: findPetsByTags
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: tags
+          in: query
+          description: Tags to filter by
+          required: true
+          type: array
+          items:
+            type: string
+          collectionFormat: csv
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid tag value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      deprecated: true
+  '/pet/{petId}':
+    get:
+      tags:
+        - pet
+      summary: Find pet by ID
+      description: Returns a single pet
+      operationId: getPetById
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to return
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+      security:
+        - api_key: []
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ''
+      operationId: updatePetWithForm
+      consumes:
+        - application/x-www-form-urlencoded
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet that needs to be updated
+          required: true
+          type: integer
+          format: int64
+        - name: name
+          in: formData
+          description: Updated name of the pet
+          required: false
+          type: string
+        - name: status
+          in: formData
+          description: Updated status of the pet
+          required: false
+          type: string
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+    delete:
+      tags:
+        - pet
+      summary: Deletes a pet
+      description: ''
+      operationId: deletePet
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: api_key
+          in: header
+          required: false
+          type: string
+        - name: petId
+          in: path
+          description: Pet id to delete
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '400':
+          description: Invalid pet value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  '/pet/{petId}/uploadImage':
+    post:
+      tags:
+        - pet
+      summary: uploads an image
+      description: ''
+      operationId: uploadFile
+      consumes:
+        - multipart/form-data
+      produces:
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          type: integer
+          format: int64
+        - name: additionalMetadata
+          in: formData
+          description: Additional data to pass to server
+          required: false
+          type: string
+        - name: file
+          in: formData
+          description: file to upload
+          required: false
+          type: file
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/ApiResponse'
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /store/inventory:
+    get:
+      tags:
+        - store
+      summary: Returns pet inventories by status
+      description: Returns a map of status codes to quantities
+      operationId: getInventory
+      produces:
+        - application/json
+      parameters: []
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: object
+            additionalProperties:
+              type: integer
+              format: int32
+      security:
+        - api_key: []
+  /store/order:
+    post:
+      tags:
+        - store
+      summary: Place an order for a pet
+      description: ''
+      operationId: placeOrder
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: order placed for purchasing the pet
+          required: true
+          schema:
+            $ref: '#/definitions/Order'
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Order'
+        '400':
+          description: Invalid Order
+  '/store/order/{orderId}':
+    get:
+      tags:
+        - store
+      summary: Find purchase order by ID
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      operationId: getOrderById
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of pet that needs to be fetched
+          required: true
+          type: integer
+          maximum: 5
+          minimum: 1
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Order'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+    delete:
+      tags:
+        - store
+      summary: Delete purchase order by ID
+      description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+      operationId: deleteOrder
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of the order that needs to be deleted
+          required: true
+          type: string
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+  /user:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Created user object
+          required: true
+          schema:
+            $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/createWithArray:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithArrayInput
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/createWithList:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithListInput
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/login:
+    get:
+      tags:
+        - user
+      summary: Logs user into the system
+      description: ''
+      operationId: loginUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: query
+          description: The user name for login
+          required: true
+          type: string
+        - name: password
+          in: query
+          description: The password for login in clear text
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: string
+          headers:
+            X-Rate-Limit:
+              type: integer
+              format: int32
+              description: calls per hour allowed by the user
+            X-Expires-After:
+              type: string
+              format: date-time
+              description: date in UTC when toekn expires
+        '400':
+          description: Invalid username/password supplied
+  /user/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ''
+      operationId: logoutUser
+      produces:
+        - application/xml
+        - application/json
+      parameters: []
+      responses:
+        default:
+          description: successful operation
+  '/user/{username}':
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ''
+      operationId: getUserByName
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: 'The name that needs to be fetched. Use user1 for testing.'
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/User'
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: name that need to be deleted
+          required: true
+          type: string
+        - in: body
+          name: body
+          description: Updated user object
+          required: true
+          schema:
+            $ref: '#/definitions/User'
+      responses:
+        '400':
+          description: Invalid user supplied
+        '404':
+          description: User not found
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be deleted
+          required: true
+          type: string
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+securityDefinitions:
+  petstore_auth:
+    type: oauth2
+    authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+    flow: implicit
+    scopes:
+      'write:pets': modify pets in your account
+      'read:pets': read your pets
+  api_key:
+    type: apiKey
+    name: api_key
+    in: header
+definitions:
+  Order:
+    title: Pet Order
+    description: An order for a pets from the pet store
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      petId:
+        type: integer
+        format: int64
+      quantity:
+        type: integer
+        format: int32
+      shipDate:
+        type: string
+        format: date-time
+      status:
+        type: string
+        description: Order Status
+        enum:
+          - placed
+          - approved
+          - delivered
+      complete:
+        type: boolean
+        default: false
+    xml:
+      name: Order
+  Category:
+    title: Pet category
+    description: A category for a pet
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Category
+  User:
+    title: a User
+    description: A User who is purchasing from the pet store
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      username:
+        type: string
+      firstName:
+        type: string
+      lastName:
+        type: string
+      email:
+        type: string
+      password:
+        type: string
+      phone:
+        type: string
+      userStatus:
+        type: integer
+        format: int32
+        description: User Status
+    xml:
+      name: User
+  Tag:
+    title: Pet Tag
+    description: A tag for a pet
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Tag
+  Pet:
+    title: a Pet
+    description: A pet for sale in the pet store
+    type: object
+    required:
+      - name
+      - photoUrls
+    properties:
+      id:
+        type: integer
+        format: int64
+      category:
+        $ref: '#/definitions/Category'
+      name:
+        type: string
+        example: doggie
+      photoUrls:
+        type: array
+        xml:
+          name: photoUrl
+          wrapped: true
+        items:
+          type: string
+      tags:
+        type: array
+        xml:
+          name: tag
+          wrapped: true
+        items:
+          $ref: '#/definitions/Tag'
+      status:
+        type: string
+        description: pet status in the store
+        enum:
+          - available
+          - pending
+          - sold
+    xml:
+      name: Pet
+  ApiResponse:
+    title: An uploaded response
+    description: Describes the result of uploading an image resource
+    type: object
+    properties:
+      code:
+        type: integer
+        format: int32
+      type:
+        type: string
+      message:
+        type: string
+  #issue: https://github.com/swagger-api/swagger-codegen/issues/7980
+  Amount:
+    type: object
+    description: >
+      some description
+    properties:
+      value:
+        format: double
+        type: number
+        minimum: 0.01
+        maximum: 1000000000000000
+        description: >
+          some description
+      currency:
+        $ref: '#/definitions/Currency'
+    required:
+      - value
+      - currency
+  Currency:
+    type: string
+    pattern: '^[A-Z]{3,3}$'
+    description: >
+      some description
+externalDocs:
+  description: Find out more about Swagger
+  url: 'http://swagger.io'

test/WireMock.Net.Tests/Owin/MappingMatcherTests.cs

@@ -6,6 +6,7 @@ using WireMock.Logging;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
+using WireMock.Services;
 using WireMock.Util;
 using Xunit;
 
@@ -14,6 +15,8 @@ namespace WireMock.Net.Tests.Owin;
 public class MappingMatcherTests
 {
     private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
+    private readonly Mock<IRandomizerDoubleBetween0And1> _randomizerDoubleBetween0And1Mock;
+
     private readonly MappingMatcher _sut;
 
     public MappingMatcherTests()
@@ -29,7 +32,10 @@ public class MappingMatcherTests
         loggerMock.Setup(l => l.Error(It.IsAny<string>()));
         _optionsMock.Setup(o => o.Logger).Returns(loggerMock.Object);
 
-        _sut = new MappingMatcher(_optionsMock.Object);
+        _randomizerDoubleBetween0And1Mock = new Mock<IRandomizerDoubleBetween0And1>();
+        _randomizerDoubleBetween0And1Mock.Setup(r => r.Generate()).Returns(0.0);
+
+        _sut = new MappingMatcher(_optionsMock.Object, _randomizerDoubleBetween0And1Mock.Object);
     }
 
     [Fact]
@@ -76,8 +82,8 @@ public class MappingMatcherTests
         var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
         var mappings = InitMappings
         (
-            (guid1, new[] { 0.1 }),
-            (guid2, new[] { 1.0 })
+            (guid1, new[] { 0.1 }, null),
+            (guid2, new[] { 1.0 }, null)
         );
         _optionsMock.Setup(o => o.Mappings).Returns(mappings);
 
@@ -104,8 +110,8 @@ public class MappingMatcherTests
         var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
         var mappings = InitMappings
         (
-            (guid1, new[] { 0.1 }),
-            (guid2, new[] { 0.9 })
+            (guid1, new[] { 0.1 }, null),
+            (guid2, new[] { 0.9 }, null)
         );
         _optionsMock.Setup(o => o.Mappings).Returns(mappings);
 
@@ -131,8 +137,8 @@ public class MappingMatcherTests
 
         _optionsMock.SetupGet(o => o.AllowPartialMapping).Returns(true);
         var mappings = InitMappings(
-            (guid1, new[] { 0.1 }),
-            (guid2, new[] { 0.9 })
+            (guid1, new[] { 0.1 }, null),
+            (guid2, new[] { 0.9 }, null)
         );
         _optionsMock.Setup(o => o.Mappings).Returns(mappings);
 
@@ -158,8 +164,8 @@ public class MappingMatcherTests
         var guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
         var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
         var mappings = InitMappings(
-            (guid1, new[] { 1.0 }),
-            (guid2, new[] { 1.0, 1.0 })
+            (guid1, new[] { 1.0 }, null),
+            (guid2, new[] { 1.0, 1.0 }, null)
         );
         _optionsMock.Setup(o => o.Mappings).Returns(mappings);
 
@@ -178,7 +184,31 @@ public class MappingMatcherTests
         result.Partial.RequestMatchResult.AverageTotalScore.Should().Be(1.0);
     }
 
-    private static ConcurrentDictionary<Guid, IMapping> InitMappings(params (Guid guid, double[] scores)[] matches)
+    [Fact]
+    public void MappingMatcher_FindBestMatch_WhenProbabilityFailsFirst_ShouldReturnSecondMatch()
+    {
+        // Assign
+        var guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
+        var guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
+        var mappings = InitMappings
+        (
+            (guid1, new[] { 1.0 }, 1.0),
+            (guid2, new[] { 1.0 }, null)
+        );
+        _optionsMock.Setup(o => o.Mappings).Returns(mappings);
+
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+
+        // Act
+        var result = _sut.FindBestMatch(request);
+
+        // Assert
+        result.Match.Should().NotBeNull();
+        result.Match!.Mapping.Guid.Should().Be(guid2);
+        result.Match.RequestMatchResult.AverageTotalScore.Should().Be(1.0);
+    }
+
+    private static ConcurrentDictionary<Guid, IMapping> InitMappings(params (Guid guid, double[] scores, double? probability)[] matches)
     {
         var mappings = new ConcurrentDictionary<Guid, IMapping>();
 
@@ -193,6 +223,8 @@ public class MappingMatcherTests
                 requestMatchResult.AddScore(typeof(object), score);
             }
 
+            mappingMock.SetupGet(m => m.Probability).Returns(match.probability);
+
             mappingMock.Setup(m => m.GetRequestMatchResult(It.IsAny<RequestMessage>(), It.IsAny<string>())).Returns(requestMatchResult);
 
             mappings.TryAdd(match.guid, mappingMock.Object);

test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs

@@ -177,7 +177,7 @@ public class WireMockMiddlewareTests
         _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
         _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, null);
+        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, null, null);
         _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
 
         var requestBuilder = Request.Create().UsingAnyMethod();
@@ -231,7 +231,7 @@ public class WireMockMiddlewareTests
         _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
         _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, data: null);
+        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null, data: null, probability: null);
         _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
 
         var requestBuilder = Request.Create().UsingAnyMethod();

test/WireMock.Net.Tests/RequestWithBodyTests.cs

@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using FluentAssertions;
+using JsonConverter.Abstractions;
+using Moq;
 using Newtonsoft.Json;
 using NFluent;
 using WireMock.Matchers;
@@ -134,7 +136,7 @@ namespace WireMock.Net.Tests
         }
 
         [Fact]
-        public void Request_BodyAsString_Using_WildcardMatcher()
+        public void Request_WithBody_BodyDataAsString_Using_WildcardMatcher()
         {
             // Arrange
             var spec = Request.Create().WithPath("/foo").UsingAnyMethod().WithBody(new WildcardMatcher("H*o*"));
@@ -153,7 +155,7 @@ namespace WireMock.Net.Tests
         }
 
         [Fact]
-        public void Request_BodyAsJson_Using_WildcardMatcher()
+        public void Request_WithBody_BodyDataAsJson_Using_WildcardMatcher()
         {
             // Arrange
             var spec = Request.Create().WithPath("/foo").UsingAnyMethod().WithBody(new WildcardMatcher("*Hello*"));
@@ -349,6 +351,56 @@ namespace WireMock.Net.Tests
             Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
         }
 
+        [Fact]
+        public void Request_WithBodyAsJson_UsingObject()
+        {
+            // Assign
+            object body = new
+            {
+                Test = "abc"
+            };
+            var requestBuilder = Request.Create().UsingAnyMethod().WithBodyAsJson(body);
+
+            var bodyData = new BodyData
+            {
+                BodyAsString = JsonConvert.SerializeObject(body),
+                DetectedBodyType = BodyType.String
+            };
+
+            // Act
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
+        [Fact]
+        public void Request_WithBodyAsJson_WithIJsonConverter_UsingObject()
+        {
+            // Assign
+            var jsonConverterMock = new Mock<IJsonConverter>();
+            jsonConverterMock.Setup(j => j.Serialize(It.IsAny<object>(), It.IsAny<JsonConverterOptions>())).Returns("test");
+            object body = new
+            {
+                Any = "key"
+            };
+            var requestBuilder = Request.Create().UsingAnyMethod().WithBodyAsJson(body, jsonConverterMock.Object);
+
+            var bodyData = new BodyData
+            {
+                BodyAsString = "test",
+                DetectedBodyType = BodyType.String
+            };
+
+            // Act
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
+
+            // Assert
+            var requestMatchResult = new RequestMatchResult();
+            Check.That(requestBuilder.GetMatchingScore(request, requestMatchResult)).IsEqualTo(1.0);
+        }
+
         [Theory]
         [InlineData(new byte[] { 1 }, BodyType.Bytes)]
         [InlineData(new byte[] { 48, 49, 50 }, BodyType.Bytes)]

test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode.cs

@@ -136,7 +136,8 @@ public partial class MappingConverterTests
             null,
             false,
             null,
-            data: null
+            data: null,
+            probability: 0.3
         );
     }
 }