Merge branch 'master' into stef-IgnoreOpenApiErrors

Better to use https://slack.wiremock.org/ to have proper Slack signup

.gitignore

@@ -255,3 +255,5 @@ paket-files/
 /test/WireMock.Net.Tests/coverage.opencover.xml
 /test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml
 /test/WireMock.Net.Tests/coverage.net5.0.opencover.xml
+
+*.received.*

CHANGELOG.md

@@ -1,3 +1,80 @@
+# 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)
+- [#906](https://github.com/WireMock-Net/WireMock.Net/issues/906) - Upgrade to 1.5.19 breaks a form data test [bug]
+
+# 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)
+
+# 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)
+- [#896](https://github.com/WireMock-Net/WireMock.Net/pull/896) - Bump Microsoft.Owin from 2.0.2 to 4.2.2 in /examples/WireMock.Net.Service [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#900](https://github.com/WireMock-Net/WireMock.Net/pull/900) - ProxySettings : Add logic to not save some requests depending on HttpMethods  [feature] contributed by [StefH](https://github.com/StefH)
+- [#897](https://github.com/WireMock-Net/WireMock.Net/issues/897) - WebHostBuilder.ConfigureServices method not found when using nunit3testadapter 4.4.0 [bug]
+- [#899](https://github.com/WireMock-Net/WireMock.Net/issues/899) - Ignore OPTIONS request when using proxyandrecord [feature]
+
+# 1.5.17 (25 February 2023)
+- [#881](https://github.com/WireMock-Net/WireMock.Net/pull/881) - Add WithBodyAsJson builder method with accepts a Func [feature] contributed by [StefH](https://github.com/StefH)
+- [#882](https://github.com/WireMock-Net/WireMock.Net/pull/882) - Add example code to test HTTP Status 400 and 500 [test] contributed by [StefH](https://github.com/StefH)
+- [#890](https://github.com/WireMock-Net/WireMock.Net/pull/890) - AdminApiMappingBuilder [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.16 (01 February 2023)
+- [#880](https://github.com/WireMock-Net/WireMock.Net/pull/880) - Add `WithProxy(string proxyUrl, X509Certificate2 certificate)` [feature] contributed by [StefH](https://github.com/StefH)
+- [#879](https://github.com/WireMock-Net/WireMock.Net/issues/879) - Possibility to pass a X509Certificate2 to WithProxy() or specifiy certificate loading options [feature]
+
+# 1.5.15 (29 January 2023)
+- [#878](https://github.com/WireMock-Net/WireMock.Net/pull/878) - Update REST Admin interface to support "Get Mapping(s) as C# Code" [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.14 (24 January 2023)
+- [#842](https://github.com/WireMock-Net/WireMock.Net/pull/842) - Generate C# code from Mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#869](https://github.com/WireMock-Net/WireMock.Net/pull/869) - Add MappingBuilder to build mappings in code and export to Models or JSON [feature] contributed by [StefH](https://github.com/StefH)
+- [#871](https://github.com/WireMock-Net/WireMock.Net/pull/871) - Add UseWebhooksFireAndForget to Server ConvertMapping [bug] contributed by [ggradnig](https://github.com/ggradnig)
+- [#872](https://github.com/WireMock-Net/WireMock.Net/pull/872) - Fix unsubscribe from LogEntriesChanged event handler [bug] contributed by [StefH](https://github.com/StefH)
+- [#875](https://github.com/WireMock-Net/WireMock.Net/pull/875) - Fix Self referencing loop detected for property [bug] contributed by [eseneckiy](https://github.com/eseneckiy)
+- [#877](https://github.com/WireMock-Net/WireMock.Net/pull/877) - Add unit test example for Transformer Handlebars String.Append String.Join [test] contributed by [StefH](https://github.com/StefH)
+- [#701](https://github.com/WireMock-Net/WireMock.Net/issues/701) - Allow to create MappingModel from c# to be able to configure local and remote mocks similarly [feature]
+- [#867](https://github.com/WireMock-Net/WireMock.Net/issues/867) - Can I build mappings with code and save them to JSON-file without starting server [feature]
+- [#870](https://github.com/WireMock-Net/WireMock.Net/issues/870) - Can not unsubscribe from LogEntriesChanged event. [bug]
+
 # 1.5.13 (11 December 2022)
 - [#858](https://github.com/WireMock-Net/WireMock.Net/pull/858) - Update Transformer functionality to return value instead of string [feature] contributed by [StefH](https://github.com/StefH)
 - [#859](https://github.com/WireMock-Net/WireMock.Net/pull/859) - Add UpdatedAt property to Mapping [feature] contributed by [StefH](https://github.com/StefH)
@@ -633,8 +710,8 @@
 - [#263](https://github.com/WireMock-Net/WireMock.Net/issues/263) - Content-Type multipart/form-data is not serialized in proxy and recording mode [bug]
 
 # 1.0.11.0 (30 March 2019)
-- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [psypilat](https://github.com/psypilat)
+- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [ghost](https://github.com/ghost)
-- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [psypilat](https://github.com/psypilat)
+- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [ghost](https://github.com/ghost)
 
 # 1.0.10.0 (27 March 2019)
 - [#260](https://github.com/WireMock-Net/WireMock.Net/pull/260) - Fix Response.Delay property serialization [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.13</VersionPrefix>
+        <VersionPrefix>1.5.27</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.13
+SET version=1.5.27
 
 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,9 +1,7 @@
-# 1.5.13 (11 December 2022)
+# 1.5.27 (03 June 2023)
-- #858 Update Transformer functionality to return value instead of string [feature]
+- #946 Add warning logging when sending a request to a Webhook does not return status 200 [feature]
-- #859 Add UpdatedAt property to Mapping [feature]
+- #949 Add ".NET Framework 4.7" to WireMock.Net.FluentAssertions [feature]
-- #861 Add extra functionality for issue 55
+- #928 TypeLoadException when using WithHeader method. [bug]
-- #862 Add client certificate support [feature]
+- #945 Webhook logging [feature]
-- #863 Update WireMockServer.CreateClient/CreateClients to include handlers [feature]
-- #856 Inconsistent result with overlapping (duplicate) request [bug]
 
 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) |
 | - | - | - |
@@ -41,23 +45,23 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 |   **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

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

WireMock.Net Solution.sln.DotSettings

@@ -27,6 +27,7 @@
 	<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>

examples/WireMock.Net.Client/Program.cs

@@ -1,14 +1,15 @@
-using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
+using RestEase;
 using WireMock.Admin.Settings;
 using WireMock.Client;
+using WireMock.Client.Extensions;
+
+namespace WireMock.Net.Client;
 
-namespace WireMock.Net.Client
-{
 class Program
 {
     static async Task Main(string[] args)
@@ -16,6 +17,53 @@ namespace WireMock.Net.Client
         // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
         var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");
 
+        // await api.ResetMappingsAsync().ConfigureAwait(false);
+
+        var mappingBuilder = api.GetMappingBuilder();
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 1")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla1")
+            )
+            .WithResponse(rsp => rsp
+                .WithBody("x1")
+                .WithHeaders(h => h.Add("h1", "v1"))
+            )
+        );
+
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 2")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla2")
+            )
+            .WithResponse(rsp => rsp
+                .WithBody("x2")
+                .WithHeaders(h => h.Add("h2", "v2"))
+            )
+        );
+
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 3")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla3")
+            )
+            .WithResponse(rsp => rsp
+                .WithBodyAsJson(new 
+                {
+                    x = "test"
+                }, true)
+            )
+        );
+
+        var result = await mappingBuilder.BuildAndPostAsync().ConfigureAwait(false);
+        Console.WriteLine($"result = {JsonConvert.SerializeObject(result)}");
+
+        var mappings = await api.GetMappingsAsync();
+        Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
+
         // Set BASIC Auth
         var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
         api.Authorization = new AuthenticationHeaderValue("Basic", value);
@@ -34,7 +82,7 @@ namespace WireMock.Net.Client
         var settings2 = await api.GetSettingsAsync();
         Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
 
-            var mappings = await api.GetMappingsAsync();
+        mappings = await api.GetMappingsAsync();
         Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
 
         try
@@ -75,4 +123,3 @@ namespace WireMock.Net.Client
         Console.ReadKey();
     }
 }
-}

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

@@ -2,17 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestEase" Version="1.5.7" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
     </ItemGroup>
 

examples/WireMock.Net.Console.NET6/WireMock.Net.Console.NET6.csproj

@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <!--<PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />-->
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -21,10 +21,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -33,10 +33,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -30,10 +30,10 @@
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.*" />
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.*" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

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

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -33,12 +35,54 @@ namespace WireMock.Net.ConsoleApplication
         }
     }
 
+    public class Todo
+    {
+        public int Id { get; set; }
+    }
+
     public static class MainApp
     {
         public static void Run()
         {
-            var s = WireMockServer.Start();
+            var mappingBuilder = new MappingBuilder();
-            s.Stop();
+            mappingBuilder
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/param2", true))
+                    .WithParam("key", "test")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "param2" }));
+
+            var json = mappingBuilder.ToJson();
+            System.Console.WriteLine("mappingBuilder : Json = {0}", json);
+
+            var todos = new Dictionary<int, Todo>();
+
+            var server = WireMockServer.Start();
+
+            server
+                .Given(Request.Create()
+                    .WithPath("todos")
+                    .UsingGet()
+                )
+                .RespondWith(Response.Create()
+                    .WithBodyAsJson(todos.Values)
+                );
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("todos")
+                    .WithParam("id")
+                )
+                .RespondWith(Response.Create()
+                    .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
+                );
+
+            var httpClient = server.CreateClient();
+            //server.Stop();
 
             var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
             {
@@ -57,7 +101,7 @@ namespace WireMock.Net.ConsoleApplication
             string url2 = "http://localhost:9092/";
             string url3 = "https://localhost:9443/";
 
-            var server = WireMockServer.Start(new WireMockServerSettings
+            server = WireMockServer.Start(new WireMockServerSettings
             {
                 AllowCSharpCodeMatcher = true,
                 Urls = new[] { url1, url2, url3 },
@@ -93,7 +137,43 @@ namespace WireMock.Net.ConsoleApplication
 
             // server.AllowPartialMapping();
 
+            // 400 ms
+            server
+                .Given(Request.Create()
+                    .WithPath("/slow/400")
+                    .UsingPost())
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(400)
+                        .WithBody("return 400")
+                        .WithHeader("Content-Type", "text/plain")
+                );
+            // 4 sec
+            server
+                .Given(Request.Create()
+                    .WithPath("/slow/500")
+                    .UsingPost())
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(500)
+                        .WithBody("return 500")
+                        .WithHeader("Content-Type", "text/plain")
+                );
+
+
+            server
+                .Given(Request.Create()
+                    .UsingMethod("GET")
+                    .WithPath("/foo1")
+                    .WithParam("p1", "xyz")
+                )
+                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+                .RespondWith(Response.Create()
+                    .WithBody("Hello World")
+                );
+
             server.Given(Request.Create().WithPath(MatchOperator.Or, "/mypath", "/mypath1", "/mypath2").UsingPost())
+                .WithGuid("86984b0e-2516-4935-a2ef-b45bf4820d7d")
                 .RespondWith(Response.Create()
                         .WithHeader("Content-Type", "application/json")
                         .WithBodyAsJson("{{JsonPath.SelectToken request.body \"..name\"}}")
@@ -366,14 +446,14 @@ namespace WireMock.Net.ConsoleApplication
             // http://localhost:9091/trans?start=1000&stop=1&stop=2
             server
                 .Given(Request.Create().WithPath("/trans").UsingGet())
-                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f06")
                 .RespondWith(Response.Create()
                     .WithStatusCode(200)
                     .WithHeader("Content-Type", "application/json")
                     .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
                     .WithHeader("xyz_{{request.headers.Postman-Token}}", "token is {{request.headers.Postman-Token}}")
                     .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, add={{Math.Add request.query.start.[0] 42}} bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.None)
+                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.EvaluateAndTryToConvert)
                     .WithDelay(TimeSpan.FromMilliseconds(100))
                 );
 
@@ -563,6 +643,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(200)
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new { Id = "5bdf076c-5654-4b3e-842c-7caf1fabf8c9" }));
+
             server
                 .Given(Request.Create().WithPath("/random200or505").UsingGet())
                 .RespondWith(Response.Create().WithCallback(request =>
@@ -570,7 +651,11 @@ namespace WireMock.Net.ConsoleApplication
                     int code = new Random().Next(1, 2) == 1 ? 505 : 200;
                     return new ResponseMessage
                     {
-                        BodyData = new BodyData { BodyAsString = "random200or505:" + code, DetectedBodyType = Types.BodyType.String },
+                        BodyData = new BodyData
+                        {
+                            BodyAsString = "random200or505:" + code + ", HeadersFromRequest = " + string.Join(",", request.Headers),
+                            DetectedBodyType = Types.BodyType.String,
+                        },
                         StatusCode = code
                     };
                 }));

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -42,11 +42,11 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -2,8 +2,8 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net452" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net452" />
   <package id="log4net" version="2.0.15" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj

@@ -41,11 +41,11 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>

examples/WireMock.Net.Console.Net461.Classic/packages.config

@@ -2,8 +2,8 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net461" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net461" />
   <package id="log4net" version="2.0.15" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />

examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj

@@ -49,29 +49,29 @@
     <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.10\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.12\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.10\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.12\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
     </Reference>
     <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -3,14 +3,14 @@
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
   <package id="Fare" version="2.2.1" targetFramework="net472" />
   <package id="Handlebars.Net" version="2.1.2" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.3.12" targetFramework="net472" />
   <package id="Humanizer" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />

examples/WireMock.Net.Console.Proxy.Net452/Program.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
+using System.Collections.Specialized;
 using System.Net.Http;
-using Newtonsoft.Json;
 using WireMock.Server;
 using WireMock.Settings;
 
@@ -26,10 +26,8 @@ namespace WireMock.Net.Console.Proxy.Net452
                 }
             });
 
-            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            System.Console.WriteLine("Subscribing to LogEntriesChanged");
-            {
+            server.LogEntriesChanged += Server_LogEntriesChanged;
-                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
-            };
 
             var uri = new Uri(urls[0]);
             var form = new MultipartFormDataContent
@@ -38,9 +36,23 @@ namespace WireMock.Net.Console.Proxy.Net452
             };
             new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
 
+            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
+            server.LogEntriesChanged -= Server_LogEntriesChanged;
+
+            form = new MultipartFormDataContent
+            {
+                { new StringContent("data2"), "test2", "test2.txt" }
+            };
+            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
+
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();
         }
+
+        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
+        {
+            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
+        }
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using WireMock.Net.OpenApiParser.Types;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 
@@ -17,8 +18,8 @@ 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);
+        var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), ExampleValueType.Value, ExampleValueType.Value);
         Console.WriteLine("Press any key to stop the servers");
 
         Console.ReadKey();
@@ -27,15 +28,15 @@ class Program
 
     private static void RunOthersOpenApiParserExample()
     {
-        var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "https://localhost:9091/");
+        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"), "https://localhost:9092/");
+        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"), "https://localhost:9093/");
+        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"), "https://localhost:9094/");
+        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"), "https://localhost:9095/");
+        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"), "https://localhost:9096/");
+        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "http://localhost:9096/");
-        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "https://localhost:9097/");
+        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "http://localhost:9097/");
-        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "https://localhost:9098/");
+        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "http://localhost:9098/");
-        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "https://localhost:9099/");
+        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,11 +9,18 @@ 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 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
         {
@@ -69,4 +76,3 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
         server.Stop();
     }
 }
