StartWithAdminInterface

* Handle new line escaping in C# mapping code generator

* Prevent date conversion when value persisted as string

* Handle object properties named as csharp keywords

* Refactor: Extract logic responsible for generating anonymous object definition to a separate class

CHANGELOG.md

@@ -1,3 +1,37 @@
+# 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)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.18</VersionPrefix>
+        <VersionPrefix>1.5.25</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.18
+SET version=1.5.25
 
 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,8 +1,4 @@
-# 1.5.18 (09 March 2023)
-- #893 Add 'Data' to response which can be used during transforming the response [feature]
-- #896 Bump Microsoft.Owin from 2.0.2 to 4.2.2 in /examples/WireMock.Net.Service [dependencies]
-- #900 ProxySettings : Add logic to not save some requests depending on HttpMethods  [feature]
-- #897 WebHostBuilder.ConfigureServices method not found when using nunit3testadapter 4.4.0 [bug]
-- #899 Ignore OPTIONS request when using proxyandrecord [feature]
+# 1.5.25 (13 May 2023)
+- #934 Code generator improvements [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -1,20 +1,24 @@
 # 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*** |   |
@@ -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.Console.Net452.Classic/MainApp.cs

@@ -60,7 +60,7 @@ namespace WireMock.Net.ConsoleApplication
 
             var todos = new Dictionary<int, Todo>();
 
-            var server = WireMockServer.Start();
+            var server = WireMockServer.StartWithAdminInterface();
 
             server
                 .Given(Request.Create()
@@ -709,6 +709,25 @@ namespace WireMock.Net.ConsoleApplication
                 .WithWebhookFireAndForget(true)
                 .RespondWith(Response.Create().WithBody("a-response"));
 
+            server
+                .Given(Request.Create().WithPath("/todo/items").UsingGet())
+                .InScenario("To do list")
+                .WillSetStateTo("TodoList State Started")
+                .RespondWith(Response.Create().WithBody("Buy milk"));
+
+            server
+                .Given(Request.Create().WithPath("/todo/items").UsingPost())
+                .InScenario("To do list")
+                .WhenStateIs("TodoList State Started")
+                .WillSetStateTo("Cancel newspaper item added")
+                .RespondWith(Response.Create().WithStatusCode(201));
+
+            server
+                .Given(Request.Create().WithPath("/todo/items").UsingGet())
+                .InScenario("To do list")
+                .WhenStateIs("Cancel newspaper item added")
+                .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription"));
+
             System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
 
             System.Console.WriteLine("Press any key to stop the server");

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

@@ -1,5 +1,9 @@
 using System.IO;
 using log4net.Config;
+using WireMock.FluentAssertions;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
 
 namespace WireMock.Net.ConsoleApplication;
 
@@ -9,6 +13,25 @@ static class Program
     {
         XmlConfigurator.Configure(new FileInfo("log4net.config"));
 
-        MainApp.Run();
+        var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create()
+                .WithPath("todos")
+                .UsingGet()
+            )
+            .RespondWith(Response.Create()
+                .WithBody("test")
+            );
+
+        server
+            .Should()
+            .HaveReceivedACall()
+            .AtAbsoluteUrl("some-url").And
+            .WithHeader("header-name", "header-value");
+
+        server.Stop();
+
+        // MainApp.Run();
     }
 }

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

@@ -55,7 +55,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.16.0" newVersion="2.3.16.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="XPath2" publicKeyToken="463c6d7fb740c7e5" culture="neutral" />
@@ -67,7 +67,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Handlebars.Net.Helpers" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.16.0" newVersion="2.3.16.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
@@ -101,6 +101,10 @@
         <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.7.2.0" newVersion="10.7.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -46,32 +46,35 @@
     <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Fare.2.2.1\lib\net35\Fare.dll</HintPath>
     </Reference>
-    <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 Include="FluentAssertions, Version=5.10.3.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.5.10.3\lib\net47\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.12\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.16\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.12\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.16\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.16\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.16\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.16\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.12\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.16\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.12.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.12\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.16\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    </Reference>
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.16.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.16\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>
@@ -79,6 +82,9 @@
     <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
       <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
     </Reference>
+    <Reference Include="JsonConverter.Abstractions, Version=0.4.0.0, Culture=neutral, PublicKeyToken=7ba85365b500f2e2, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\JsonConverter.Abstractions.0.4.0\lib\net461\JsonConverter.Abstractions.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>
     </Reference>
@@ -253,20 +259,29 @@
     <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.OpenApi, Version=1.2.3.0, Culture=neutral, PublicKeyToken=3f5743946376f042, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.OpenApi.1.2.3\lib\net46\Microsoft.OpenApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.OpenApi.Readers, Version=1.2.3.0, Culture=neutral, PublicKeyToken=3f5743946376f042, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.OpenApi.Readers.1.2.3\lib\net46\Microsoft.OpenApi.Readers.dll</HintPath>
+    </Reference>
     <Reference Include="Namotion.Reflection, Version=2.0.10.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Namotion.Reflection.2.0.10\lib\net45\Namotion.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema, Version=10.6.10.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NJsonSchema.10.6.10\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=10.7.2.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NJsonSchema.10.7.2\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
     <Reference Include="NJsonSchema.Extensions, Version=0.1.0.0, Culture=neutral, PublicKeyToken=e52fadf300daf456, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NJsonSchema.Extensions.0.1.0\lib\net45\NJsonSchema.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Core, Version=13.15.10.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NSwag.Core.13.15.10\lib\net45\NSwag.Core.dll</HintPath>
+    <Reference Include="NSwag.Core, Version=13.16.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NSwag.Core.13.16.1\lib\net45\NSwag.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RamlToOpenApiConverter, Version=0.6.1.0, Culture=neutral, PublicKeyToken=f82a9044f86aaeda, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RamlToOpenApiConverter.0.6.1\lib\net46\RamlToOpenApiConverter.dll</HintPath>
     </Reference>
     <Reference Include="RandomDataGenerator, Version=1.0.16.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
       <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.17\lib\net45\RandomDataGenerator.dll</HintPath>
@@ -274,6 +289,9 @@
     <Reference Include="Scriban.Signed, Version=2.1.4.0, Culture=neutral, PublicKeyToken=5675fb69b15f2433, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Scriban.Signed.2.1.4\lib\net45\Scriban.Signed.dll</HintPath>
     </Reference>
+    <Reference Include="SharpYaml, Version=1.6.5.0, Culture=neutral, PublicKeyToken=1ced8108e942bc02, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpYaml.1.6.5\lib\net45\SharpYaml.dll</HintPath>
+    </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
@@ -302,8 +320,8 @@
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.23.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.23\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -352,12 +370,30 @@
     <Reference Include="TinyMapper, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll</HintPath>
     </Reference>
+    <Reference Include="WireMock.Net, Version=1.5.24.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.1.5.24\lib\net461\WireMock.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="WireMock.Net.Abstractions, Version=1.5.24.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.Abstractions.1.5.24\lib\net461\WireMock.Net.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="WireMock.Net.FluentAssertions, Version=1.5.24.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.FluentAssertions.1.5.24\lib\net451\WireMock.Net.FluentAssertions.dll</HintPath>
+    </Reference>
+    <Reference Include="WireMock.Net.OpenApiParser, Version=1.5.24.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.OpenApiParser.1.5.24\lib\net46\WireMock.Net.OpenApiParser.dll</HintPath>
+    </Reference>
+    <Reference Include="WireMock.Org.Abstractions, Version=1.5.24.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Org.Abstractions.1.5.24\lib\net45\WireMock.Org.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="XPath2, Version=1.1.3.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll</HintPath>
     </Reference>
     <Reference Include="XPath2.Extensions, Version=1.1.3.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XPath2.Extensions.1.1.3\lib\net452\XPath2.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\YamlDotNet.8.1.0\lib\net45\YamlDotNet.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs">
@@ -389,16 +425,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

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

@@ -2,15 +2,16 @@
 <packages>
   <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.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.12" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.12" targetFramework="net472" />
+  <package id="FluentAssertions" version="5.10.3" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.16" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.3.16" 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" />
@@ -62,6 +63,7 @@
   <package id="Humanizer.Core.zh-Hans" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.zh-Hant" version="2.14.1" targetFramework="net472" />
   <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
+  <package id="JsonConverter.Abstractions" version="0.4.0" targetFramework="net472" />
   <package id="log4net" version="2.0.15" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net472" />
   <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
@@ -122,14 +124,18 @@
   <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.12.2" targetFramework="net472" />
   <package id="Microsoft.IdentityModel.Tokens" version="6.25.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.OpenApi" version="1.2.3" targetFramework="net472" />
+  <package id="Microsoft.OpenApi.Readers" version="1.2.3" targetFramework="net472" />
   <package id="Namotion.Reflection" version="2.0.10" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="NJsonSchema" version="10.6.10" targetFramework="net472" />
+  <package id="NJsonSchema" version="10.7.2" targetFramework="net472" />
   <package id="NJsonSchema.Extensions" version="0.1.0" targetFramework="net472" />
-  <package id="NSwag.Core" version="13.15.10" targetFramework="net472" />
+  <package id="NSwag.Core" version="13.16.1" targetFramework="net472" />
   <package id="Nullable" version="1.3.1" targetFramework="net472" developmentDependency="true" />
+  <package id="RamlToOpenApiConverter" version="0.6.1" targetFramework="net472" />
   <package id="RandomDataGenerator.Net" version="1.0.17" targetFramework="net472" />
   <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
+  <package id="SharpYaml" version="1.6.5" targetFramework="net472" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
   <package id="Stef.Validation" version="0.1.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
@@ -138,7 +144,7 @@
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
   <package id="System.IdentityModel.Tokens.Jwt" version="6.25.0" targetFramework="net472" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
@@ -151,6 +157,12 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
+  <package id="WireMock.Net" version="1.5.24" targetFramework="net472" />
+  <package id="WireMock.Net.Abstractions" version="1.5.24" targetFramework="net472" />
+  <package id="WireMock.Net.FluentAssertions" version="1.5.24" targetFramework="net472" />
+  <package id="WireMock.Net.OpenApiParser" version="1.5.24" targetFramework="net472" />
+  <package id="WireMock.Org.Abstractions" version="1.5.24" targetFramework="net472" />
   <package id="XPath2" version="1.1.3" targetFramework="net472" />
   <package id="XPath2.Extensions" version="1.1.3" targetFramework="net472" />
+  <package id="YamlDotNet" version="8.1.0" targetFramework="net472" />
 </packages>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,71 +1,76 @@