-}

examples/WireMock.Net.Service/packages.config

@@ -5,7 +5,7 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />

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

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

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

@@ -1,11 +1,11 @@
-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
 {
     private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
@@ -41,4 +41,3 @@ namespace WireMock.Net.StandAlone.NETCoreApp
         Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
     }
 }
-}

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,5 +1,5 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
-{
+
 /// <summary>
 /// Fault Model
 /// </summary>
@@ -7,13 +7,12 @@
 public class FaultModel
 {
     /// <summary>
-        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
+    /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE or MALFORMED_RESPONSE_CHUNK.
     /// </summary>
-        public string Type { get; set; }
+    public string? Type { 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

@@ -84,4 +84,18 @@ public class MappingModel
     /// Fire and forget for webhooks.
     /// </summary>
     public bool? UseWebhooksFireAndForget { get; set; }
+    
+    /// <summary>
+    /// Data Object which can be used when WithTransformer is used.
+    /// e.g. lookup an path in this object using
+    /// <example>
+    /// lookup data "1"
+    /// </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/Mappings/ResponseModel.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
-{
+
 /// <summary>
 /// ResponseModel
 /// </summary>
@@ -118,4 +118,3 @@ namespace WireMock.Admin.Mappings
     /// </summary>
     public WebProxyModel? WebProxy { get; set; }
 }
-}

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

@@ -68,4 +68,9 @@ public class ProxyAndRecordSettingsModel
     /// 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/Admin/Settings/SettingsModel.cs

@@ -31,27 +31,49 @@ public class SettingsModel
     public int? MaxRequestLogCount { get; set; }
 
     /// <summary>
-    /// Allow a Body for all HTTP Methods. (default set to false).
+    /// Allow a Body for all HTTP Methods. (default set to <c>false</c>).
     /// </summary>
     public bool? AllowBodyForAllHttpMethods { get; set; }
 
     /// <summary>
-    /// Handle all requests synchronously. (default set to false).
+    /// Allow only a HttpStatus Code in the response which is defined. (default set to <c>false</c>).
+    /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
+    /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
+    /// </summary>
+    public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
+
+    /// <summary>
+    /// Set to true to disable Json deserialization when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableJsonBodyParsing { get; set; }
+
+    /// <summary>
+    /// Disable support for GZip and Deflate request body decompression. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableRequestBodyDecompressing { get; set; }
+
+    /// <summary>
+    /// Set to true to disable FormUrlEncoded deserializing when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableDeserializeFormUrlEncoded { get; set; }
+
+    /// <summary>
+    /// Handle all requests synchronously. (default set to <c>false</c>).
     /// </summary>
     public bool? HandleRequestsSynchronously { get; set; }
 
     /// <summary>
-    /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
+    /// Throw an exception when the Matcher fails because of invalid input. (default set to <c>false</c>).
     /// </summary>
     public bool? ThrowExceptionWhenMatcherFails { get; set; }
 
     /// <summary>
-    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
+    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to <c>true</c>).
     /// </summary>
     public bool? UseRegexExtended { get; set; }
 
     /// <summary>
-    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
+    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to <c>false</c>).
     /// </summary>
     public bool? SaveUnmatchedRequests { get; set; }
 
@@ -86,7 +108,7 @@ public class SettingsModel
     public HostingScheme? HostingScheme { get; set; }
 
     /// <summary>
-    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to <c>false</c>).
     /// </summary>
     public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
 

src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs

@@ -0,0 +1,139 @@
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// RequestModelBuilder
+/// </summary>
+public partial class RequestModelBuilder
+{
+    /// <summary>
+    /// UsingConnect: add HTTP Method matching on `CONNECT`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingConnect() => WithMethods("CONNECT");
+
+    /// <summary>
+    /// UsingDelete: add HTTP Method matching on `DELETE`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingDelete() => WithMethods("DELETE");
+
+    /// <summary>
+    /// UsingGet: add HTTP Method matching on `GET`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingGet() => WithMethods("GET");
+
+    /// <summary>
+    /// UsingHead: Add HTTP Method matching on `HEAD`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingHead() => WithMethods("HEAD");
+
+    /// <summary>
+    /// UsingPost: add HTTP Method matching on `POST`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPost() => WithMethods("POST");
+
+    /// <summary>
+    /// UsingPatch: add HTTP Method matching on `PATCH`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPatch() => WithMethods("PATCH");
+
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `OPTIONS`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingOptions() => WithMethods("OPTIONS");
+
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `PUT`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPut() => WithMethods("PUT");
+
+    /// <summary>
+    /// UsingTrace: add HTTP Method matching on `TRACE`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingTrace() => WithMethods("TRACE");
+
+    /// <summary>
+    /// UsingAnyMethod: add HTTP Method matching on any method.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingAnyMethod() => this;
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(string value) => WithClientIP(() => value);
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(ClientIPModel value) => WithClientIP(() => value);
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(Action<ClientIPModelBuilder> action)
+    {
+        return WithClientIP(() =>
+        {
+            var builder = new ClientIPModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(string value) => WithPath(() => value);
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(PathModel value) => WithPath(() => value);
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(Action<PathModelBuilder> action)
+    {
+        return WithPath(() =>
+        {
+            var builder = new PathModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(string value) => WithUrl(() => value);
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(UrlModel value) => WithUrl(() => value);
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(Action<UrlModelBuilder> action)
+    {
+        return WithUrl(() =>
+        {
+            var builder = new UrlModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+}

src/WireMock.Net.Abstractions/BuilderExtensions/ResponseModelBuilder.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Net;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// ResponseModelBuilder
+/// </summary>
+public partial class ResponseModelBuilder
+{
+    /// <summary>
+    /// Set the StatusCode.
+    /// </summary>
+    public ResponseModelBuilder WithStatusCode(int value) => WithStatusCode(() => value);
+
+    /// <summary>
+    /// Set the StatusCode.
+    /// </summary>
+    public ResponseModelBuilder WithStatusCode(HttpStatusCode value) => WithStatusCode(() => value);
+
+    /// <summary>
+    /// Set the Delay.
+    /// </summary>
+    public ResponseModelBuilder WithDelay(TimeSpan value) => WithDelay((int) value.TotalMilliseconds);
+
+    /// <summary>
+    /// Set the MinimumRandomDelay.
+    /// </summary>
+    public ResponseModelBuilder WithMinimumRandomDelay(TimeSpan value) => WithMinimumRandomDelay((int)value.TotalMilliseconds);
+
+    /// <summary>
+    /// Set the MaximumRandomDelay.
+    /// </summary>
+    public ResponseModelBuilder WithMaximumRandomDelay(TimeSpan value) => WithMaximumRandomDelay((int)value.TotalMilliseconds);
+}

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -78,6 +78,11 @@ public interface IRequestMessage
     /// </summary>
     IDictionary<string, WireMockList<string>>? Query { get; }
 
+    /// <summary>
+    /// Gets the query.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? QueryIgnoreCase { get; }
+
     /// <summary>
     /// Gets the raw query.
     /// </summary>
@@ -138,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/Models/IBodyData.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Text;
 using WireMock.Types;
 
@@ -38,6 +39,11 @@ public interface IBodyData
     /// </summary>
     string? BodyAsString { get; set; }
 
+    /// <summary>
+    /// The body as Form UrlEncoded dictionary.
+    /// </summary>
+    IDictionary<string, string>? BodyAsFormUrlEncoded { get; set; }
+
     /// <summary>
     /// The detected body type (detection based on body content).
     /// </summary>

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

@@ -1,5 +1,6 @@
-namespace WireMock.ResponseBuilders
+// ReSharper disable InconsistentNaming
-{
+namespace WireMock.ResponseBuilders;
+
 /// <summary>
 /// The FaultType enumeration
 /// </summary>
@@ -20,4 +21,3 @@
     /// </summary>
     MALFORMED_RESPONSE_CHUNK
 }
-}

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

@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using WireMock.Admin.Mappings;
 using WireMock.Logging;
+using WireMock.Types;
+
+namespace WireMock.Server;
 
-namespace WireMock.Server
-{
 /// <summary>
 /// The fluent mock server interface.
 /// </summary>
@@ -16,6 +17,11 @@ namespace WireMock.Server
     /// </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>
@@ -210,5 +216,19 @@ namespace WireMock.Server
     /// </summary>
     /// <param name="mappings">The mapping(s) as json string.</param>
     IWireMockServer WithMapping(string mappings);
-    }
+
+    /// <summary>
+    /// Get the C# code for a mapping.
+    /// </summary>
+    /// <param name="guid">The Mapping Guid.</param>
+    /// <param name="converterType">The <see cref="MappingConverterType"/></param>
+    /// <returns>C# code (null in case the mapping is not found)</returns>
+    string? MappingToCSharpCode(Guid guid, MappingConverterType converterType);
+
+    /// <summary>
+    /// Get the C# code for all mappings.
+    /// </summary>
+    /// <param name="converterType">The <see cref="MappingConverterType"/></param>
+    /// <returns>C# code</returns>
+    public string MappingsToCSharpCode(MappingConverterType converterType);
 }

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

@@ -1,5 +1,5 @@
-namespace WireMock.Types
+namespace WireMock.Types;
-{
+
 /// <summary>
 /// The BodyType
 /// </summary>
@@ -33,6 +33,10 @@
     /// <summary>
     /// Body is a MultiPart
     /// </summary>
-        MultiPart
+    MultiPart,
-    }
+
+    /// <summary>
+    /// Body is a String which is x-www-form-urlencoded.
+    /// </summary>
+    FormUrlEncoded
 }

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

@@ -0,0 +1,11 @@
+namespace WireMock.Types;
+
+/// <summary>
+/// 
+/// </summary>
+public enum MappingConverterType
+{
+    Server,
+
+    Builder
+}

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace WireMock.Types;
 
@@ -63,7 +64,8 @@ public class WireMockList<T> : List<T>
                 return this[0]?.ToString();
 
             default:
-                return base.ToString();
+                var strings = this.Select(x => x as string ?? x?.ToString());
+                return string.Join(", ", strings);
         }
     }
 }

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

@@ -4,7 +4,7 @@
         <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>
+        <TargetFrameworks>net451;net47;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
         <PackageId>WireMock.Net.FluentAssertions</PackageId>

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.NotNull(server);
-        Guard.NotNullOrEmpty(path, nameof(path));
+        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>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
+    /// 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="diagnostic">OpenApiDiagnostic output</param>
     /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
+    IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
 
     /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
+    /// 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>
-        IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+    IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
 
     /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
+    /// 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>
-        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
+    IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
 
     /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// 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>
-        IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
+    IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
 
     /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
+    /// 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>
-        IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+    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

@@ -23,27 +23,28 @@ internal class OpenApiPathsMapper
     private const string HeaderContentType = "Content-Type";
 
     private readonly WireMockOpenApiParserSettings _settings;
-    private readonly ExampleValueGenerator _exampleValueGenerator;
+    private readonly IExampleValueGenerator _exampleValueGenerator;
+    private readonly IExampleValueGenerator _regexExampleValueGenerator;
 
     public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
     {
         _settings = Guard.NotNull(settings);
         _exampleValueGenerator = new ExampleValueGenerator(settings);
+        _regexExampleValueGenerator = new RegexExampleValueGenerator(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> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
     {
-        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers)).ToArray();
-    }
-
-    private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
-    {
-        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
     }
 
     private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
@@ -123,7 +124,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;
@@ -270,54 +271,19 @@ internal class OpenApiPathsMapper
         return newPath;
     }
 
-    private string MapBasePath(IList<OpenApiServer>? servers)
+    private IDictionary<string, object>? MapHeaders(string? responseContentType, IDictionary<string, OpenApiHeader>? headers)
     {
-        if (servers == null || servers.Count == 0)
+        var mappedHeaders = headers?.ToDictionary(
-        {
-            return string.Empty;
-        }
-
-        OpenApiServer server = servers.First();
-        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
-        {
-            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
-        }
-
-        return string.Empty;
-    }
-
-    private JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
-    {
-        if (any == null)
-        {
-            return null;
-        }
-
-        using var outputString = new StringWriter();
-        var writer = new OpenApiJsonWriter(outputString);
-        any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
-
-        if (any.AnyType == AnyType.Array)
-        {
-            return JArray.Parse(outputString.ToString());
-        }
-
-        return JObject.Parse(outputString.ToString());
-    }
-
-    private IDictionary<string, object?>? MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
-    {
-        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)
@@ -356,19 +322,38 @@ internal class OpenApiPathsMapper
         return list.Any() ? list : null;
     }
 
-    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType type)
+    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType exampleValueType)
     {
-        return type switch
+        return exampleValueType switch
         {
-            ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },
+            ExampleValueType.Value => new MatcherModel
+            {
+                Name = "ExactMatcher",
+                Pattern = GetExampleValueAsStringForSchemaType(schema, exampleValueType),
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            },
 
-            _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
+            ExampleValueType.Regex => new MatcherModel
+            {
+                Name = "RegexMatcher",
+                Pattern = GetExampleValueAsStringForSchemaType(schema, exampleValueType),
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            },
+
+            _ => new MatcherModel
+            {
+                Name = "WildcardMatcher",
+                Pattern = "*",
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            }
         };
     }
 
-    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema)
+    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema, ExampleValueType exampleValueType)
     {
-        var value = _exampleValueGenerator.GetExampleValue(schema);
+        var value = exampleValueType == ExampleValueType.Regex ?
+            _regexExampleValueGenerator.GetExampleValue(schema) :
+            _exampleValueGenerator.GetExampleValue(schema);
 
         return value switch
         {
@@ -377,4 +362,39 @@ internal class OpenApiPathsMapper
             _ => value.ToString(),
         };
     }
+
+    private static string MapBasePath(IList<OpenApiServer>? servers)
+    {
+        if (servers == null || servers.Count == 0)
+        {
+            return string.Empty;
+        }
+
+        var server = servers.First();
+        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
+        {
+            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
+        }
+
+        return string.Empty;
+    }
+
+    private static JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
+    {
+        if (any == null)
+        {
+            return null;
+        }
+
+        using var outputString = new StringWriter();
+        var writer = new OpenApiJsonWriter(outputString);
+        any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+
+        if (any.AnyType == AnyType.Array)
+        {
+            return JArray.Parse(outputString.ToString());
+        }
+
+        return JObject.Parse(outputString.ToString());
+    }
 }

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/Types/ExampleValueType.cs

@@ -1,7 +1,7 @@
 namespace WireMock.Net.OpenApiParser.Types;
 
 /// <summary>
-/// The example value to use
+/// The (example) value pattern to use.
 /// </summary>
 public enum ExampleValueType
 {
@@ -12,6 +12,11 @@ public enum ExampleValueType
     /// </summary>
     Value,
 
+    /// <summary>
+    /// Build a Regex based on the SchemaType.
+    /// </summary>
+    Regex,
+
     /// <summary>
     /// Just use a Wildcard (*) character.
     /// </summary>

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

@@ -1,5 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Stef.Validation;
@@ -9,118 +8,110 @@ using WireMock.Net.OpenApiParser.Types;
 
 namespace WireMock.Net.OpenApiParser.Utils;
 
-internal class ExampleValueGenerator
+internal class ExampleValueGenerator : IExampleValueGenerator
 {
-    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 exampleLong = schemaExample as OpenApiLong;
-                        var enumLong = (OpenApiLong)schemaEnum;
+                        var enumLong = schemaEnum as OpenApiLong;
-                        var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
+                        var valueLongEnumOrExample = enumLong?.Value ?? exampleLong?.Value;
-                        return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+                        return valueLongEnumOrExample ?? _exampleValues.Integer;
 
                     default:
-                        var exampleInteger = (OpenApiInteger)schemaExample;
+                        var exampleInteger = schemaExample as OpenApiInteger;
-                        var enumInteger = (OpenApiInteger)schemaEnum;
+                        var enumInteger = schemaEnum as OpenApiInteger;
-                        var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
+                        var valueIntegerEnumOrExample = enumInteger?.Value ?? exampleInteger?.Value;
-                        return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                        return valueIntegerEnumOrExample ?? _exampleValues.Integer;
                 }
 
             case SchemaType.Number:
                 switch (schema?.GetSchemaFormat())
                 {
                     case SchemaFormat.Float:
-                        var exampleFloat = (OpenApiFloat)schemaExample;
+                        var exampleFloat = schemaExample as OpenApiFloat;
-                        var enumFloat = (OpenApiFloat)schemaEnum;
+                        var enumFloat = schemaEnum as OpenApiFloat;
-                        var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
+                        var valueFloatEnumOrExample = enumFloat?.Value ?? exampleFloat?.Value;
-                        return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
+                        return valueFloatEnumOrExample ?? _exampleValues.Float;
 
                     default:
-                        var exampleDouble = (OpenApiDouble)schemaExample;
+                        var exampleDouble = schemaExample as OpenApiDouble;
-                        var enumDouble = (OpenApiDouble)schemaEnum;
+                        var enumDouble = schemaEnum as OpenApiDouble;
-                        var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
+                        var valueDoubleEnumOrExample = enumDouble?.Value ?? exampleDouble?.Value;
-                        return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
+                        return valueDoubleEnumOrExample ?? _exampleValues.Double;
                 }
 
             default:
                 switch (schema?.GetSchemaFormat())
                 {
                     case SchemaFormat.Date:
-                        var exampleDate = (OpenApiDate)schemaExample;
+                        var exampleDate = schemaExample as OpenApiDate;
-                        var enumDate = (OpenApiDate)schemaEnum;
+                        var enumDate = schemaEnum as OpenApiDate;
-                        var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
+                        var valueDateEnumOrExample = enumDate?.Value ?? exampleDate?.Value;
-                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
+                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _exampleValues.Date());
 
                     case SchemaFormat.DateTime:
-                        var exampleDateTime = (OpenApiDateTime)schemaExample;
+                        var exampleDateTime = schemaExample as OpenApiDateTime;
-                        var enumDateTime = (OpenApiDateTime)schemaEnum;
+                        var enumDateTime = schemaEnum as OpenApiDateTime;
-                        var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
+                        var valueDateTimeEnumOrExample = enumDateTime?.Value ?? exampleDateTime?.Value;
-                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
+                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _exampleValues.DateTime());
 
                     case SchemaFormat.Byte:
-                        var exampleByte = (OpenApiByte)schemaExample;
+                        var exampleByte = schemaExample as OpenApiByte;
-                        var enumByte = (OpenApiByte)schemaEnum;
+                        var enumByte = schemaEnum as OpenApiByte;
-                        var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
+                        var valueByteEnumOrExample = enumByte?.Value ?? exampleByte?.Value;
-                        return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
+                        return valueByteEnumOrExample ?? _exampleValues.Bytes;
 
                     case SchemaFormat.Binary:
-                        var exampleBinary = (OpenApiBinary)schemaExample;
+                        var exampleBinary = schemaExample as OpenApiBinary;
-                        var enumBinary = (OpenApiBinary)schemaEnum;
+                        var enumBinary = schemaEnum as OpenApiBinary;
-                        var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
+                        var valueBinaryEnumOrExample = enumBinary?.Value ?? exampleBinary?.Value;
-                        return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
+                        return valueBinaryEnumOrExample ?? _exampleValues.Object;
 
                     default:
-                        var exampleString = (OpenApiString)schemaExample;
+                        var exampleString = schemaExample as OpenApiString;
-                        var enumString = (OpenApiString)schemaEnum;
+                        var enumString = schemaEnum as OpenApiString;
-                        var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
+                        var valueStringEnumOrExample = enumString?.Value ?? exampleString?.Value;
-                        return valueStringEnumOrExample ?? _settings.ExampleValues.String;
+                        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/Utils/IExampleValueGenerator.cs

@@ -0,0 +1,8 @@
+using Microsoft.OpenApi.Models;
+
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal interface IExampleValueGenerator
+{
+    object GetExampleValue(OpenApiSchema? schema);
+}

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

@@ -0,0 +1,40 @@
+using Microsoft.OpenApi.Models;
+using Stef.Validation;
+using WireMock.Net.OpenApiParser.Extensions;
+using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
+
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal class RegexExampleValueGenerator : IExampleValueGenerator
+{
+    public RegexExampleValueGenerator(WireMockOpenApiParserSettings settings)
+    {
+        Guard.NotNull(settings);
+    }
+
+    public object GetExampleValue(OpenApiSchema? schema)
+    {
+        switch (schema?.GetSchemaType())
+        {
+            case SchemaType.Boolean:
+                return @"(true|false)";
+
+            case SchemaType.Integer:
+                return @"-?\d+";
+
+            case SchemaType.Number:
+                return @"[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?";
+
+            default:
+                return schema?.GetSchemaFormat() switch
+                {
+                    SchemaFormat.Date => @"(\d{4})-([01]\d)-([0-3]\d)",
+                    SchemaFormat.DateTime => @"(\d{4})-([01]\d)-([0-3]\d)T([0-2]\d):([0-5]\d):([0-5]\d)(\.\d+)?(Z|[+-][0-2]\d:[0-5]\d)",
+                    SchemaFormat.Byte => @"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)",
+                    SchemaFormat.Binary => @"[a-zA-Z0-9\+/]*={0,3}",
+                    _ => ".*"
+                };
+        }
+    }
+}

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;
@@ -8,6 +9,7 @@ using RamlToOpenApiConverter;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Mappers;
 using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
 
 namespace WireMock.Net.OpenApiParser;
 