-namespace WireMock.Admin.Settings;
-
-[FluentBuilder.AutoGenerateBuilder]
-public class ProxyAndRecordSettingsModel
-{
-    /// <summary>
-    /// The clientCertificate thumbprint or subject name fragment to use.
-    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-    /// </summary>
-    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
-    /// <summary>
-    /// Defines the WebProxySettings.
-    /// </summary>
-    public WebProxySettingsModel WebProxySettings { get; set; }
-
-    /// <summary>
-    /// Proxy requests should follow redirection (30x).
-    /// </summary>
-    public bool? AllowAutoRedirect { get; set; }
-
-    /// <summary>
-    /// The URL to proxy.
-    /// </summary>
-    public string Url { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response to the internal Mappings.
-    /// </summary>
-    public bool SaveMapping { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-    /// </summary>
-    public bool SaveMappingToFile { get; set; }
-
-    /// <summary>
-    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-    /// </summary>
-    public string SaveMappingForStatusCodePattern { get; set; } = "*";
-
-    /// <summary>
-    /// Defines a list from headers which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedHeaders { get; set; }
-
-    /// <summary>
-    /// Defines a list of cookies which will be excluded from the saved mappings.
-    /// </summary>
-    public string[] ExcludedCookies { get; set; }
-
-    /// <summary>
-    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-    /// </summary>
-    // public bool PreferProxyMapping { get; set; }
-
-    /// <summary>
-    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-    /// - <c>false</c>, the default matchers will be used.
-    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-    ///
-    /// Default value is false.
-    /// </summary>
-    public bool UseDefinedRequestMatchers { get; set; }
-
-    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
-    /// </summary>
-    public bool AppendGuidToSavedMappingFile { get; set; }
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
+{
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }
+
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }
+
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    public bool SaveMapping { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    public bool SaveMappingToFile { get; set; }
+
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }
+
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
+
+    /// <summary>
+    /// Defines the Replace Settings
+    /// </summary>
+    public ProxyUrlReplaceSettingsModel? ReplaceSettings { get; set; }
 }

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

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

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

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

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

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

@@ -1,38 +1,42 @@
-namespace WireMock.Types
+namespace WireMock.Types;
+
+/// <summary>
+/// The BodyType
+/// </summary>
+public enum BodyType
 {
     /// <summary>
-    /// The BodyType
+    /// No body present
     /// </summary>
-    public enum BodyType
-    {
-        /// <summary>
-        /// No body present
-        /// </summary>
-        None,
+    None,
 
-        /// <summary>
-        /// Body is a String
-        /// </summary>
-        String,
+    /// <summary>
+    /// Body is a String
+    /// </summary>
+    String,
 
-        /// <summary>
-        /// Body is a Json object
-        /// </summary>
-        Json,
+    /// <summary>
+    /// Body is a Json object
+    /// </summary>
+    Json,
 
-        /// <summary>
-        /// Body is a Byte array
-        /// </summary>
-        Bytes,
+    /// <summary>
+    /// Body is a Byte array
+    /// </summary>
+    Bytes,
 
-        /// <summary>
-        /// Body is a File
-        /// </summary>
-        File,
+    /// <summary>
+    /// Body is a File
+    /// </summary>
+    File,
 
-        /// <summary>
-        /// Body is a MultiPart
-        /// </summary>
-        MultiPart
-    }
+    /// <summary>
+    /// Body is a MultiPart
+    /// </summary>
+    MultiPart,
+
+    /// <summary>
+    /// Body is a String which is x-www-form-urlencoded.
+    /// </summary>
+    FormUrlEncoded
 }

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.OpenApiParser/Extensions/WireMockServerExtensions.cs

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

src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs

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

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

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

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

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

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

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

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

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

src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs

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

src/WireMock.Net.RestClient/IWireMockAdminApi.cs

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

src/WireMock.Net/Compatibility/StringExtensions.cs

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

src/WireMock.Net/Exceptions/WireMockException.cs

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

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

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

src/WireMock.Net/Http/HttpRequestMessageHelper.cs

@@ -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

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

src/WireMock.Net/Json/DynamicPropertyWithValue.cs

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

src/WireMock.Net/Json/JObjectExtensions.cs

@@ -60,7 +60,7 @@ internal static class JObjectExtensions
     {
         if (src == null)
         {
-            return new object?[0];
+            return EmptyArray<object?>.Value;
         }
 
         return ConvertJTokenArray(src, options);

src/WireMock.Net/Mapping.cs

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

src/WireMock.Net/MappingBuilder.cs

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

src/WireMock.Net/Matchers/ContentTypeMatcher.cs

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

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

src/WireMock.Net/Models/UrlDetails.cs

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

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

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

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

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

@@ -37,7 +37,19 @@ internal class ProxyHelper
         var requiredUri = new Uri(url);
 
         // Create HttpRequestMessage
-        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
+        var replaceSettings = proxyAndRecordSettings.ReplaceSettings;
+        string proxyUrl;
+        if (replaceSettings is not null)
+        {
+            var stringComparison = replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
+            proxyUrl = url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, stringComparison);
+        }
+        else
+        {
+            proxyUrl = url;
+        }
+
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, proxyUrl);
 
         // Call the URL
         var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
@@ -45,8 +57,16 @@ 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;
 
@@ -56,11 +76,11 @@ internal class ProxyHelper
         if (saveMappingSettings != null)
         {
             save &= Check(saveMappingSettings.StatusCodePattern,
-                () => HttpStatusRangeParser.IsMatch(saveMappingSettings.StatusCodePattern, responseMessage.StatusCode)
+                () => saveMappingSettings.StatusCodePattern != null && HttpStatusRangeParser.IsMatch(saveMappingSettings.StatusCodePattern, responseMessage.StatusCode)
             );
 
             save &= Check(saveMappingSettings.HttpMethods,
-                () => saveMappingSettings.HttpMethods.Value.Contains(requestMessage.Method, StringComparer.OrdinalIgnoreCase)
+                () => saveMappingSettings.HttpMethods != null && saveMappingSettings.HttpMethods.Value.Contains(requestMessage.Method, StringComparer.OrdinalIgnoreCase)
             );
         }
 

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

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

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

@@ -1,36 +1,57 @@
 // This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
+using System.Collections.Generic;
+using JsonConverter.Abstractions;
+using Newtonsoft.Json;
+using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.Util;
-using Stef.Validation;
 
 namespace WireMock.RequestBuilders;
 
 public partial class Request
 {
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
+    /// <inheritdoc />
     public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
         _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
+    /// <inheritdoc />
     public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
         _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
+    /// <inheritdoc />
     public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
         _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
         return this;
     }
 
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        var bodyAsJsonString = JsonConvert.SerializeObject(body);
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        Guard.NotNull(converter);
+
+        var bodyAsJsonString = converter.Serialize(body, options);
+        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
+        return this;
+    }
+
     /// <inheritdoc />
     public IRequestBuilder WithBody(IMatcher matcher)
     {
@@ -46,39 +67,46 @@ public partial class Request
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{string, bool})"/>
-    public IRequestBuilder WithBody(Func<string, bool> func)
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(Func<string?, bool> func)
     {
-        Guard.NotNull(func, nameof(func));
+        Guard.NotNull(func);
 
         _requestMatchers.Add(new RequestMessageBodyMatcher(func));
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{byte[], bool})"/>
-    public IRequestBuilder WithBody(Func<byte[], bool> func)
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(Func<byte[]?, bool> func)
     {
-        Guard.NotNull(func, nameof(func));
+        Guard.NotNull(func);
 
         _requestMatchers.Add(new RequestMessageBodyMatcher(func));
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{object, bool})"/>
-    public IRequestBuilder WithBody(Func<object, bool> func)
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(Func<object?, bool> func)
     {
-        Guard.NotNull(func, nameof(func));
+        Guard.NotNull(func);
 
         _requestMatchers.Add(new RequestMessageBodyMatcher(func));
         return this;
     }
 
-    /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{IBodyData, bool})"/>
-    public IRequestBuilder WithBody(Func<IBodyData, bool> func)
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(Func<IBodyData?, bool> func)
     {
-        Guard.NotNull(func, nameof(func));
+        Guard.NotNull(func);
 
         _requestMatchers.Add(new RequestMessageBodyMatcher(func));
         return this;
     }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBody(Func<IDictionary<string, string>?, bool> func)
+    {
+        _requestMatchers.Add(new RequestMessageBodyMatcher(Guard.NotNull(func)));
+        return this;
+    }
 }

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

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

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

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

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

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

src/WireMock.Net/RequestBuilders/Request.cs

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

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

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

src/WireMock.Net/ResponseBuilders/IProxyResponseBuilder.cs

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

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -44,6 +44,7 @@ internal class LogEntryMapper
             switch (logEntry.RequestMessage.BodyData.DetectedBodyType)
             {
                 case BodyType.String:
+                case BodyType.FormUrlEncoded:
                     logRequestModel.Body = logEntry.RequestMessage.BodyData.BodyAsString;
                     break;
 
@@ -120,6 +121,7 @@ internal class LogEntryMapper
         switch (logEntry.ResponseMessage.BodyData!.DetectedBodyType)
         {
             case BodyType.String:
+            case BodyType.FormUrlEncoded:
                 if (!string.IsNullOrEmpty(logEntry.ResponseMessage.BodyData.IsFuncUsed) && _options.DoNotSaveDynamicResponseInLogEntry == true)
                 {
                     logResponseModel.Body = logEntry.ResponseMessage.BodyData.IsFuncUsed;
@@ -142,6 +144,9 @@ internal class LogEntryMapper
                 logResponseModel.BodyAsFile = logEntry.ResponseMessage.BodyData.BodyAsFile;
                 logResponseModel.BodyAsFileIsCached = logEntry.ResponseMessage.BodyData.BodyAsFileIsCached;
                 break;
+
+            default:
+                break;
         }
     }
 

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading;
+using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Constants;
@@ -14,7 +16,9 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
+using WireMock.Util;
 
+using static WireMock.Util.CSharpFormatter;
 namespace WireMock.Serialization;
 
 internal class MappingConverter
@@ -33,7 +37,7 @@ internal class MappingConverter
         settings ??= new MappingConverterSettings();
 
         var request = (Request)mapping.RequestMatcher;
-        var response = (Response) mapping.Provider;
+        var response = (Response)mapping.Provider;
 
         var clientIPMatcher = request.GetRequestMessageMatcher<RequestMessageClientIPMatcher>();
         var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
@@ -115,23 +119,50 @@ internal class MappingConverter
         // Guid
         sb.AppendLine($"    .WithGuid(\"{mapping.Guid}\")");
 
+        if (mapping.Probability != null)
+        {
+            sb.AppendLine($"    .WithProbability({mapping.Probability.Value.ToString(CultureInfoUtils.CultureInfoEnUS)})");
+        }
+
         // Response
         sb.AppendLine("    .RespondWith(Response.Create()");
 
+        if (response.ResponseMessage.StatusCode is int or string)
+        {
+            sb.AppendLine($"        .WithStatusCode({JsonConvert.SerializeObject(response.ResponseMessage.StatusCode)})");
+        }
+        else if (response.ResponseMessage.StatusCode is HttpStatusCode httpStatusCode)
+        {
+            sb.AppendLine($"        .WithStatusCode({(int)httpStatusCode})");
+        }
+
         if (response.ResponseMessage.Headers is { })
         {
             foreach (var header in response.ResponseMessage.Headers)
             {
-                sb.AppendLine($"        .WithHeader(\"{header.Key})\", {ToValueArguments(header.Value.ToArray())})");
+                sb.AppendLine($"        .WithHeader(\"{header.Key}\", {ToValueArguments(header.Value.ToArray())})");
             }
         }
 
-        if (response.ResponseMessage.BodyData is { })
+        if (response.ResponseMessage.BodyData is { } bodyData)
         {
             switch (response.ResponseMessage.BodyData.DetectedBodyType)
             {
                 case BodyType.String:
-                    sb.AppendLine($"        .WithBody(\"{response.ResponseMessage.BodyData.BodyAsString}\")");
+                case BodyType.FormUrlEncoded:
+                    sb.AppendLine($"        .WithBody({ToCSharpStringLiteral(bodyData.BodyAsString)})");
+                    break;
+                case BodyType.Json:
+                    if (bodyData.BodyAsJson is string bodyStringValue)
+                    {
+                        sb.AppendLine($"        .WithBody({ToCSharpStringLiteral(bodyStringValue)})");
+                    }
+                    else if(bodyData.BodyAsJson is {} jsonBody)
+                    {
+                        var anonymousObjectDefinition = ConvertToAnonymousObjectDefinition(jsonBody);
+                        sb.AppendLine($"        .WithBodyAsJson({anonymousObjectDefinition})");
+                    }
+
                     break;
             }
         }
@@ -140,7 +171,7 @@ internal class MappingConverter
         {
             sb.AppendLine($"        .WithDelay({response.Delay.Value.TotalMilliseconds})");
         }
-        else if (response.MinimumDelayMilliseconds > 0 && response.MaximumDelayMilliseconds > 0)
+        else if (response is { MinimumDelayMilliseconds: > 0, MaximumDelayMilliseconds: > 0 })
         {
             sb.AppendLine($"        .WithRandomDelay({response.MinimumDelayMilliseconds}, {response.MaximumDelayMilliseconds})");
         }
@@ -182,6 +213,7 @@ internal class MappingConverter
             WhenStateIs = mapping.ExecutionConditionState,
             SetStateTo = mapping.NextState,
             Data = mapping.Data,
+            Probability = mapping.Probability,
             Request = new RequestModel
             {
                 Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
@@ -325,6 +357,7 @@ internal class MappingConverter
                 switch (response.ResponseMessage.BodyData?.DetectedBodyType)
                 {
                     case BodyType.String:
+                    case BodyType.FormUrlEncoded:
                         mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
                         break;
 
@@ -372,7 +405,7 @@ internal class MappingConverter
 
     private static string GetString(IStringMatcher stringMatcher)
     {
-        return stringMatcher.GetPatterns().Select(p => $"\"{p.GetPattern()}\"").First();
+        return stringMatcher.GetPatterns().Select(p => ToCSharpStringLiteral(p.GetPattern())).First();
     }
 
     private static string[] GetStringArray(IReadOnlyList<IStringMatcher> stringMatchers)
@@ -425,7 +458,7 @@ internal class MappingConverter
 
     private static string ToValueArguments(string[]? values, string defaultValue = "")
     {
-        return values is { } ? string.Join(", ", values.Select(v => $"\"{v}\"")) : $"\"{defaultValue}\"";
+        return values is { } ? string.Join(", ", values.Select(ToCSharpStringLiteral)) : ToCSharpStringLiteral(defaultValue);
     }
 
     private static WebProxyModel? MapWebProxy(WebProxySettings? settings)
@@ -456,4 +489,6 @@ internal class MappingConverter
 
         return newDictionary;
     }
+
+
 }

src/WireMock.Net/Serialization/ProxyMappingConverter.cs

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

src/WireMock.Net/Serialization/SwaggerMapper.cs

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

src/WireMock.Net/Serialization/WebhookMapper.cs

@@ -97,6 +97,7 @@ internal static class WebhookMapper
             switch (webhook.Request.BodyData.DetectedBodyType)
             {
                 case BodyType.String:
+                case BodyType.FormUrlEncoded:
                     model.Request.Body = webhook.Request.BodyData.BodyAsString;
                     break;
 

src/WireMock.Net/Server/IRespondWithAProvider.cs

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

src/WireMock.Net/Server/RespondWithAProvider.cs

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

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

@@ -37,6 +37,8 @@ public partial class WireMockServer
     private const string AdminRequests = "/__admin/requests";
     private const string AdminSettings = "/__admin/settings";
     private const string AdminScenarios = "/__admin/scenarios";
+    private const string AdminOpenApi = "/__admin/openapi";
+
     private const string QueryParamReloadStaticMappings = "reloadStaticMappings";
 
     private static readonly Guid ProxyMappingGuid = new("e59914fd-782e-428e-91c1-4810ffb86567");
@@ -113,6 +115,10 @@ public partial class WireMockServer
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingGet()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileGet));
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingHead()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileHead));
         Given(Request.Create().WithPath(_adminFilesFilenamePathMatcher).UsingDelete()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FileDelete));