@@ -16,18 +18,25 @@ namespace WireMock.Net.OpenApiParser;
 /// </summary>
 public class WireMockOpenApiParser : IWireMockOpenApiParser
 {
-    private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();
+    private readonly WireMockOpenApiParserSettings _wireMockOpenApiParserSettings = new WireMockOpenApiParserSettings
-
-    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
-    [PublicAPI]
-    public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
     {
-        return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
+        HeaderPatternToUse = ExampleValueType.Regex,
+        QueryParameterPatternToUse = ExampleValueType.Regex,
+        PathPatternToUse = ExampleValueType.Regex
+    };
+
+    private readonly OpenApiStreamReader _reader = new();
+
+    /// <inheritdoc />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
+    {
+        return FromFile(path, _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 +53,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 ?? _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/Builders/ApiMappingModelBuilder.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Stef.Validation;
+using WireMock.Admin.Mappings;
+
+namespace WireMock.Client.Builders;
+
+/// <summary>
+/// AdminApiMappingBuilder
+/// </summary>
+public class AdminApiMappingBuilder
+{
+    private readonly List<Action<MappingModelBuilder>> _mappingModelBuilderActions = new();
+
+    private readonly IWireMockAdminApi _api;
+
+    /// <summary>
+    /// AdminApiMappingBuilder
+    /// </summary>
+    /// <param name="api">The <see cref="IWireMockAdminApi"/>.</param>
+    public AdminApiMappingBuilder(IWireMockAdminApi api)
+    {
+        _api = Guard.NotNull(api);
+    }
+
+    /// <summary>
+    /// The Given
+    /// </summary>
+    /// <param name="mappingModelBuilderAction">The action.</param>
+    public void Given(Action<MappingModelBuilder> mappingModelBuilderAction)
+    {
+        _mappingModelBuilderActions.Add(Guard.NotNull(mappingModelBuilderAction));
+    }
+
+    /// <summary>
+    /// Build the mappings and post these using the <see cref="IWireMockAdminApi"/> to the WireMock.Net server.
+    /// </summary>
+    /// <param name="cancellationToken">The optional CancellationToken.</param>
+    /// <returns><see cref="StatusModel"/></returns>
+    public Task<StatusModel> BuildAndPostAsync(CancellationToken cancellationToken = default)
+    {
+        var modelMappings = new List<MappingModel>();
+
+        foreach (var mappingModelBuilderAction in _mappingModelBuilderActions)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var mappingModelBuilder = new MappingModelBuilder();
+            mappingModelBuilderAction(mappingModelBuilder);
+
+            modelMappings.Add(mappingModelBuilder.Build());
+        }
+
+        return _api.PostMappingsAsync(modelMappings, cancellationToken);
+    }
+}

src/WireMock.Net.RestClient/Extensions/ResponseModelBuilderExtensions.cs

@@ -0,0 +1,46 @@
+using System.Text;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
+using WireMock.Admin.Mappings;
+
+namespace WireMock.Client.Extensions;
+
+/// <summary>
+/// ResponseModelBuilder
+/// </summary>
+public static class ResponseModelBuilderExtensions
+{
+    private static readonly Encoding Utf8NoBom = new UTF8Encoding(false);
+    private static readonly IJsonConverter JsonConverter = new NewtonsoftJsonConverter();
+
+    /// <summary>
+    /// WithBodyAsJson
+    /// </summary>
+    /// <param name="builder">The ResponseModelBuilder.</param>
+    /// <param name="body">The body.</param>
+    /// <param name="encoding">The body encoding.</param>
+    /// <param name="indented">Define whether child objects to be indented.</param>
+    public static ResponseModelBuilder WithBodyAsJson(this ResponseModelBuilder builder, object body, Encoding? encoding = null, bool? indented = null)
+    {
+        return builder.WithBodyAsBytes(() =>
+        {
+            var options = new JsonConverterOptions
+            {
+                WriteIndented = indented == true
+            };
+            var jsonBody = JsonConverter.Serialize(body, options);
+            return (encoding ?? Utf8NoBom).GetBytes(jsonBody);
+        });
+    }
+
+    /// <summary>
+    /// WithBodyAsJson
+    /// </summary>
+    /// <param name="builder">The ResponseModelBuilder.</param>
+    /// <param name="body">The body.</param>
+    /// <param name="indented">Define whether child objects to be indented.</param>
+    public static ResponseModelBuilder WithBodyAsJson(this ResponseModelBuilder builder, object body, bool indented)
+    {
+        return builder.WithBodyAsJson(body, null, indented);
+    }
+}

src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs

@@ -0,0 +1,19 @@
+using WireMock.Client.Builders;
+
+namespace WireMock.Client.Extensions;
+
+/// <summary>
+/// Some extensions for <see cref="IWireMockAdminApi"/>.
+/// </summary>
+public static class WireMockAdminApiExtensions
+{
+    /// <summary>
+    /// Get a new <see cref="AdminApiMappingBuilder"/> for the <see cref="IWireMockAdminApi"/>.
+    /// </summary>
+    /// <param name="api">See <see cref="IWireMockAdminApi"/>.</param>
+    /// <returns></returns>
+    public static AdminApiMappingBuilder GetMappingBuilder(this IWireMockAdminApi api)
+    {
+        return new AdminApiMappingBuilder(api);
+    }
+}

src/WireMock.Net.RestClient/IWireMockAdminApi.cs

@@ -1,15 +1,17 @@
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http.Headers;
+using System.Threading;
 using System.Threading.Tasks;
+using RestEase;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
+using WireMock.Types;
+
+namespace WireMock.Client;
 
-namespace WireMock.Client
-{
 /// <summary>
 /// The RestEase interface which defines all admin commands.
 /// </summary>
@@ -33,201 +35,265 @@ namespace WireMock.Client
     /// Update the settings.
     /// </summary>
     /// <param name="settings">SettingsModel</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Put("settings")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> PutSettingsAsync([Body] SettingsModel settings);
+    Task<StatusModel> PutSettingsAsync([Body] SettingsModel settings, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Update the settings
     /// </summary>
     /// <param name="settings">SettingsModel</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("settings")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> PostSettingsAsync([Body] SettingsModel settings);
+    Task<StatusModel> PostSettingsAsync([Body] SettingsModel settings, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get the mappings.
     /// </summary>
     /// <returns>MappingModels</returns>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("mappings")]
-        Task<IList<MappingModel>> GetMappingsAsync();
+    Task<IList<MappingModel>> GetMappingsAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get the C# code from all mappings
+    /// </summary>
+    /// <returns>C# code</returns>
+    /// <param name="mappingConverterType">The <see cref="MappingConverterType"/>, default is Server.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Get("mappings/code")]
+    Task<string> GetMappingsCodeAsync([Query] MappingConverterType mappingConverterType = MappingConverterType.Server, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Add a new mapping.
     /// </summary>
     /// <param name="mapping">MappingModel</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("mappings")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);
+    Task<StatusModel> PostMappingAsync([Body] MappingModel mapping, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Add new mappings.
     /// </summary>
     /// <param name="mappings">MappingModels</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("mappings")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings);
+    Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete all mappings.
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("mappings")]
-        Task<StatusModel> DeleteMappingsAsync();
+    Task<StatusModel> DeleteMappingsAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete mappings according to GUIDs
     /// </summary>
     /// <param name="mappings">MappingModels</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("mappings")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> DeleteMappingsAsync([Body] IList<MappingModel> mappings);
+    Task<StatusModel> DeleteMappingsAsync([Body] IList<MappingModel> mappings, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) all mappings.
     /// </summary>
     /// <param name="reloadStaticMappings">A value indicating whether to reload the static mappings after the reset.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("mappings/reset")]
-        Task<StatusModel> ResetMappingsAsync(bool? reloadStaticMappings = false);
+    Task<StatusModel> ResetMappingsAsync(bool? reloadStaticMappings = false, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get a mapping based on the guid
     /// </summary>
     /// <param name="guid">The Guid</param>
     /// <returns>MappingModel</returns>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("mappings/{guid}")]
-        Task<MappingModel> GetMappingAsync([Path] Guid guid);
+    Task<MappingModel> GetMappingAsync([Path] Guid guid, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get the C# code from a mapping based on the guid
+    /// </summary>
+    /// <param name="guid">The Guid</param>
+    /// <param name="mappingConverterType">The optional mappingConverterType (can be Server or Builder)</param>
+    /// <returns>C# code</returns>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Get("mappings/code/{guid}")]
+    Task<string> GetMappingCodeAsync([Path] Guid guid, [Query] MappingConverterType mappingConverterType = MappingConverterType.Server, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Update a mapping based on the guid
     /// </summary>
     /// <param name="guid">The Guid</param>
     /// <param name="mapping">MappingModel</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Put("mappings/{guid}")]
     [Header("Content-Type", "application/json")]
-        Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);
+    Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete a mapping based on the guid
     /// </summary>
     /// <param name="guid">The Guid</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("mappings/{guid}")]
-        Task<StatusModel> DeleteMappingAsync([Path] Guid guid);
+    Task<StatusModel> DeleteMappingAsync([Path] Guid guid, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Save the mappings
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("mappings/save")]
-        Task<StatusModel> SaveMappingAsync();
+    Task<StatusModel> SaveMappingAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get the requests.
     /// </summary>
     /// <returns>LogRequestModels</returns>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("requests")]
-        Task<IList<LogEntryModel>> GetRequestsAsync();
+    Task<IList<LogEntryModel>> GetRequestsAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete all requests.
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("requests")]
-        Task<StatusModel> DeleteRequestsAsync();
+    Task<StatusModel> DeleteRequestsAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) all requests.
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("requests/reset")]
-        Task<StatusModel> ResetRequestsAsync();
+    Task<StatusModel> ResetRequestsAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get a request based on the guid
     /// </summary>
     /// <param name="guid">The Guid</param>
     /// <returns>MappingModel</returns>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("requests/{guid}")]
-        Task<LogEntryModel> GetRequestAsync([Path] Guid guid);
+    Task<LogEntryModel> GetRequestAsync([Path] Guid guid, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete a request based on the guid
     /// </summary>
     /// <param name="guid">The Guid</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("requests/{guid}")]
-        Task<StatusModel> DeleteRequestAsync([Path] Guid guid);
+    Task<StatusModel> DeleteRequestAsync([Path] Guid guid, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Find a request based on the criteria
     /// </summary>
     /// <param name="model">The RequestModel</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("requests/find")]
     [Header("Content-Type", "application/json")]
-        Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);
+    Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get all scenarios
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("scenarios")]
-        Task<IList<ScenarioStateModel>> GetScenariosAsync();
+    Task<IList<ScenarioStateModel>> GetScenariosAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) all scenarios
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("scenarios")]
-        Task<StatusModel> DeleteScenariosAsync();
+    Task<StatusModel> DeleteScenariosAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) all scenarios
     /// </summary>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("scenarios")]
-        Task<StatusModel> ResetScenariosAsync();
+    Task<StatusModel> ResetScenariosAsync(CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) a specific scenario
     /// </summary>
+    /// <param name="name">Scenario name.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("scenarios/{name}")]
     [AllowAnyStatusCode]
-        Task<StatusModel> DeleteScenarioAsync([Path] string name);
+    Task<StatusModel> DeleteScenarioAsync([Path] string name, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete (reset) all scenarios
     /// </summary>
+    /// <param name="name">Scenario name.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("scenarios/{name}/reset")]
     [AllowAnyStatusCode]
-        Task<StatusModel> ResetScenarioAsync([Path] string name);
+    Task<StatusModel> ResetScenarioAsync([Path] string name, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Create a new File
     /// </summary>
     /// <param name="filename">The filename</param>
     /// <param name="body">The body</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Post("files/{filename}")]
-        Task<StatusModel> PostFileAsync([Path] string filename, [Body] string body);
+    Task<StatusModel> PostFileAsync([Path] string filename, [Body] string body, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Update an existing File
     /// </summary>
     /// <param name="filename">The filename</param>
     /// <param name="body">The body</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Put("files/{filename}")]
-        Task<StatusModel> PutFileAsync([Path] string filename, [Body] string body);
+    Task<StatusModel> PutFileAsync([Path] string filename, [Body] string body, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Get the content of an existing File
     /// </summary>
     /// <param name="filename">The filename</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Get("files/{filename}")]
-        Task<string> GetFileAsync([Path] string filename);
+    Task<string> GetFileAsync([Path] string filename, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Delete an existing File
     /// </summary>
     /// <param name="filename">The filename</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Delete("files/{filename}")]
-        Task<StatusModel> DeleteFileAsync([Path] string filename);
+    Task<StatusModel> DeleteFileAsync([Path] string filename, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Check if a file exists
     /// </summary>
     /// <param name="filename">The filename</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
     [Head("files/{filename}")]
-        Task FileExistsAsync([Path] string 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.RestClient/WireMock.Net.RestClient.csproj

@@ -30,8 +30,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.3.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="RestEase" Version="1.5.7" />
+    <PackageReference Include="Stef.Validation" Version="0.1.1" />
   </ItemGroup>
 
   <ItemGroup>

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/Constants/WireMockConstants.cs

@@ -7,4 +7,5 @@ internal static class WireMockConstants
     public const int ProxyPriority = -2_000_000;
 
     public const string ContentTypeJson = "application/json";
+    public const string ContentTypeTextPlain = "text/plain";
 }

src/WireMock.Net/Exceptions/WireMockException.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace WireMock.Exceptions;
 
-namespace WireMock.Exceptions
-{
 /// <summary>
 /// WireMockException
 /// </summary>
@@ -32,4 +32,3 @@ namespace WireMock.Exceptions
     {
     }
 }
-}

src/WireMock.Net/Extensions/EnumExtensions.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Reflection;
+
+namespace WireMock.Extensions;
+
+internal static class EnumExtensions
+{
+    public static string GetFullyQualifiedEnumValue<T>(this T enumValue)
+        where T : struct, IConvertible
+    {
+        var type = typeof(T);
+
+        if (!type.GetTypeInfo().IsEnum)
+        {
+            throw new ArgumentException("T must be an enum");
+        }
+
+        return $"{type.Namespace}.{type.Name}.{enumValue}";
+    }
+}

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -3,8 +3,8 @@ 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>
@@ -34,7 +34,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
     public virtual bool FolderExists(string path)
     {
-            Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNullOrEmpty(path);
 
         return Directory.Exists(path);
     }
@@ -42,7 +42,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
     public virtual void CreateFolder(string path)
     {
-            Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNullOrEmpty(path);
 
         Directory.CreateDirectory(path);
     }
@@ -50,7 +50,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
     public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
     {
-            Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNullOrEmpty(path);
 
         return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
     }
@@ -64,7 +64,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
     public virtual string ReadMappingFile(string path)
     {
-            Guard.NotNullOrEmpty(path, nameof(path));
+        Guard.NotNullOrEmpty(path);
 
         return File.ReadAllText(path);
     }
@@ -81,7 +81,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
     public virtual byte[] ReadResponseBodyAsFile(string path)
     {
-            Guard.NotNullOrEmpty(path, nameof(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.
@@ -91,7 +91,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
     public virtual string ReadResponseBodyAsString(string path)
     {
-            Guard.NotNullOrEmpty(path, nameof(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.
@@ -101,7 +101,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
     public virtual bool FileExists(string filename)
     {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
+        Guard.NotNullOrEmpty(filename);
 
         return File.Exists(AdjustPathForMappingFolder(filename));
     }
@@ -109,8 +109,8 @@ namespace WireMock.Handlers
     /// <inheritdoc />
     public virtual void WriteFile(string filename, byte[] bytes)
     {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
+        Guard.NotNullOrEmpty(filename);
-            Guard.NotNull(bytes, nameof(bytes));
+        Guard.NotNull(bytes);
 
         File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
     }
@@ -128,7 +128,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
     public virtual void DeleteFile(string filename)
     {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
+        Guard.NotNullOrEmpty(filename);
 
         File.Delete(AdjustPathForMappingFolder(filename));
     }
@@ -136,7 +136,7 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
     public virtual byte[] ReadFile(string filename)
     {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
+        Guard.NotNullOrEmpty(filename);
 
         return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
     }
@@ -156,8 +156,8 @@ namespace WireMock.Handlers
     /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
     public virtual void WriteUnmatchedRequest(string filename, string text)
     {
-            Guard.NotNullOrEmpty(filename, nameof(filename));
+        Guard.NotNullOrEmpty(filename);
-            Guard.NotNull(text, nameof(text));
+        Guard.NotNull(text);
 
         var folder = GetUnmatchedRequestsFolder();
         if (!FolderExists(folder))
@@ -178,4 +178,3 @@ namespace WireMock.Handlers
         return Path.Combine(GetMappingFolder(), filename);
     }
 }
-}

src/WireMock.Net/Http/HttpClientBuilder.cs

@@ -35,9 +35,14 @@ internal static class HttpClientBuilder
         {
             handler.ClientCertificateOptions = ClientCertificateOption.Manual;
 
-            var x509Certificate2 = CertificateLoader.LoadCertificate(settings.ClientX509Certificate2ThumbprintOrSubjectName);
+            var x509Certificate2 = CertificateLoader.LoadCertificate(settings.ClientX509Certificate2ThumbprintOrSubjectName!);
             handler.ClientCertificates.Add(x509Certificate2);
         }
+        else if (settings.Certificate != null)
+        {
+            handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+            handler.ClientCertificates.Add(settings.Certificate);
+        }
 
         handler.AllowAutoRedirect = settings.AllowAutoRedirect == true;
 

src/WireMock.Net/Http/HttpRequestMessageHelper.cs

@@ -28,7 +28,7 @@ internal static class HttpRequestMessageHelper
         switch (requestMessage.BodyData?.DetectedBodyType)
         {
             case BodyType.Bytes:
-                httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes, contentType);
+                httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes!, contentType);
                 break;
 
             case BodyType.Json:
@@ -36,7 +36,8 @@ internal static class HttpRequestMessageHelper
                 break;
 
             case BodyType.String:
-                httpRequestMessage.Content = StringContentHelper.Create(requestMessage.BodyData.BodyAsString, contentType);
+            case BodyType.FormUrlEncoded:
+                httpRequestMessage.Content = StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType);
                 break;
         }
 

src/WireMock.Net/Http/HttpResponseMessageHelper.cs

@@ -15,7 +15,8 @@ internal static class HttpResponseMessageHelper
         Uri requiredUri,
         Uri originalUri,
         bool deserializeJson,
-        bool decompressGzipAndDeflate)
+        bool decompressGzipAndDeflate,
+        bool deserializeFormUrlEncoded)
     {
         var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };
 
@@ -44,7 +45,8 @@ internal static class HttpResponseMessageHelper
                     ContentType = contentTypeHeader?.FirstOrDefault(),
                     DeserializeJson = deserializeJson,
                     ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
-                    DecompressGZipAndDeflate = decompressGzipAndDeflate
+                    DecompressGZipAndDeflate = decompressGzipAndDeflate,
+                    DeserializeFormUrlEncoded = deserializeFormUrlEncoded
                 };
                 responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
@@ -55,7 +57,7 @@ internal static class HttpResponseMessageHelper
             // If Location header contains absolute redirect URL, and base URL is one that we proxy to,
             // we need to replace it to original one.
             if (string.Equals(header.Key, HttpKnownHeaderNames.Location, StringComparison.OrdinalIgnoreCase)
-                && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
+                && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out var absoluteLocationUri)
                 && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
             {
                 var replacedLocationUri = new Uri(originalUri, absoluteLocationUri.PathAndQuery);

src/WireMock.Net/IMapping.cs

@@ -120,7 +120,21 @@ public interface IMapping
     /// <summary>
     /// Use Fire and Forget for the defined webhook(s). [Optional]
     /// </summary>
-    public bool? UseWebhooksFireAndForget { get; set; }
+    bool? UseWebhooksFireAndForget { get; }
+
+    /// <summary>
+    /// Data Object which can be used when WithTransformer is used.
+    /// e.g. lookup an path in this object using
+    /// <example>
+    /// lookup data "1"
+    /// </example>
+    /// </summary>
+    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/IMappingBuilder.cs

@@ -0,0 +1,60 @@
+using System;
+using WireMock.Admin.Mappings;
+using WireMock.Matchers.Request;
+using WireMock.Server;
+using WireMock.Types;
+
+namespace WireMock;
+
+/// <summary>
+/// IMappingBuilder
+/// </summary>
+public interface IMappingBuilder
+{
+    /// <summary>
+    /// The given.
+    /// </summary>
+    /// <param name="requestMatcher">The request matcher.</param>
+    /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false);
+
+    /// <summary>
+    /// Gets all the mappings as a list.
+    /// </summary>
+    /// <returns>A list from <see cref="MappingModel"/>s.</returns>
+    MappingModel[] GetMappings();
+
+    /// <summary>
+    /// Convert all mappings to JSON.
+    /// </summary>
+    /// <returns>JSON</returns>
+    string ToJson();
+
+    /// <summary>
+    /// Save all mappings as a single JSON to a file.
+    /// </summary>
+    /// <param name="path">The file to write to.</param>
+    void SaveMappingsToFile(string path);
+
+    /// <summary>
+    /// Save all mappings as multiple JSON files (each file is 1 mapping).
+    /// </summary>
+    /// <param name="folder">The folder to write the files to.</param>
+    void SaveMappingsToFolder(string folder);
+
+    /// <summary>
+    /// Get the C# code for a mapping.
+    /// </summary>
+    /// <param name="guid">The Mapping Guid.</param>
+    /// <param name="converterType">The <see cref="MappingConverterType"/></param>
+    /// <returns>C# code (null in case the mapping is not found)</returns>
+    string? ToCSharpCode(Guid guid, MappingConverterType converterType);
+
+    /// <summary>
+    /// Get the C# code for all mappings.
+    /// </summary>
+    /// <param name="converterType">The <see cref="MappingConverterType"/></param>
+    /// <returns>C# code</returns>
+    public string ToCSharpCode(MappingConverterType converterType);
+}

src/WireMock.Net/Json/DynamicJsonClassOptions.cs

@@ -0,0 +1,10 @@
+// Copied from https://github.com/Handlebars-Net/Handlebars.Net.Helpers/blob/master/src/Handlebars.Net.Helpers.DynamicLinq
+
+namespace WireMock.Json;
+
+internal class DynamicJsonClassOptions
+{
+    public IntegerBehavior IntegerConvertBehavior { get; set; } = IntegerBehavior.UseLong;
+
+    public FloatBehavior FloatConvertBehavior { get; set; } = FloatBehavior.UseDouble;
+}

src/WireMock.Net/Json/DynamicPropertyWithValue.cs

@@ -0,0 +1,15 @@
+// Copied from https://github.com/Handlebars-Net/Handlebars.Net.Helpers/blob/master/src/Handlebars.Net.Helpers.DynamicLinq
+
+using System.Linq.Dynamic.Core;
+
+namespace WireMock.Json;
+
+internal class DynamicPropertyWithValue : DynamicProperty
+{
+    public object? Value { get; }
+
+    public DynamicPropertyWithValue(string name, object? value) : base(name, value?.GetType() ?? typeof(object))
+    {
+        Value = value;
+    }
+}

src/WireMock.Net/Json/FloatBehavior.cs

@@ -0,0 +1,24 @@
+// Copied from https://github.com/Handlebars-Net/Handlebars.Net.Helpers/blob/master/src/Handlebars.Net.Helpers.DynamicLinq
+
+namespace WireMock.Json;
+
+/// <summary>
+/// Enum to define how to convert an Float in the Json Object.
+/// </summary>
+internal enum FloatBehavior
+{
+    /// <summary>
+    /// Convert all Float types in the Json Object to a double. (default)
+    /// </summary>
+    UseDouble = 0,
+
+    /// <summary>
+    /// Convert all Float types in the Json Object to a float (unless overflow).
+    /// </summary>
+    UseFloat = 1,
+
+    /// <summary>
+    /// Convert all Float types in the Json Object to a decimal (unless overflow).
+    /// </summary>
+    UseDecimal = 2
+}

src/WireMock.Net/Json/IntegerBehavior.cs

@@ -0,0 +1,20 @@
+// Copied from https://github.com/Handlebars-Net/Handlebars.Net.Helpers/blob/master/src/Handlebars.Net.Helpers.DynamicLinq
+
+namespace WireMock.Json;
+
+/// <summary>
+/// Enum to define how to convert an Integer in the Json Object.
+/// </summary>
+internal enum IntegerBehavior
+{
+    /// <summary>
+    /// Convert all Integer types in the Json Object to a int (unless overflow).
+    /// (default)
+    /// </summary>
+    UseInt = 0,
+
+    /// <summary>
+    /// Convert all Integer types in the Json Object to a long.
+    /// </summary>
+    UseLong = 1
+}

src/WireMock.Net/Json/JObjectExtensions.cs

@@ -0,0 +1,202 @@
+// Copied from https://github.com/Handlebars-Net/Handlebars.Net.Helpers/blob/master/src/Handlebars.Net.Helpers.DynamicLinq
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Reflection;
+using Newtonsoft.Json.Linq;
+
+namespace WireMock.Json;
+
+internal static class JObjectExtensions
+{
+    private class JTokenResolvers : Dictionary<JTokenType, Func<JToken, DynamicJsonClassOptions?, object?>>
+    {
+    }
+
+    private static readonly JTokenResolvers Resolvers = new()
+    {
+        { JTokenType.Array, ConvertJTokenArray },
+        { JTokenType.Boolean, (jToken, _) => jToken.Value<bool>() },
+        { JTokenType.Bytes, (jToken, _) => jToken.Value<byte[]>() },
+        { JTokenType.Date, (jToken, _) => jToken.Value<DateTime>() },
+        { JTokenType.Float, ConvertJTokenFloat },
+        { JTokenType.Guid, (jToken, _) => jToken.Value<Guid>() },
+        { JTokenType.Integer, ConvertJTokenInteger },
+        { JTokenType.None, (_, _) => null },
+        { JTokenType.Null, (_, _) => null },
+        { JTokenType.Object, ConvertJObject },
+        { JTokenType.Property, ConvertJTokenProperty },
+        { JTokenType.String, (jToken, _) => jToken.Value<string>() },
+        { JTokenType.TimeSpan, (jToken, _) => jToken.Value<TimeSpan>() },
+        { JTokenType.Undefined, (_, _) => null },
+        { JTokenType.Uri, (o, _) => o.Value<Uri>() },
+    };
+
+    internal static DynamicClass? ToDynamicJsonClass(this JObject? src, DynamicJsonClassOptions? options = null)
+    {
+        if (src == null)
+        {
+            return null;
+        }
+
+        var dynamicPropertyWithValues = new List<DynamicPropertyWithValue>();
+
+        foreach (var prop in src.Properties())
+        {
+            var value = Resolvers[prop.Type](prop.Value, options);
+            if (value != null)
+            {
+                dynamicPropertyWithValues.Add(new DynamicPropertyWithValue(prop.Name, value));
+            }
+        }
+
+        return CreateInstance(dynamicPropertyWithValues);
+    }
+
+    internal static IEnumerable ToDynamicClassArray(this JArray? src, DynamicJsonClassOptions? options = null)
+    {
+        if (src == null)
+        {
+            return EmptyArray<object?>.Value;
+        }
+
+        return ConvertJTokenArray(src, options);
+    }
+
+    private static object? ConvertJObject(JToken arg, DynamicJsonClassOptions? options = null)
+    {
+        if (arg is JObject asJObject)
+        {
+            return asJObject.ToDynamicJsonClass(options);
+        }
+
+        return GetResolverFor(arg)(arg, options);
+    }
+
+    private static object PassThrough(JToken arg, DynamicJsonClassOptions? options)
+    {
+        return arg;
+    }
+
+    private static Func<JToken, DynamicJsonClassOptions?, object?> GetResolverFor(JToken arg)
+    {
+        return Resolvers.TryGetValue(arg.Type, out var result) ? result : PassThrough;
+    }
+
+    private static object ConvertJTokenFloat(JToken arg, DynamicJsonClassOptions? options = null)
+    {
+        if (arg.Type != JTokenType.Float)
+        {
+            throw new InvalidOperationException($"Unable to convert {nameof(JToken)} of type: {arg.Type} to double or float.");
+        }
+
+        if (options?.FloatConvertBehavior == FloatBehavior.UseFloat)
+        {
+            try
+            {
+                return arg.Value<float>();
+            }
+            catch
+            {
+                return arg.Value<double>();
+            }
+        }
+
+        if (options?.FloatConvertBehavior == FloatBehavior.UseDecimal)
+        {
+            try
+            {
+                return arg.Value<decimal>();
+            }
+            catch
+            {
+                return arg.Value<double>();
+            }
+        }
+
+
+        return arg.Value<double>();
+    }
+
+    private static object ConvertJTokenInteger(JToken arg, DynamicJsonClassOptions? options = null)
+    {
+        if (arg.Type != JTokenType.Integer)
+        {
+            throw new InvalidOperationException($"Unable to convert {nameof(JToken)} of type: {arg.Type} to long or int.");
+        }
+
+        var longValue = arg.Value<long>();
+
+        if (options is null || options.IntegerConvertBehavior == IntegerBehavior.UseInt)
+        {
+            if (longValue is >= int.MinValue and <= int.MaxValue)
+            {
+                return Convert.ToInt32(longValue);
+            }
+        }
+
+        return longValue;
+    }
+
+    private static object? ConvertJTokenProperty(JToken arg, DynamicJsonClassOptions? options = null)
+    {
+        var resolver = GetResolverFor(arg);
+        if (resolver is null)
+        {
+            throw new InvalidOperationException($"Unable to handle {nameof(JToken)} of type: {arg.Type}.");
+        }
+
+        return resolver(arg, options);
+    }
+
+    private static IEnumerable ConvertJTokenArray(JToken arg, DynamicJsonClassOptions? options = null)
+    {
+        if (arg is not JArray array)
+        {
+            throw new InvalidOperationException($"Unable to convert {nameof(JToken)} of type: {arg.Type} to {nameof(JArray)}.");
+        }
+
+        var result = new List<object?>();
+        foreach (var item in array)
+        {
+            result.Add(ConvertJObject(item));
+        }
+
+        var distinctType = FindSameTypeOf(result);
+        return distinctType == null ? result.ToArray() : ConvertToTypedArray(result, distinctType);
+    }
+
+    private static Type? FindSameTypeOf(IEnumerable<object?> src)
+    {
+        var types = src.Select(o => o?.GetType()).Distinct().OfType<Type>().ToArray();
+        return types.Length == 1 ? types[0] : null;
+    }
+
+    private static IEnumerable ConvertToTypedArray(IEnumerable<object?> src, Type newType)
+    {
+        var method = ConvertToTypedArrayGenericMethod.MakeGenericMethod(newType);
+        return (IEnumerable)method.Invoke(null, new object[] { src })!;
+    }
+
+    private static readonly MethodInfo ConvertToTypedArrayGenericMethod = typeof(JObjectExtensions).GetMethod(nameof(ConvertToTypedArrayGeneric), BindingFlags.NonPublic | BindingFlags.Static)!;
+
+    private static T[] ConvertToTypedArrayGeneric<T>(IEnumerable<object> src)
+    {
+        return src.Cast<T>().ToArray();
+    }
+
+    public static DynamicClass CreateInstance(IList<DynamicPropertyWithValue> dynamicPropertiesWithValue, bool createParameterCtor = true)
+    {
+        var type = DynamicClassFactory.CreateType(dynamicPropertiesWithValue.Cast<DynamicProperty>().ToArray(), createParameterCtor);
+        var dynamicClass = (DynamicClass)Activator.CreateInstance(type);
+        foreach (var dynamicPropertyWithValue in dynamicPropertiesWithValue.Where(p => p.Value != null))
+        {
+            dynamicClass.SetDynamicPropertyValue(dynamicPropertyWithValue.Name, dynamicPropertyWithValue.Value!);
+        }
+
+        return dynamicClass;
+    }
+}

src/WireMock.Net/Mapping.cs

@@ -67,11 +67,17 @@ 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; }
+
+    /// <inheritdoc />
+    public double? Probability { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="Mapping"/> class.
     /// </summary>
@@ -91,6 +97,8 @@ public class Mapping : IMapping
     /// <param name="webhooks">The Webhooks. [Optional]</param>
     /// <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,
@@ -107,7 +115,9 @@ public class Mapping : IMapping
         int? stateTimes,
         IWebhook[]? webhooks,
         bool? useWebhooksFireAndForget,
-        ITimeSettings? timeSettings)
+        ITimeSettings? timeSettings,
+        object? data,
+        double? probability)
     {
         Guid = guid;
         UpdatedAt = updatedAt;
@@ -125,6 +135,8 @@ public class Mapping : IMapping
         Webhooks = webhooks;
         UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
+        Data = data;
+        Probability = probability;
     }
 
     /// <inheritdoc cref="IMapping.ProvideResponseAsync" />

src/WireMock.Net/MappingBuilder.cs

@@ -0,0 +1,155 @@
+using System;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+using Stef.Validation;
+using WireMock.Admin.Mappings;
+using WireMock.Matchers.Request;
+using WireMock.Owin;
+using WireMock.Serialization;
+using WireMock.Server;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock;
+
+/// <summary>
+/// MappingBuilder
+/// </summary>
+public class MappingBuilder : IMappingBuilder
+{
+    private readonly WireMockServerSettings _settings;
+    private readonly IWireMockMiddlewareOptions _options;
+    private readonly MappingConverter _mappingConverter;
+    private readonly MappingToFileSaver _mappingToFileSaver;
+    private readonly IGuidUtils _guidUtils;
+    private readonly IDateTimeUtils _dateTimeUtils;
+
+    /// <summary>
+    /// Create a MappingBuilder
+    /// </summary>
+    /// <param name="settings">The optional <see cref="WireMockServerSettings"/>.</param>
+    public MappingBuilder(WireMockServerSettings? settings = null)
+    {
+        _settings = settings ?? new WireMockServerSettings();
+        _options = WireMockMiddlewareOptionsHelper.InitFromSettings(_settings);
+
+        var matcherMapper = new MatcherMapper(_settings);
+        _mappingConverter = new MappingConverter(matcherMapper);
+        _mappingToFileSaver = new MappingToFileSaver(_settings, _mappingConverter);
+
+        _guidUtils = new GuidUtils();
+        _dateTimeUtils = new DateTimeUtils();
+    }
+
+    internal MappingBuilder(
+        WireMockServerSettings settings,
+        IWireMockMiddlewareOptions options,
+        MappingConverter mappingConverter,
+        MappingToFileSaver mappingToFileSaver,
+        IGuidUtils guidUtils,
+        IDateTimeUtils dateTimeUtils
+    )
+    {
+        _settings = Guard.NotNull(settings);
+        _options = Guard.NotNull(options);
+        _mappingConverter = Guard.NotNull(mappingConverter);
+        _mappingToFileSaver = Guard.NotNull(mappingToFileSaver);
+        _guidUtils = Guard.NotNull(guidUtils);
+        _dateTimeUtils = Guard.NotNull(dateTimeUtils);
+    }
+
+    /// <inheritdoc />
+    public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
+    {
+        return new RespondWithAProvider(RegisterMapping, Guard.NotNull(requestMatcher), _settings, _guidUtils, _dateTimeUtils, saveToFile);
+    }
+
+    /// <inheritdoc />
+    public MappingModel[] GetMappings()
+    {
+        return GetNonAdminMappings().Select(_mappingConverter.ToMappingModel).ToArray();
+    }
+
+    /// <inheritdoc />
+    public string ToJson()
+    {
+        return ToJson(GetMappings());
+    }
+
+    /// <inheritdoc />
+    public string? ToCSharpCode(Guid guid, MappingConverterType converterType)
+    {
+        var mapping = GetNonAdminMappings().FirstOrDefault(m => m.Guid == guid);
+        if (mapping is null)
+        {
+            return null;
+        }
+
+        var settings = new MappingConverterSettings { AddStart = true, ConverterType = converterType };
+        return _mappingConverter.ToCSharpCode(mapping, settings);
+    }
+
+    /// <inheritdoc />
+    public string ToCSharpCode(MappingConverterType converterType)
+    {
+        var sb = new StringBuilder();
+        bool addStart = true;
+        foreach (var mapping in GetNonAdminMappings())
+        {
+            sb.AppendLine(_mappingConverter.ToCSharpCode(mapping, new MappingConverterSettings { AddStart = addStart, ConverterType = converterType }));
+
+            if (addStart)
+            {
+                addStart = false;
+            }
+        }
+
+        return sb.ToString();
+    }
+
+    /// <inheritdoc />
+    public void SaveMappingsToFile(string path)
+    {
+        _mappingToFileSaver.SaveMappingsToFile(GetNonAdminMappings(), path);
+    }
+
+    /// <inheritdoc />
+    public void SaveMappingsToFolder(string? folder)
+    {
+        foreach (var mapping in GetNonAdminMappings())
+        {
+            _mappingToFileSaver.SaveMappingToFile(mapping, folder);
+        }
+    }
+
+    private IMapping[] GetNonAdminMappings()
+    {
+        return _options.Mappings.Values.Where(m => !m.IsAdminInterface).OrderBy(m => m.UpdatedAt).ToArray();
+    }
+
+    private void RegisterMapping(IMapping mapping, bool saveToFile)
+    {
+        // Check a mapping exists with the same Guid. If so, update the datetime and replace it.
+        if (_options.Mappings.ContainsKey(mapping.Guid))
+        {
+            mapping.UpdatedAt = _dateTimeUtils.UtcNow;
+            _options.Mappings[mapping.Guid] = mapping;
+        }
+        else
+        {
+            _options.Mappings.TryAdd(mapping.Guid, mapping);
+        }
+
+        if (saveToFile)
+        {
+            _mappingToFileSaver.SaveMappingToFile(mapping);
+        }
+    }
+
+    private static string ToJson(object value)
+    {
+        return JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsDefault);
+    }
+}

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/LinqMatcher.cs

@@ -5,8 +5,8 @@ using AnyOfTypes;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Extensions;
+using WireMock.Json;
 using WireMock.Models;
-using WireMock.Util;
 
 namespace WireMock.Matchers;
 
@@ -100,38 +100,55 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
     {
         double match = MatchScores.Mismatch;
 
-        JObject value;
+        JArray jArray;
-        switch (input)
+        try
         {
-            case JObject valueAsJObject:
+            jArray = new JArray { input };
-                value = valueAsJObject;
+        }
-                break;
+        catch
-
+        {
-            case { } valueAsObject:
+            jArray = new JArray { JToken.FromObject(input) };
-                value = JObject.FromObject(valueAsObject);
-                break;
-
-            default:
-                return MatchScores.Mismatch;
         }
 
+        //enumerable = jArray.ToDynamicClassArray();
+
+        //JObject value;
+        //switch (input)
+        //{
+        //    case JObject valueAsJObject:
+        //        value = valueAsJObject;
+        //        break;
+
+        //    case { } valueAsObject:
+        //        value = JObject.FromObject(valueAsObject);
+        //        break;
+
+        //    default:
+        //        return MatchScores.Mismatch;
+        //}
+
         // Convert a single object to a Queryable JObject-list with 1 entry.
-        var queryable1 = new[] { value }.AsQueryable();
+        //var queryable1 = new[] { value }.AsQueryable();
+        var queryable = jArray.ToDynamicClassArray().AsQueryable();
 
         try
         {
             // Generate the DynamicLinq select statement.
-            string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
+            //string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
 
             // Execute DynamicLinq Select statement.
-            var queryable2 = queryable1.Select(dynamicSelect);
+            //var queryable2 = queryable1.Select(dynamicSelect);
 
             // Use the Any(...) method to check if the result matches.
-            match = MatchScores.ToScore(_patterns.Select(pattern => queryable2.Any(pattern)).ToArray(), MatchOperator);
+
+            var patternsAsStringArray = _patterns.Select(p => p.GetPattern()).ToArray();
+            var scores = patternsAsStringArray.Select(p => queryable.Any(p)).ToArray();
+
+            match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())).ToArray(), MatchOperator);
 
             return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
-        catch
+        catch (Exception e)
         {
             if (ThrowException)
             {

src/WireMock.Net/Matchers/MatchScores.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 
 namespace WireMock.Matchers;

src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using AnyOfTypes;
 using WireMock.Models;
@@ -62,7 +63,7 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
     /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
     public AnyOf<string, StringPattern>[] GetPatterns()
     {
-        return new AnyOf<string, StringPattern>[0];
+        return EmptyArray<AnyOf<string, StringPattern>>.Value;
     }
 
     /// <inheritdoc />

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

@@ -1,8 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using AnyOfTypes;
 using Stef.Validation;
-using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -33,6 +32,11 @@ public class RequestMessageBodyMatcher : IRequestMatcher
     /// </summary>
     public Func<IBodyData?, bool>? BodyDataFunc { get; }
 
+    /// <summary>
+    /// The body data function for FormUrlEncoded
+    /// </summary>
+    public Func<IDictionary<string, string>?, bool>? FormUrlEncodedFunc { get; }
+
     /// <summary>
     /// The matchers.
     /// </summary>
@@ -109,6 +113,15 @@ public class RequestMessageBodyMatcher : IRequestMatcher
         BodyDataFunc = Guard.NotNull(func);
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<IDictionary<string, string>?, bool> func)
+    {
+        FormUrlEncodedFunc = Guard.NotNull(func);
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
     /// </summary>
@@ -144,6 +157,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
             {
                 case BodyType.Json:
                 case BodyType.String:
+                case BodyType.FormUrlEncoded:
                     return notNullOrEmptyMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
 
                 case BodyType.Bytes:
@@ -158,7 +172,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
         {
             // If the body is a byte array, try to match.
             var detectedBodyType = requestMessage.BodyData?.DetectedBodyType;
-            if (detectedBodyType is BodyType.Bytes or BodyType.String)
+            if (detectedBodyType is BodyType.Bytes or BodyType.String or BodyType.FormUrlEncoded)
             {
                 return exactObjectMatcher.IsMatch(requestMessage.BodyData?.BodyAsBytes);
             }
@@ -184,7 +198,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
         if (matcher is IStringMatcher stringMatcher)
         {
             // If the body is a Json or a String, use the BodyAsString to match on.
-            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
+            if (requestMessage?.BodyData?.DetectedBodyType is BodyType.Json or BodyType.String or BodyType.FormUrlEncoded)
             {
                 return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);
             }
@@ -206,6 +220,11 @@ public class RequestMessageBodyMatcher : IRequestMatcher
             return MatchScores.ToScore(Func(requestMessage.BodyData?.BodyAsString));
         }
 
+        if (FormUrlEncodedFunc != null)
+        {
+            return MatchScores.ToScore(FormUrlEncodedFunc(requestMessage.BodyData?.BodyAsFormUrlEncoded));
+        }
+
         if (JsonFunc != null)
         {
             return MatchScores.ToScore(JsonFunc(requestMessage.BodyData?.BodyAsJson));

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/BodyData.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Text;
 using WireMock.Types;
 
@@ -14,6 +15,9 @@ public class BodyData : IBodyData
     /// <inheritdoc />
     public string? BodyAsString { get; set; }
 
+    /// <inheritdoc />
+    public IDictionary<string, string>? BodyAsFormUrlEncoded { get; set; }
+
     /// <inheritdoc cref="IBodyData.BodyAsJson" />
     public object? BodyAsJson { get; set; }
 

src/WireMock.Net/Models/TimeSettings.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace WireMock.Models
+namespace WireMock.Models;
-{
+
 /// <summary>
 /// TimeSettingsModel: Start, End and TTL
 /// </summary>
@@ -16,4 +16,3 @@ namespace WireMock.Models
     /// <inheritdoc />
     public int? TTL { get; set; }
 }
-}

src/WireMock.Net/Models/UrlDetails.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using Stef.Validation;
 
-namespace WireMock.Models
+namespace WireMock.Models;
-{
+
 /// <summary>
 /// UrlDetails
 /// </summary>
@@ -41,11 +41,7 @@ namespace WireMock.Models
     /// <param name="url">The URL (relative).</param>
     public UrlDetails(Uri absoluteUrl, Uri url)
     {
-            Guard.NotNull(absoluteUrl, nameof(absoluteUrl));
+        AbsoluteUrl = Guard.NotNull(absoluteUrl);
-            Guard.NotNull(url, nameof(url));
+        Url = Guard.NotNull(url);
-
-            AbsoluteUrl = absoluteUrl;
-            Url = 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;
 
@@ -130,6 +130,7 @@ namespace WireMock.Owin.Mappers
             switch (responseMessage.BodyData?.DetectedBodyType)
             {
                 case BodyType.String:
+                case BodyType.FormUrlEncoded:
                     return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString!);
 
                 case BodyType.Json:

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/Owin/WireMockMiddlewareOptionsHelper.cs

@@ -0,0 +1,35 @@
+using Stef.Validation;
+using WireMock.Settings;
+
+namespace WireMock.Owin;
+
+internal static class WireMockMiddlewareOptionsHelper
+{
+    public static IWireMockMiddlewareOptions InitFromSettings(WireMockServerSettings settings, IWireMockMiddlewareOptions? options = null)
+    {
+        Guard.NotNull(settings);
+
+        options ??= new WireMockMiddlewareOptions();
+
+        options.FileSystemHandler = settings.FileSystemHandler;
+        options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
+        options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
+        options.Logger = settings.Logger;
+        options.DisableJsonBodyParsing = settings.DisableJsonBodyParsing;
+        options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
+        options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
+        options.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
+        options.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
+
+        if (settings.CustomCertificateDefined)
+        {
+            options.X509StoreName = settings.CertificateSettings!.X509StoreName;
+            options.X509StoreLocation = settings.CertificateSettings.X509StoreLocation;
+            options.X509ThumbprintOrSubjectName = settings.CertificateSettings.X509StoreThumbprintOrSubjectName;
+            options.X509CertificateFilePath = settings.CertificateSettings.X509CertificateFilePath;
+            options.X509CertificatePassword = settings.CertificateSettings.X509CertificatePassword;
+        }
+
+        return options;
+    }
+}

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Stef.Validation;
 using WireMock.Http;
+using WireMock.Matchers;
 using WireMock.Serialization;
 using WireMock.Settings;
 using WireMock.Util;
@@ -35,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);
@@ -43,16 +57,45 @@ internal class ProxyHelper
         // Create ResponseMessage
         bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
         bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
+        bool deserializeFormUrlEncoded = !_settings.DisableDeserializeFormUrlEncoded.GetValueOrDefault(false);
 
-        var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate).ConfigureAwait(false);
+        var responseMessage = await HttpResponseMessageHelper.CreateAsync(
+            httpResponseMessage,
+            requiredUri,
+            originalUri,
+            deserializeJson,
+            decompressGzipAndDeflate,
+            deserializeFormUrlEncoded
+        ).ConfigureAwait(false);
 
         IMapping? newMapping = null;
-        if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
+
-            (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
+        var saveMappingSettings = proxyAndRecordSettings.SaveMappingSettings;
+
+        bool save = true;
+        if (saveMappingSettings != null)
+        {
+            save &= Check(saveMappingSettings.StatusCodePattern,
+                () => saveMappingSettings.StatusCodePattern != null && HttpStatusRangeParser.IsMatch(saveMappingSettings.StatusCodePattern, responseMessage.StatusCode)
+            );
+
+            save &= Check(saveMappingSettings.HttpMethods,
+                () => saveMappingSettings.HttpMethods != null && saveMappingSettings.HttpMethods.Value.Contains(requestMessage.Method, StringComparer.OrdinalIgnoreCase)
+            );
+        }
+
+        if (save && (proxyAndRecordSettings.SaveMapping || proxyAndRecordSettings.SaveMappingToFile))
         {
             newMapping = _proxyMappingConverter.ToMapping(mapping, proxyAndRecordSettings, requestMessage, responseMessage);
         }
 
         return (responseMessage, newMapping);
     }
+
+    private static bool Check<T>(ProxySaveMappingSetting<T>? saveMappingSetting, Func<bool> action)
+    {
+        var isMatch = saveMappingSetting is null || action();
+        var matchBehaviour = saveMappingSetting?.MatchBehaviour ?? MatchBehaviour.AcceptOnMatch;
+        return isMatch == (matchBehaviour == MatchBehaviour.AcceptOnMatch);
+    }
 }

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using JsonConverter.Abstractions;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Util;
@@ -45,35 +47,60 @@ 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>
     /// <param name="func">The function.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBody(Func<string, bool> func);
+    IRequestBuilder WithBody(Func<string?, bool> func);
 
     /// <summary>
     /// WithBody: func (byte[])
     /// </summary>
     /// <param name="func">The function.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBody(Func<byte[], bool> func);
+    IRequestBuilder WithBody(Func<byte[]?, bool> func);
 
     /// <summary>
     /// WithBody: func (json object)
     /// </summary>
     /// <param name="func">The function.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBody(Func<object, bool> func);
+    IRequestBuilder WithBody(Func<object?, bool> func);
 
     /// <summary>
     /// WithBody: func (BodyData object)
     /// </summary>
     /// <param name="func">The function.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBody(Func<IBodyData, bool> func);
+    IRequestBuilder WithBody(Func<IBodyData?, bool> func);
+
+    /// <summary>
+    /// WithBody: Body as form-urlencoded values.
+    /// </summary>
+    /// <param name="func">The form-urlencoded values.</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBody(Func<IDictionary<string, string>?, bool> func);
 }

src/WireMock.Net/RequestBuilders/ICookiesRequestBuilder.cs

@@ -1,10 +1,9 @@
-using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 
-namespace WireMock.RequestBuilders
+namespace WireMock.RequestBuilders;
-{
+
 /// <summary>
 /// The CookieRequestBuilder interface.
 /// </summary>
@@ -17,7 +16,7 @@ namespace WireMock.RequestBuilders
     /// <param name="pattern">The pattern.</param>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, string pattern, MatchBehaviour matchBehaviour);
+    IRequestBuilder WithCookie(string name, string pattern, MatchBehaviour matchBehaviour);
 
     /// <summary>
     /// WithCookie: matching based on name, pattern, ignoreCase and matchBehaviour.
@@ -27,7 +26,7 @@ namespace WireMock.RequestBuilders
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
     /// WithCookie: matching based on name, patterns and matchBehaviour.
@@ -36,7 +35,7 @@ namespace WireMock.RequestBuilders
     /// <param name="patterns">The patterns.</param>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, string[] patterns, MatchBehaviour matchBehaviour);
+    IRequestBuilder WithCookie(string name, string[] patterns, MatchBehaviour matchBehaviour);
 
     /// <summary>
     /// WithCookie: matching based on name, patterns, ignoreCase and matchBehaviour.
@@ -46,7 +45,7 @@ namespace WireMock.RequestBuilders
     /// <param name="ignoreCase">Ignore the case from the pattern.</param>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+    IRequestBuilder WithCookie(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
     /// WithCookie: matching based on name and IStringMatcher[].
@@ -54,7 +53,7 @@ namespace WireMock.RequestBuilders
     /// <param name="name">The name.</param>
     /// <param name="matchers">The matchers.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
+    IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers);
 
     /// <summary>
     /// WithCookie: matching based on name, ignoreCase and IStringMatcher[].
@@ -63,7 +62,7 @@ namespace WireMock.RequestBuilders
     /// <param name="ignoreCase">Ignore the case from the cookie-keys.</param>
     /// <param name="matchers">The matchers.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, bool ignoreCase, [NotNull] params IStringMatcher[] matchers);
+    IRequestBuilder WithCookie(string name, bool ignoreCase, params IStringMatcher[] matchers);
 
     /// <summary>
     /// WithCookie: matching based on name, ignoreCase, matchBehaviour and IStringMatcher[].
@@ -73,13 +72,12 @@ namespace WireMock.RequestBuilders
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="matchers">The matchers.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, bool ignoreCase, MatchBehaviour matchBehaviour, [NotNull] params IStringMatcher[] matchers);
+    IRequestBuilder WithCookie(string name, bool ignoreCase, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers);
 
     /// <summary>
     /// WithCookie: matching based on functions.
     /// </summary>
     /// <param name="funcs">The cookies funcs.</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
+    IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs);
-    }
 }

src/WireMock.Net/RequestBuilders/IRequestBuilder.cs

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