+
+        // __admin/openapi
+        Given(Request.Create().WithPath($"{AdminOpenApi}/convert").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiConvertToMappings));
+        Given(Request.Create().WithPath($"{AdminOpenApi}/save").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiSaveToMappings));
     }
     #endregion
 
@@ -217,10 +223,17 @@ public partial class WireMockServer
         var model = new SettingsModel
         {
             AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods,
+            AllowOnlyDefinedHttpStatusCodeInResponse = _settings.AllowOnlyDefinedHttpStatusCodeInResponse,
             AllowPartialMapping = _settings.AllowPartialMapping,
+            DisableDeserializeFormUrlEncoded = _settings.DisableDeserializeFormUrlEncoded,
+            DisableJsonBodyParsing = _settings.DisableJsonBodyParsing,
+            DisableRequestBodyDecompressing = _settings.DisableRequestBodyDecompressing,
+            DoNotSaveDynamicResponseInLogEntry = _settings.DoNotSaveDynamicResponseInLogEntry,
             GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds,
             HandleRequestsSynchronously = _settings.HandleRequestsSynchronously,
+            HostingScheme = _settings.HostingScheme,
             MaxRequestLogCount = _settings.MaxRequestLogCount,
+            QueryParameterMultipleValueSupport = _settings.QueryParameterMultipleValueSupport,
             ReadStaticMappings = _settings.ReadStaticMappings,
             RequestLogExpirationDuration = _settings.RequestLogExpirationDuration,
             SaveUnmatchedRequests = _settings.SaveUnmatchedRequests,
@@ -228,14 +241,11 @@ public partial class WireMockServer
             UseRegexExtended = _settings.UseRegexExtended,
             WatchStaticMappings = _settings.WatchStaticMappings,
             WatchStaticMappingsInSubdirectories = _settings.WatchStaticMappingsInSubdirectories,
-            HostingScheme = _settings.HostingScheme,
-            DoNotSaveDynamicResponseInLogEntry = _settings.DoNotSaveDynamicResponseInLogEntry,
-            QueryParameterMultipleValueSupport = _settings.QueryParameterMultipleValueSupport,
 
 #if USE_ASPNETCORE
-            CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString(),
+            AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate,
             ClientCertificateMode = _settings.ClientCertificateMode,
-            AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate
+            CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString()
 #endif
         };
 
@@ -250,10 +260,16 @@ public partial class WireMockServer
 
         // _settings
         _settings.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods;
+        _settings.AllowOnlyDefinedHttpStatusCodeInResponse = settings.AllowOnlyDefinedHttpStatusCodeInResponse;
         _settings.AllowPartialMapping = settings.AllowPartialMapping;
+        _settings.DisableDeserializeFormUrlEncoded = settings.DisableDeserializeFormUrlEncoded;
+        _settings.DisableJsonBodyParsing = settings.DisableJsonBodyParsing;
+        _settings.DisableRequestBodyDecompressing = settings.DisableRequestBodyDecompressing;
+        _settings.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
         _settings.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
         _settings.MaxRequestLogCount = settings.MaxRequestLogCount;
         _settings.ProxyAndRecordSettings = TinyMapperUtils.Instance.Map(settings.ProxyAndRecordSettings);
+        _settings.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
         _settings.ReadStaticMappings = settings.ReadStaticMappings;
         _settings.RequestLogExpirationDuration = settings.RequestLogExpirationDuration;
         _settings.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
@@ -261,8 +277,6 @@ public partial class WireMockServer
         _settings.UseRegexExtended = settings.UseRegexExtended;
         _settings.WatchStaticMappings = settings.WatchStaticMappings;
         _settings.WatchStaticMappingsInSubdirectories = settings.WatchStaticMappingsInSubdirectories;
-        _settings.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
-        _settings.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
 
         InitSettings(_settings);
 
@@ -729,7 +743,7 @@ public partial class WireMockServer
         return encodingModel != null ? Encoding.GetEncoding(encodingModel.CodePage) : null;
     }
 
-    private static ResponseMessage ToJson<T>(T result, bool keepNullValues = false)
+    private static ResponseMessage ToJson<T>(T result, bool keepNullValues = false, object? statusCode = null)
     {
         return new ResponseMessage
         {
@@ -738,7 +752,7 @@ public partial class WireMockServer
                 DetectedBodyType = BodyType.String,
                 BodyAsString = JsonConvert.SerializeObject(result, keepNullValues ? JsonSerializationConstants.JsonSerializerSettingsIncludeNullValues : JsonSerializationConstants.JsonSerializerSettingsDefault)
             },
-            StatusCode = (int)HttpStatusCode.OK,
+            StatusCode = statusCode ?? (int)HttpStatusCode.OK,
             Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>(WireMockConstants.ContentTypeJson) } }
         };
     }
@@ -759,14 +773,18 @@ public partial class WireMockServer
 
     private static T DeserializeObject<T>(IRequestMessage requestMessage) where T : new()
     {
-        return requestMessage.BodyData?.DetectedBodyType switch
+        switch (requestMessage.BodyData?.DetectedBodyType)
         {
-            BodyType.String => JsonUtils.DeserializeObject<T>(requestMessage.BodyData.BodyAsString!),
+            case BodyType.String:
+            case BodyType.FormUrlEncoded:
+                return JsonUtils.DeserializeObject<T>(requestMessage.BodyData.BodyAsString!);
 
-            BodyType.Json when requestMessage.BodyData?.BodyAsJson != null => ((JObject)requestMessage.BodyData.BodyAsJson).ToObject<T>()!,
+            case BodyType.Json when requestMessage.BodyData?.BodyAsJson != null:
+                return ((JObject)requestMessage.BodyData.BodyAsJson).ToObject<T>()!;
 
-            _ => throw new NotSupportedException()
-        };
+            default:
+                throw new NotSupportedException();
+        }
     }
 
     private static T[] DeserializeRequestMessageToArray<T>(IRequestMessage requestMessage)

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

@@ -65,7 +65,7 @@ namespace WireMock.Server
                 }
             };
 
-            if (BytesEncodingUtils.TryGetEncoding(bytes, out Encoding encoding) && FileBodyIsString.Select(x => x.Equals(encoding)).Any())
+            if (BytesEncodingUtils.TryGetEncoding(bytes, out var encoding) && FileBodyIsString.Select(x => x.Equals(encoding)).Any())
             {
                 response.BodyData.DetectedBodyType = BodyType.String;
                 response.BodyData.BodyAsString = encoding.GetString(bytes);

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

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

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

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

src/WireMock.Net/Server/WireMockServer.cs

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

src/WireMock.Net/Services/IRandomizerDoubleBetween0And1.cs

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

src/WireMock.Net/Services/RandomizerDoubleBetween0And1.cs

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

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,85 +1,97 @@
-using JetBrains.Annotations;
-
-namespace WireMock.Settings;
-
-/// <summary>
-/// ProxyAndRecordSettings
-/// </summary>
-public class ProxyAndRecordSettings : HttpClientSettings
-{
-    /// <summary>
-    /// The URL to proxy.
-    /// </summary>
-    [PublicAPI]
-    public string Url { get; set; } = null!;
-
-    /// <summary>
-    /// Save the mapping for each request/response to the internal Mappings.
-    /// </summary>
-    [PublicAPI]
-    public bool SaveMapping { get; set; }
-
-    /// <summary>
-    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-    /// </summary>
-    [PublicAPI]
-    public bool SaveMappingToFile { get; set; }
-
-    /// <summary>
-    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-    ///
-    /// Deprecated : use SaveMappingSettings.
-    /// </summary>
-    [PublicAPI]
-    public string SaveMappingForStatusCodePattern
-    {
-        set
-        {
-            if (SaveMappingSettings is null)
-            {
-                SaveMappingSettings = new ProxySaveMappingSettings();
-            }
-
-            SaveMappingSettings.StatusCodePattern = value;
-        }
-    }
-
-    /// <summary>
-    /// Additional SaveMappingSettings.
-    /// </summary>
-    [PublicAPI]
-    public ProxySaveMappingSettings? SaveMappingSettings { get; set; }
-
-    /// <summary>
-    /// Defines a list from headers which will be excluded from the saved mappings.
-    /// </summary>
-    [PublicAPI]
-    public string[]? ExcludedHeaders { get; set; }
-
-    /// <summary>
-    /// Defines a list of cookies which will be excluded from the saved mappings.
-    /// </summary>
-    [PublicAPI]
-    public string[]? ExcludedCookies { get; set; }
-
-    /// <summary>
-    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-    /// </summary>
-    //[PublicAPI]
-    //public bool PreferProxyMapping { get; set; }
-
-    /// <summary>
-    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-    /// - <c>false</c>, the default matchers will be used.
-    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-    ///
-    /// Default value is false.
-    /// </summary>
-    public bool UseDefinedRequestMatchers { get; set; }
-
-    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
-    /// </summary>
-    public bool AppendGuidToSavedMappingFile { get; set; }
+using JetBrains.Annotations;
+
+namespace WireMock.Settings;
+
+/// <summary>
+/// ProxyAndRecordSettings
+/// </summary>
+public class ProxyAndRecordSettings : HttpClientSettings
+{
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    [PublicAPI]
+    public string Url { get; set; } = null!;
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    [PublicAPI]
+    public bool SaveMapping { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    [PublicAPI]
+    public bool SaveMappingToFile { get; set; }
+
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    ///
+    /// Deprecated : use SaveMappingSettings.
+    /// </summary>
+    [PublicAPI]
+    public string SaveMappingForStatusCodePattern
+    {
+        set
+        {
+            if (SaveMappingSettings is null)
+            {
+                SaveMappingSettings = new ProxySaveMappingSettings();
+            }
+
+            SaveMappingSettings.StatusCodePattern = value;
+        }
+    }
+
+    /// <summary>
+    /// Additional SaveMappingSettings.
+    /// </summary>
+    [PublicAPI]
+    public ProxySaveMappingSettings? SaveMappingSettings { get; set; }
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of params which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedParams { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    [PublicAPI]
+    public string[]? ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Replace Settings
+    /// </summary>
+    [PublicAPI]
+    public ProxyUrlReplaceSettings? ReplaceSettings { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    //[PublicAPI]
+    //public bool PreferProxyMapping { get; set; }
+
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
 }

src/WireMock.Net/Settings/ProxySaveMappingSetting.cs

@@ -6,7 +6,7 @@ public class ProxySaveMappingSetting<T>
 {
     public MatchBehaviour MatchBehaviour { get; } = MatchBehaviour.AcceptOnMatch;
 
-    public T Value { get; private set; }
+    public T Value { get; }
 
     public ProxySaveMappingSetting(T value, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
@@ -14,7 +14,7 @@ public class ProxySaveMappingSetting<T>
         MatchBehaviour = matchBehaviour;
     }
 
-    public static implicit operator ProxySaveMappingSetting<T>(T value) => new ProxySaveMappingSetting<T>(value);
+    public static implicit operator ProxySaveMappingSetting<T>(T value) => new(value);
 
     public static implicit operator T(ProxySaveMappingSetting<T> @this) => @this.Value;
 }

src/WireMock.Net/Settings/ProxyUrlReplaceSettings.cs

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

src/WireMock.Net/Settings/SimpleCommandLineParser.cs

@@ -32,7 +32,7 @@ internal class SimpleCommandLineParser
             }
             else if (string.IsNullOrEmpty(currentName))
             {
-                Arguments[arg] = new string[0];
+                Arguments[arg] = EmptyArray<string>.Value;
             }
             else
             {

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -182,13 +182,13 @@ public class WireMockServerSettings
     public bool? AllowCSharpCodeMatcher { 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>
     [PublicAPI]
     public bool? AllowBodyForAllHttpMethods { get; set; }
 
     /// <summary>
-    /// Allow only a HttpStatus Code in the response which is defined. (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>
@@ -196,25 +196,31 @@ public class WireMockServerSettings
     public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
 
     /// <summary>
-    /// Set to true to disable Json deserialization when processing requests. (default set to false).
+    /// Set to true to disable Json deserialization when processing requests. (default set to <c>false</c>).
     /// </summary>
     [PublicAPI]
     public bool? DisableJsonBodyParsing { get; set; }
 
     /// <summary>
-    /// Disable support for GZip and Deflate request body decompression. (default set to false).
+    /// Disable support for GZip and Deflate request body decompression. (default set to <c>false</c>).
     /// </summary>
     [PublicAPI]
     public bool? DisableRequestBodyDecompressing { get; set; }
 
     /// <summary>
-    /// Handle all requests synchronously. (default set to false).
+    /// Set to true to disable FormUrlEncoded deserializing when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    [PublicAPI]
+    public bool? DisableDeserializeFormUrlEncoded { get; set; }
+
+    /// <summary>
+    /// Handle all requests synchronously. (default set to <c>false</c>).
     /// </summary>
     [PublicAPI]
     public bool? HandleRequestsSynchronously { get; set; }
 
     /// <summary>
-    /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
+    /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to <c>false</c>).
     /// </summary>
     [PublicAPI]
     public bool? ThrowExceptionWhenMatcherFails { get; set; }
@@ -255,19 +261,19 @@ public class WireMockServerSettings
     public WebhookSettings? WebhookSettings { get; set; }
 
     /// <summary>
-    /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
+    /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to <c>true</c>).
     /// </summary>
     [PublicAPI]
     public bool? UseRegexExtended { get; set; } = true;
 
     /// <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>
     [PublicAPI]
     public bool? SaveUnmatchedRequests { 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>
     [PublicAPI]
     public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

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

src/WireMock.Net/Transformers/Transformer.cs

@@ -85,7 +85,7 @@ internal class Transformer : ITransformer
         {
             responseMessage.BodyData = TransformBodyData(transformerContext, options, model, original.BodyData, useTransformerForBodyAsFile);
 
-            if (original.BodyData.DetectedBodyType == BodyType.String)
+            if (original.BodyData.DetectedBodyType is BodyType.String or BodyType.FormUrlEncoded)
             {
                 responseMessage.BodyOriginal = original.BodyData.BodyAsString;
             }
@@ -123,13 +123,21 @@ internal class Transformer : ITransformer
 
     private IBodyData? TransformBodyData(ITransformerContext transformerContext, ReplaceNodeOptions options, TransformModel model, IBodyData original, bool useTransformerForBodyAsFile)
     {
-        return original.DetectedBodyType switch
+        switch (original.DetectedBodyType)
         {
-            BodyType.Json => TransformBodyAsJson(transformerContext, options, model, original),
-            BodyType.File => TransformBodyAsFile(transformerContext, model, original, useTransformerForBodyAsFile),
-            BodyType.String => TransformBodyAsString(transformerContext, model, original),
-            _ => null
-        };
+            case BodyType.Json:
+                return TransformBodyAsJson(transformerContext, options, model, original);
+
+            case BodyType.File:
+                return TransformBodyAsFile(transformerContext, model, original, useTransformerForBodyAsFile);
+
+            case BodyType.String:
+            case BodyType.FormUrlEncoded:
+                return TransformBodyAsString(transformerContext, model, original);
+
+            default:
+                return null;
+        }
     }
 
     private static IDictionary<string, WireMockList<string>> TransformHeaders(ITransformerContext transformerContext, TransformModel model, IDictionary<string, WireMockList<string>>? original)

src/WireMock.Net/Util/BodyParser.cs

@@ -49,12 +49,14 @@ internal static class BodyParser
         new WildcardMatcher("application/vnd.*+json", true)
     };
 
+    private static readonly IStringMatcher FormUrlEncodedMatcher = new WildcardMatcher("application/x-www-form-urlencoded", true);
+
     private static readonly IStringMatcher[] TextContentTypeMatchers =
     {
         new WildcardMatcher("text/*", true),
         new RegexMatcher("^application\\/(java|type)script$", true),
         new WildcardMatcher("application/*xml", true),
-        new WildcardMatcher("application/x-www-form-urlencoded", true)
+        FormUrlEncodedMatcher
     };
 
     public static bool ShouldParseBody(string? httpMethod, bool allowBodyForAllHttpMethods)
@@ -69,7 +71,7 @@ internal static class BodyParser
             return true;
         }
 
-        if (BodyAllowedForMethods.TryGetValue(httpMethod!.ToUpper(), out bool allowed))
+        if (BodyAllowedForMethods.TryGetValue(httpMethod!.ToUpper(), out var allowed))
         {
             return allowed;
         }
@@ -88,6 +90,11 @@ internal static class BodyParser
             return BodyType.Bytes;
         }
 
+        if (MatchScores.IsPerfect(FormUrlEncodedMatcher.IsMatch(contentType.MediaType)))
+        {
+            return BodyType.FormUrlEncoded;
+        }
+
         if (TextContentTypeMatchers.Any(matcher => MatchScores.IsPerfect(matcher.IsMatch(contentType.MediaType))))
         {
             return BodyType.String;
@@ -133,13 +140,30 @@ internal static class BodyParser
             return data;
         }
 
-        // Try to get the body as String or Json
+        // Try to get the body as String, FormUrlEncoded or Json
         try
         {
             data.BodyAsString = DefaultEncoding.GetString(data.BodyAsBytes);
             data.Encoding = DefaultEncoding;
             data.DetectedBodyType = BodyType.String;
 
+            // If string is not null or empty, try to deserialize the string to a IDictionary<string, string>
+            if (settings.DeserializeFormUrlEncoded &&
+                data.DetectedBodyTypeFromContentType == BodyType.FormUrlEncoded &&
+                QueryStringParser.TryParse(data.BodyAsString, false, out var nameValueCollection)
+            )
+            {
+                try
+                {
+                    data.BodyAsFormUrlEncoded = nameValueCollection;
+                    data.DetectedBodyType = BodyType.FormUrlEncoded;
+                }
+                catch
+                {
+                    // Deserialize FormUrlEncoded failed, just ignore.
+                }
+            }
+
             // If string is not null or empty, try to deserialize the string to a JObject
             if (settings.DeserializeJson && !string.IsNullOrEmpty(data.BodyAsString))
             {

src/WireMock.Net/Util/BodyParserSettings.cs

@@ -13,4 +13,6 @@ internal class BodyParserSettings
     public bool DecompressGZipAndDeflate { get; set; } = true;
 
     public bool DeserializeJson { get; set; } = true;
+
+    public bool DeserializeFormUrlEncoded { get; set; } = true;
 }

src/WireMock.Net/Util/BytesEncodingUtils.cs

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

src/WireMock.Net/Util/CSharpFormatter.cs

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

src/WireMock.Net/Util/ConcurrentObservableCollection.cs

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

src/WireMock.Net/Util/CultureInfoExtensions.cs

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

src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs

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

src/WireMock.Net/Util/HttpStatusRangeParser.cs

@@ -16,18 +16,14 @@ internal static class HttpStatusRangeParser
     /// <param name="pattern">The pattern. (Can be null, in that case it's allowed.)</param>
     /// <param name="httpStatusCode">The value.</param>
     /// <exception cref="ArgumentException"><paramref name="pattern"/> is invalid.</exception>
-    public static bool IsMatch(string pattern, object? httpStatusCode)
+    public static bool IsMatch(string? pattern, object? httpStatusCode)
     {
-        switch (httpStatusCode)
+        return httpStatusCode switch
         {
-            case int statusCodeAsInteger:
-                return IsMatch(pattern, statusCodeAsInteger);
-
-            case string statusCodeAsString:
-                return IsMatch(pattern, int.Parse(statusCodeAsString));
-        }
-
-        return false;
+            int statusCodeAsInteger => IsMatch(pattern, statusCodeAsInteger),
+            string statusCodeAsString => IsMatch(pattern, int.Parse(statusCodeAsString)),
+            _ => false
+        };
     }
 
     /// <summary>

src/WireMock.Net/Util/PortUtils.cs

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

src/WireMock.Net/Util/QueryStringParser.cs

@@ -1,7 +1,8 @@
 using System;
-using System.Net;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Net;
 using WireMock.Types;
 
 namespace WireMock.Util;
@@ -13,6 +14,31 @@ internal static class QueryStringParser
 {
     private static readonly Dictionary<string, WireMockList<string>> Empty = new();
 
+    public static bool TryParse(string? queryString, bool caseIgnore, [NotNullWhen(true)] out IDictionary<string, string>? nameValueCollection)
+    {
+        if (queryString is null)
+        {
+            nameValueCollection = default;
+            return false;
+        }
+
+        var parts = queryString!
+            .Split(new[] { "&" }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(parameter => parameter.Split('='))
+            .Distinct();
+
+        nameValueCollection = caseIgnore ? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) : new Dictionary<string, string>();
+        foreach (var part in parts)
+        {
+            if (part.Length == 2)
+            {
+                nameValueCollection.Add(part[0], WebUtility.UrlDecode(part[1]));
+            }
+        }
+
+        return true;
+    }
+
     public static IDictionary<string, WireMockList<string>> Parse(string? queryString, QueryParameterMultipleValueSupport? support = null)
     {
         if (string.IsNullOrEmpty(queryString))