1.0.4.9

* jsonpath in response

* Fix tests

* Support also BodyAsJson

* Fix Sonar Issue

* Add example (zubinix2)

* Fix batch file

* Solve CodeFactor issues

* netcoreapp2.0;netcoreapp2.1

* 1.0.4.8

CHANGELOG.md

@@ -1,3 +1,163 @@
+# 1.0.4.9 (08 August 2018)
+
+ - [#177](https://github.com/WireMock-Net/WireMock.Net/issues/177) - Feature: Skip invalid static mapping files +feature
+ - [#176](https://github.com/WireMock-Net/WireMock.Net/issues/176) - Question: Saving mapping with relative (not found) file fails
+ - [#175](https://github.com/WireMock-Net/WireMock.Net/issues/175) - Bug: Don't allow adding a mapping with no URL or PATH +fix
+ - [#174](https://github.com/WireMock-Net/WireMock.Net/issues/174) - Bug: JsonMatcher and JsonPathMatcher throws when posting byte[] +fix
+ - [#172](https://github.com/WireMock-Net/WireMock.Net/issues/172) - Question: Same/similar fluent interface for in process and admin client API
+
+Commits: 8cb15b2311...d9fde9329a
+
+
+# 1.0.4.8 (23 July 2018)
+
+ - [#170](https://github.com/WireMock-Net/WireMock.Net/pull/170) - Support json path in the response contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#167](https://github.com/WireMock-Net/WireMock.Net/issues/167) - Feature: Support for JsonPath in the response (with HandleBars) +feature
+
+Commits: 1f226f7361...1f226f7361
+
+
+# 1.0.4.7 (19 July 2018)
+
+ - [#169](https://github.com/WireMock-Net/WireMock.Net/pull/169) - Fix for Restricted Response headers contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +fix
+ - [#148](https://github.com/WireMock-Net/WireMock.Net/issues/148) - Question: proxy passthrough when no match?
+
+Commits: b2bf63b013...b2bf63b013
+
+
+# 1.0.4.6 (18 July 2018)
+
+ - [#168](https://github.com/WireMock-Net/WireMock.Net/pull/168) - Expose scenario states contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#163](https://github.com/WireMock-Net/WireMock.Net/issues/163) - Feature: Expose scenario states
+
+Commits: 6b0924029f...8f34291ea9
+
+
+# 1.0.4.5 (17 July 2018)
+
+ - [#166](https://github.com/WireMock-Net/WireMock.Net/pull/166) - Fix Sonar issues contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#165](https://github.com/WireMock-Net/WireMock.Net/pull/165) - Add SonarCloud contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#164](https://github.com/WireMock-Net/WireMock.Net/pull/164) - Support running WireMock.Net as a sub-app in IIS contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#158](https://github.com/WireMock-Net/WireMock.Net/issues/158) - Feature: Support running WireMock.Net as a sub-app in IIS
+ - [#123](https://github.com/WireMock-Net/WireMock.Net/issues/123) - Fix for DateTime Header causing null value in ResponseBuilder
+ - [#120](https://github.com/WireMock-Net/WireMock.Net/issues/120) - Question: JsonPathMatcher - not matching? Correct syntax?
+ - [#105](https://github.com/WireMock-Net/WireMock.Net/issues/105) - Question: URL binding issues
+
+Commits: 3125c1bead...a9c0c6b670
+
+
+# 1.0.4.4 (01 July 2018)
+
+ - [#156](https://github.com/WireMock-Net/WireMock.Net/issues/156) - Feature: when adding / updating a mapping : return more details
+
+Commits: ...
+
+
+# 1.0.4.3 (30 June 2018)
+
+ - [#159](https://github.com/WireMock-Net/WireMock.Net/issues/159) - Bug: IRequestBuilder.WithParam broken for key-only matching +fix
+ - [#156](https://github.com/WireMock-Net/WireMock.Net/issues/156) - Feature: when adding / updating a mapping : return more details
+
+Commits: 2d1ead25cd...db013a56ad
+
+
+# 1.0.4.2 (26 June 2018)
+
+ - [#157](https://github.com/WireMock-Net/WireMock.Net/pull/157) - Support for string and object in JsonMatcher. contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#155](https://github.com/WireMock-Net/WireMock.Net/pull/155) - Replace JsonMatcher with JsonObjectMatcher and directly support JSON body matching. contributed by ([DavidKorn](https://github.com/DavidKorn))
+ - [#154](https://github.com/WireMock-Net/WireMock.Net/issues/154) - Feature: support BodyAsJson for Request in static mapping files. +feature
+
+Commits: 9470130d65...4283732b6c
+
+
+# 1.0.4.1 (25 June 2018)
+
+ - [#153](https://github.com/WireMock-Net/WireMock.Net/issues/153) - Feature: Add JsonMatcher to support Json mapping
+
+Commits: f61a814ab5...2eff243a96
+
+
+# 1.0.4.0 (23 June 2018)
+
+ - [#151](https://github.com/WireMock-Net/WireMock.Net/issues/151) - Feature: Add logging of incoming request and body for tracability
+ - [#149](https://github.com/WireMock-Net/WireMock.Net/issues/149) - Question: Transformer and Delay in Static Mappings?
+ - [#131](https://github.com/WireMock-Net/WireMock.Net/issues/131) - Bug: CurlException Couldn't connect to Server when running multiple tests
+
+Commits: 443fc76773...443fc76773
+
+
+# 1.0.3.20 (29 May 2018)
+
+ - [#147](https://github.com/WireMock-Net/WireMock.Net/pull/147) - Revert PortUtil.cs changes contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#146](https://github.com/WireMock-Net/WireMock.Net/issues/146) - Hang possibly due to Windows firewall prompt
+ - [#129](https://github.com/WireMock-Net/WireMock.Net/issues/129) - Random test failures between WireMock.Net 1.0.3.1 and 1.0.3.2
+
+Commits: 2fcfda49c7...2b498f45cb
+
+
+# 1.0.3.19 (28 May 2018)
+
+ - [#129](https://github.com/WireMock-Net/WireMock.Net/issues/129) - Random test failures between WireMock.Net 1.0.3.1 and 1.0.3.2
+ - [#145](https://github.com/WireMock-Net/WireMock.Net/pull/145) - Cancellation token not passed to server instance in .NET Core 2 contributed by Bob Paul ([Bob11327](https://github.com/Bob11327)) +fix
+ - [#144](https://github.com/WireMock-Net/WireMock.Net/pull/144) - Fix ConcurrentDictionary (#129) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+
+Commits: ...
+
+
+# 1.0.3.18 (25 May 2018)
+
+ - [#142](https://github.com/WireMock-Net/WireMock.Net/pull/142) - Allow all headers to be set as Response headers contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#140](https://github.com/WireMock-Net/WireMock.Net/issues/140) - Question: Why the Microsoft.Owin.Host.HttpListener is not referenced in the dll, which uses WireMock?
+ - [#139](https://github.com/WireMock-Net/WireMock.Net/issues/139) - Wiki link https://github.com/StefH/WireMock.Net/wiki/Record-(via-proxy)-and-Save is dead
+ - [#137](https://github.com/WireMock-Net/WireMock.Net/issues/137) - Question: How to specify Transfer-Encoding response header?
+ - [#136](https://github.com/WireMock-Net/WireMock.Net/issues/136) - Question: Does the WireMock send Content-Length response header
+ - [#132](https://github.com/WireMock-Net/WireMock.Net/issues/132) - LogEntries not being recorded on subsequent tests
+ - [#127](https://github.com/WireMock-Net/WireMock.Net/issues/127) - Question: Stub priority - Most recent stub is not always used
+ - [#126](https://github.com/WireMock-Net/WireMock.Net/issues/126) - Question: UsingHead always returns 0 for Content-Length header even when explicitly specified
+ - [#122](https://github.com/WireMock-Net/WireMock.Net/issues/122) - WireMock.Net not responding in unit tests - same works in console application
+ - [#97](https://github.com/WireMock-Net/WireMock.Net/issues/97) - Request matching logic is not practical
+
+Commits: eda71bd725...eda71bd725
+
+
+# 1.0.3.17 (16 May 2018)
+
+ - [#138](https://github.com/WireMock-Net/WireMock.Net/pull/138) - Added Negate matcher logic contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#135](https://github.com/WireMock-Net/WireMock.Net/pull/135) - Merge into the stef_negate_matcher branch (solves issue #133) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#134](https://github.com/WireMock-Net/WireMock.Net/pull/134) - Stef negate matcher contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#133](https://github.com/WireMock-Net/WireMock.Net/issues/133) - Issue: Wildcard matching a json body does not work? +fix
+ - [#128](https://github.com/WireMock-Net/WireMock.Net/issues/128) - Feature: Negate a matcher +feature
+ - [#126](https://github.com/WireMock-Net/WireMock.Net/issues/126) - Question: UsingHead always returns 0 for Content-Length header even when explicitly specified
+ - [#103](https://github.com/WireMock-Net/WireMock.Net/issues/103) - Support for Faults
+
+Commits: 0fb4b62b50...c575ca8296
+
+
+# 1.0.3.16 (15 April 2018)
+
+ - [#125](https://github.com/WireMock-Net/WireMock.Net/pull/125) - Change listen from loopback to any ip address for dotnetcore2.0 apps contributed by ([SubjectiveReality](https://github.com/SubjectiveReality))
+ - [#124](https://github.com/WireMock-Net/WireMock.Net/issues/124) - Issue: Unable to get host to listen on ips other than 127.0.0.1 using StandAloneApp
+ - [#121](https://github.com/WireMock-Net/WireMock.Net/pull/121) - Fix for issue #118 contributed by ([raghavendrabankapur](https://github.com/raghavendrabankapur)) +fix
+ - [#118](https://github.com/WireMock-Net/WireMock.Net/issues/118) - Not reading the response from a file when mappings are placed in json file
+
+Commits: 7bd63a0baf...1bcdfe31ab
+
+
+# 1.0.3.15 (05 April 2018)
+
+ - [#117](https://github.com/WireMock-Net/WireMock.Net/pull/117) - Respect start timeout setting and expose exception from server startup contributed by Evan Liang ([evanlwj](https://github.com/evanlwj))
+
+Commits: 2d2a2dd6fc...4f294baff2
+
+
+# 1.0.3.14 (01 April 2018)
+
+ - [#114](https://github.com/WireMock-Net/WireMock.Net/issues/114) - Feature: Add PathSegments in Transform +feature
+ - [#113](https://github.com/WireMock-Net/WireMock.Net/issues/113) - Feature: Add BodyAsJsonIndented for response message +feature
+
+Commits: bdb79aec95...e87f970057
+
+
 # 1.0.3.12 (24 March 2018)
 
  - [#100](https://github.com/WireMock-Net/WireMock.Net/issues/100) - Issue: JsonPathMatcher - not working for rootless jsons?

GitReleaseNotes.txt

@@ -1,5 +1,5 @@
 https://github.com/GitTools/GitReleaseNotes
 
-GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.11
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.4.9
 
 GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

README.md

@@ -1,57 +1,72 @@
 # WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based http://WireMock.org
+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).
 
-[![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net)
-[![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master)
-[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
-[![GitHub stars](https://img.shields.io/github/stars/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/stargazers)
+## Key Features
+* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
+* Runs in unit tests, as a standalone process, as windows service, as Azure or IIS or as docker
+* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Record/playback of stubs
+* Per-request conditional proxying
+* Stateful behaviour simulation
+* Configurable response delays
 
-| Name | NuGet |
-| ---- | ----- |
-| WireMock.Net | [![NuGet Badge](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
-| WireMock.Net.StandAlone | [![NuGet Badge](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
+## Info
+| | |
+| --- | --- |
+| ***Project*** |   |
+|   **Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+|   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
+| | |
+| ***Quality*** |   |
+|   **Build** | [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net) |
+|   **CodeFactor** | [![CodeFactor](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net)
+|   **Sonar Quality Gate** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) |
+|   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) |
+|   **Sonar Code Smells** | [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
+|   **Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
+|   **Coveralls** | [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master) |
+| |
+| ***Nuget*** |   |
+|   **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
+|   **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
 
 ### Frameworks
 The following frameworks are supported:
-- net 4.5.2 and up
-- net 4.6 and up
-- netstandard 1.3
-- netstandard 2.0
+- net 4.5.2 and up & net 4.6 and up
+- netstandard 1.3 & netstandard 2.0
 
-## Build info
+### Build info
 To build you need:
 - Microsoft .NET Framework 4.5.2 Developer Pack (https://www.microsoft.com/en-us/download/details.aspx?id=42637)
 - Microsoft .NET Framework 4.6 Targeting Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=48136)
 - Microsoft .NET Framework 4.6.2 Developer Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=53321)
 - .NET Core 2.0 (https://www.microsoft.com/net/core)
 
-
 ## Stubbing
 A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing & Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing-and-Request-Matching).
 
-## Using WireMock in UnitTest framework
-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).
-
 ## 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).
 
-## WireMock as a standalone process
-This is quite straight forward to launch a mock server within a console application, see [Wiki : standalone](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+## Using
+WireMock.Net can be used in several ways:
 
-### SSL
-You can start a standalone mock server listening for HTTPS requests. To do so, there is just a flag to set when creating the server:
-```csharp
-var server1 = FluentMockServer.Start(port: 8443, ssl: true);
+### 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).
 
-// or like this
+### 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).
 
-var server2 = FluentMockServer.Start(new FluentMockServerSettings
-{
-    Urls = new[] { "http://localhost:9091", "https://localhost:9443" }
-});
-```
+### 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).
 
-- In case when using **net 4.5.2** or **net 4.6**, you need a certificate registered on your box, properly associated with your application and the port number that will be used. This is not really specific to WireMock.Net, not very straightforward and hence the following stackoverflow thread might come handy: [Httplistener with https support](http://stackoverflow.com/questions/11403333/httplistener-with-https-support).
+### 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)
 
-- When using **netstandard**, WireMock.Net uses a self signed certificate (which can be overriden if you like) to host https urls.
+### 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))

WireMock.Net Solution.sln

@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		GitReleaseNotes.txt = GitReleaseNotes.txt
 		README.md = README.md
 		ReSharper_WireMock.DotSettings = ReSharper_WireMock.DotSettings
+		WireMock.Net Solution.sln.DotSettings = WireMock.Net Solution.sln.DotSettings
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"
@@ -41,7 +42,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
 EndProject
@@ -51,6 +52,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.HeadersTest", "examples\WireMock.Net.Console.HeadersTest\WireMock.Net.Console.HeadersTest.csproj", "{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,6 +116,10 @@ Global
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -132,6 +139,7 @@ Global
 		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B70278E7-A2C6-4A3B-BBA9-1C873CA6F03C} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

WireMock.Net Solution.sln.DotSettings

@@ -1,3 +1,11 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TSV/@EntryIndexedValue">TSV</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
+</wpf:ResourceDictionary>

appveyor.yml

@@ -1,6 +1,6 @@
 os: Visual Studio 2017
 
-version: 1.0.2.{build}
+version: 1.0.4.{build}
 
 configuration:
 - Debug
@@ -8,36 +8,42 @@ configuration:
 init:
 - ps: $Env:LABEL = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
 
+# install dotnet SDK and dotnet-sonarscanner
 install:
-  - ps: Start-FileDownload 'https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-gs-x64.exe'
-  - cmd: dotnet-sdk-2.0.0-win-gs-x64.exe /quiet
-  - ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
+- ps: Start-FileDownload 'https://download.microsoft.com/download/4/0/9/40920432-3302-47a8-b13c-bbc4848ad114/dotnet-sdk-2.1.302-win-x64.exe'
+- cmd: dotnet-sdk-2.1.302-win-x64.exe /quiet
+- ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
+- dotnet tool install --global dotnet-sonarscanner
 
 environment:
   PATH: $(PATH);$(PROGRAMFILES)\dotnet\
   COVERALLS_REPO_TOKEN:
     secure: Eq/3VV5DVAeQAlQhe6hvy21IYPo5uY4fWKxvC4pxdq3giJzcwFp1QxBvRpXJ8Wkw
+  SONAR_TOKEN:
+    secure: guog1+ttdnlD8sVgvizlewksm3qbO7dy2oZUcR8WhurWYvdOByinxXo732hmSaMT
 
 before_build:
 - dotnet restore .\src\WireMock.Net\WireMock.Net.csproj
 - dotnet restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj
+- dotnet restore .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj
 
 build_script:
-# build WireMock.Net
+# build WireMock.Net with SonarScanner
+- dotnet sonarscanner begin /k:"wiremock" /d:sonar.organization="stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="%SONAR_TOKEN%" /v:"%APPVEYOR_BUILD_NUMBER%" /d:sonar.cs.opencover.reportsPaths="%CD%\coverage.xml"
 - dotnet build .\src\WireMock.Net\WireMock.Net.csproj -c %CONFIGURATION%
 
 # build WireMock.Net.Standalone
 - dotnet build .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj -c %CONFIGURATION%
 
-# restore and build WireMock.Net.Tests
-- dotnet restore .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj
+# build WireMock.Net.Tests
 - dotnet build .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj -c %CONFIGURATION%
 
 test_script:
   - nuget.exe install OpenCover -ExcludeVersion
-  - nuget.exe install coveralls.net -ExcludeVersion
+  - nuget.exe install coveralls.net -ExcludeVersion -Version 0.7.0
   - pip install codecov
 
   - cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
   - codecov -f "coverage.xml"
-  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
+  - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
+  - dotnet sonarscanner end /d:sonar.login="%SONAR_TOKEN%"

examples/WireMock.Net.Client/Program.cs

@@ -43,11 +43,14 @@ namespace WireMock.Net.Client
             var request = api.GetRequestsAsync().Result;
             Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
 
-            string deleteRequestsAsync = api.DeleteRequestsAsync().Result;
-            Console.WriteLine($"deleteRequestsAsync = {deleteRequestsAsync}");
+            //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
+            //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
 
-            string resetRequestsAsync = api.ResetRequestsAsync().Result;
-            Console.WriteLine($"resetRequestsAsync = {resetRequestsAsync}");
+            //var resetRequestsAsync = api.ResetRequestsAsync().Result;
+            //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
+
+            var scenarioStates = api.GetScenariosAsync().Result;
+            Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
 
             Console.WriteLine("Press any key to quit");
             Console.ReadKey();

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

@@ -0,0 +1,60 @@
+using System.IO;
+using System.Reflection;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NETCoreApp
+{
+    static class Program
+    {
+        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        static void Main(params string[] args)
+        {
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
+
+            string url = "http://localhost:9999/";
+
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { url },
+                StartAdminInterface = true,
+                Logger = new WireMockConsoleLogger()
+            });
+            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+
+            server.SetBasicAuthentication("a", "b");
+
+            server.AllowPartialMapping();
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithHeader("Keep-Alive-Test", "stef")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Keep-Alive", "timeout=1, max=1")
+                    .WithBody("Keep-Alive OK")
+                );
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+
+            System.Console.WriteLine("Displaying all requests");
+            var allRequests = server.LogEntries;
+            System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+            System.Console.WriteLine("Press any key to quit");
+            System.Console.ReadKey();
+        }
+    }
+}

examples/WireMock.Net.Console.HeadersTest/WireMock.Net.Console.HeadersTest.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.HeadersTest/log4net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.Console.HeadersTest/nlog.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true"
+      internalLogLevel="info"
+      internalLogFile="c:\temp\wiremock-internal-nlog.log">
+
+  <targets>
+    <!-- write logs to file  -->
+    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
+  </targets>
+
+  <!-- rules to map from logger name to target -->
+  <rules>
+    <logger name="*" minlevel="Debug" writeTo="all" />
+  </rules>
+</nlog>

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

@@ -6,16 +6,12 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\WireMock.Net.ConsoleApplication\MainApp.cs" Link="MainApp.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
+    <Content Include="__admin\mappings\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json

@@ -3,14 +3,7 @@
   "Title": "",
   "Priority": 0,
   "Request": {
-    "Path": {
-      "Matchers": [
-        {
-          "Name": "WildcardMatcher",
-          "Pattern": "/proxy-google-test-post"
-        }
-      ]
-    },
+    "Path": "/proxy-google-test-post",
     "Methods": [
       "post"
     ],

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

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

@@ -1,4 +1,10 @@
-using Newtonsoft.Json;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
 
@@ -8,6 +14,9 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
     {
         static void Main(string[] args)
         {
+            RunTestDifferentPort().Wait(20000); // prints "1"
+            RunTestDifferentPort().Wait(20000); // prints "1"
+
             var server = FluentMockServer.Start(new FluentMockServerSettings
             {
                 Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
@@ -32,5 +41,22 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
             System.Console.ReadKey();
             server.Stop();
         }
+
+        private static async Task RunTestDifferentPort()
+        {
+            var server = FluentMockServer.Start();
+
+            server.Given(Request.Create().WithPath("/").UsingGet())
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("Hello"));
+
+            Thread.Sleep(1000);
+
+            var response = await new HttpClient().GetAsync(server.Urls[0]);
+            response.EnsureSuccessStatusCode();
+
+            System.Console.WriteLine("RunTestDifferentPort - server.LogEntries.Count() = " + server.LogEntries.Count());
+
+            server.Stop();
+        }
     }
 }

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Net;
 using Newtonsoft.Json;
+using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -27,7 +29,8 @@ namespace WireMock.Net.ConsoleApplication
                 //    SaveMapping = true
                 //},
                 PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
-                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
+                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
+                Logger = new WireMockConsoleLogger()
             });
             System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
 
@@ -35,11 +38,39 @@ namespace WireMock.Net.ConsoleApplication
 
             server.AllowPartialMapping();
 
-            // .WithHeader("Stef", "Stef")
-            //server
-            //    .Given(Request.Create().WithPath("*"))
-            //    .RespondWith(Response.Create()
-            //    .WithProxy("http://restcountries.eu"));
+            server
+                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
+                .AtPriority(4)
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("/proxy-test-keep-alive")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Keep-Alive", "timeout=1, max=1")
+                );
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("/proxy-execute-keep-alive")
+                )
+                .RespondWith(Response.Create()
+                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", BlackListedHeaders = new[] { "Keep-Alive" } })
+                    .WithHeader("Keep-Alive-Test", "stef")
+                );
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/xpath").UsingPost()
+                    .WithBody(new XPathMatcher("/todo-list[count(todo-item) = 3]"))
+                )
+                .RespondWith(Response.Create().WithBody("XPathMatcher!"));
 
             server
                 .Given(Request
@@ -50,6 +81,26 @@ namespace WireMock.Net.ConsoleApplication
                 .RespondWith(Response.Create()
                     .WithBody(@"{ ""result"": ""JsonPathMatcher !!!""}"));
 
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonbodytest1")
+                    .WithBody(new JsonMatcher("{ \"x\": 42, \"s\": \"s\" }"))
+                    .UsingPost())
+                .WithGuid("debaf408-3b23-4c04-9d18-ef1c020e79f2")
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""jsonbodytest1"" }"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonbodytest2")
+                    .WithBody(new JsonMatcher(new { x = 42, s = "s" }))
+                    .UsingPost())
+                .WithGuid("debaf408-3b23-4c04-9d18-ef1c020e79f3")
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""jsonbodytest2"" }"));
+
             server
                 .Given(Request
                     .Create()
@@ -57,13 +108,33 @@ namespace WireMock.Net.ConsoleApplication
                     .WithParam("$filter", "(substringof(Code, 'WA')")
                     .UsingGet())
                 .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
                     .WithBody(@"{ ""result"": ""odata""}"));
 
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/param2", true))
+                    .WithParam("key", "test")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "param2" }));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/param3", true))
+                    .WithParam("key", new WildcardMatcher("t*"))
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "param3" }));
+
             server
                 .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
                 .RespondWith(Response.Create()
                     .WithStatusCode(201)
-                    //.WithHeader("MyHeader", "application/json", "application/json2")
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new { result = "data:headers posted with 201" }));
 
@@ -81,8 +152,10 @@ namespace WireMock.Net.ConsoleApplication
 
             server
                 .Given(Request.Create().WithPath("/file_rel").UsingGet())
+                .WithGuid("0000aaaa-fcf4-4256-a0d3-1c76e4862947")
                 .RespondWith(Response.Create()
-                    .WithBodyFromFile("Program.cs", false)
+                    .WithHeader("Content-Type", "application/xml")
+                    .WithBodyFromFile("WireMock.Net.xml", false)
                 );
 
             server
@@ -113,14 +186,6 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(200)
                     .WithBody("hi"));
 
-            server
-                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
-                .AtPriority(4)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
-
             server
                 .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
                 .AtPriority(999)
@@ -150,6 +215,26 @@ namespace WireMock.Net.ConsoleApplication
                     .WithHeader("Content-Type", "application/json")
                     .WithBody(@"{ ""result"": ""data deleted with 200""}"));
 
+            server
+                .Given(Request.Create()
+                    .WithPath("/needs-a-key")
+                    .UsingGet()
+                    .WithHeader("api-key", "*", MatchBehaviour.AcceptOnMatch)
+                    .UsingAnyMethod())
+                .RespondWith(Response.Create()
+                    .WithStatusCode(HttpStatusCode.OK)
+                    .WithBody(@"{ ""result"": ""api-key found""}"));
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/needs-a-key")
+                    .UsingGet()
+                    .WithHeader("api-key", "*", MatchBehaviour.RejectOnMatch)
+                    .UsingAnyMethod())
+                .RespondWith(Response.Create()
+                    .WithStatusCode(HttpStatusCode.Unauthorized)
+                    .WithBody(@"{ ""result"": ""api-key missing""}"));
+
             server
                 .Given(Request.Create().WithPath("/nobody").UsingGet())
                 .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
@@ -159,19 +244,59 @@ namespace WireMock.Net.ConsoleApplication
                 .Given(Request.Create().WithPath("/partial").UsingPost().WithBody(new SimMetricsMatcher(new[] { "cat", "dog" })))
                 .RespondWith(Response.Create().WithStatusCode(200).WithBody("partial = 200"));
 
-            // http://localhost:8080/any/any?start=1000&stop=1&stop=2
-            //server
-            //    .Given(Request.Create().WithPath("/*").UsingGet())
-            //    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
-            //    .AtPriority(server.Mappings.Count() + 1)
-            //    .RespondWith(Response.Create()
-            //        .WithStatusCode(200)
-            //        .WithHeader("Content-Type", "application/json")
-            //        .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
-            //        .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-            //        .WithTransformer()
-            //        .WithDelay(TimeSpan.FromMilliseconds(100))
-            //    );
+            // http://localhost:8080/trans?start=1000&stop=1&stop=2
+            server
+                .Given(Request.Create().WithPath("/trans").UsingGet())
+                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
+                    .WithHeader("xyz_{{request.headers.Postman-Token}}", "token is {{request.headers.Postman-Token}}")
+                    .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
+                    .WithTransformer()
+                    .WithDelay(TimeSpan.FromMilliseconds(100))
+                );
+
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestToken").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/zubinix").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("{ \"result\": \"{{JsonPath.SelectToken request.bodyAsJson \"username\"}}\" }")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/zubinix2").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { path = "{{request.path}}", result = "{{JsonPath.SelectToken request.bodyAsJson \"username\"}}" })
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestTokenJson").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { status = "OK", url = "{{request.url}}", transformed = "{{JsonPath.SelectToken request.body \"$.Manufacturers[?(@.Name == 'Acme Co')]\"}}" })
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create().WithPath("/jsonpathtestTokens").UsingPost())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody("[{{#JsonPath.SelectTokens request.body \"$..Products[?(@.Price >= 50)].Name\"}} { \"idx\":{{id}}, \"value\":\"{{value}}\" }, {{/JsonPath.SelectTokens}} {} ]")
+                    .WithTransformer()
+                );
 
             server
                 .Given(Request.Create()

examples/WireMock.Net.ConsoleApplication/WireMock.Net.Console.NET452.csproj

@@ -71,6 +71,9 @@
     <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">

examples/WireMock.Net.ConsoleApplication/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

examples/WireMock.Net.Service/Service-Install.bat

@@ -1,5 +1,5 @@
 @echo off
-call uninstall.bat
+call Service-Uninstall.bat
 
 SET mypath=%~dp0
 SET targetpath=C:\Services\WireMock.Net.Service\

examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj

@@ -2,8 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <StartupObject>WireMock.Net.StandAlone.NETCoreApp.Program</StartupObject>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -1,4 +1,6 @@
 using log4net;
+using Newtonsoft.Json;
+using WireMock.Admin.Requests;
 using WireMock.Logging;
 
 namespace WireMock.Net.StandAlone.NETCoreApp
@@ -26,5 +28,11 @@ namespace WireMock.Net.StandAlone.NETCoreApp
         {
             Log.ErrorFormat(formatString, args);
         }
+
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+        {
+            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+            Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
+        }
     }
 }

examples/WireMock.Net.StandAlone.NETCoreApp/run21.cmd

@@ -0,0 +1 @@
+dotnet run --framework netcoreapp2.1

examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj

@@ -42,8 +42,18 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -53,6 +63,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

examples/WireMock.Net.StandAlone.Net452/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

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

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>

examples/WireMock.Net.WebApplication/Properties/PublishProfiles/IIS Localhost 1.pubxml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <ProjectGuid>049539c1-7a66-4559-ad7a-b1c73b97cbb0</ProjectGuid>
+    <SelfContained>true</SelfContained>
+    <_IsPortable>false</_IsPortable>
+    <MSDeployServiceURL>localhost</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/wiremock1</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
+    <EnableMSDeployBackup>False</EnableMSDeployBackup>
+    <UserName />
+    <_SavePWD>False</_SavePWD>
+    <PublishDatabaseSettings>
+      <Objects xmlns="" />
+    </PublishDatabaseSettings>
+  </PropertyGroup>
+</Project>

examples/WireMock.Net.WebApplication/Properties/PublishProfiles/IIS Localhost 2.pubxml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <ProjectGuid>049539c1-7a66-4559-ad7a-b1c73b97cbb1</ProjectGuid>
+    <SelfContained>true</SelfContained>
+    <_IsPortable>false</_IsPortable>
+    <MSDeployServiceURL>localhost</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/wiremock2</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
+    <EnableMSDeployBackup>False</EnableMSDeployBackup>
+    <UserName />
+    <_SavePWD>False</_SavePWD>
+    <PublishDatabaseSettings>
+      <Objects xmlns="" />
+    </PublishDatabaseSettings>
+  </PropertyGroup>
+</Project>

examples/WireMock.Net.WebApplication/Properties/launchSettings.json

@@ -2,6 +2,10 @@
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
+    "iis": {
+      "applicationUrl": "http://localhost//wiremock",
+      "sslPort": 0
+    },
     "iisExpress": {
       "applicationUrl": "http://localhost:56513/",
       "sslPort": 0
@@ -23,6 +27,12 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:56514/"
+    },
+    "IIS": {
+      "commandName": "IIS",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "development"
+      }
     }
   }
 }

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

@@ -1,18 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
     <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
+    <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
+    <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.WebApplication/WireMockService.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using WireMock.Admin.Requests;
 using WireMock.Logging;
 using WireMock.Net.StandAlone;
 using WireMock.Settings;
@@ -42,6 +43,12 @@ namespace WireMock.Net.WebApplication
             {
                 _logger.LogError(formatString, args);
             }
+
+            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
+            {
+                string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+                _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
+            }
         }
 
         public WireMockService(ILogger logger, IFluentMockServerSettings settings)

examples/WireMock.Net.WebApplication/readme.md

@@ -0,0 +1,21 @@
+# Running in IIS
+
+Follow these links / steps:
+* https://weblog.west-wind.com/posts/2016/Jun/06/Publishing-and-Running-ASPNET-Core-Applications-with-IIS
+* https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/development-time-iis-support?view=aspnetcore-2.1
+* Create a `web.config` file
+
+## IIS Sites
+![IIS Multiple](resources/iis-wiremock1and2.png)
+
+## App Pool settings
+![IIS Multiple](resources/iis-apppool.png)
+
+## Publish Profiles
+Two example publish profiles are created:
+* [IIS Localhost 1](./Properties/PublishProfiles/IIS%20Localhost%201.pubxml)
+* [IIS Localhost 2](./Properties/PublishProfiles/IIS%20Localhost%202.pubxml)
+
+## Debugging
+Select the debug "IIS" if you want to debug in IIS.
+![IIS Debug](resources/iis-debug.png)

examples/WireMock.Net.WebApplication/web.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
+  -->
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
+    </handlers>
+    <aspNetCore processPath="bin\IISSupport\VSIISExeLauncher.exe" arguments="-argFile IISExeLauncherArgs.txt" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>

src/WireMock.Net.StandAlone/SimpleCommandLineParser.cs

@@ -41,6 +41,7 @@ namespace WireMock.Net.StandAlone
                 Arguments[currentName] = values.ToArray();
             }
         }
+
         public bool Contains(string name)
         {
             return Arguments.ContainsKey(name);

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.3.12</Version>
+    <Version>1.0.4.9</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -21,6 +21,7 @@
     <DebugType>full</DebugType>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
+    <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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

@@ -9,15 +9,5 @@
         /// Gets or sets the matcher.
         /// </summary>
         public MatcherModel Matcher { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the function.
-        ///// </summary>
-        //public string Func { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the data function.
-        ///// </summary>
-        //public string DataFunc { get; set; }
     }
 }

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

@@ -9,10 +9,5 @@
         /// Gets or sets the matchers.
         /// </summary>
         public MatcherModel[] Matchers { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
     }
 }

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

@@ -16,10 +16,5 @@ namespace WireMock.Admin.Mappings
         /// Gets or sets the matchers.
         /// </summary>
         public IList<MatcherModel> Matchers { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
     }
 }

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

@@ -16,10 +16,5 @@ namespace WireMock.Admin.Mappings
         /// Gets or sets the matchers.
         /// </summary>
         public IList<MatcherModel> Matchers { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
     }
 }

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

@@ -30,13 +30,13 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Execution state condition for the current mapping.
         /// </summary>
-        public object WhenStateIs { get; set; }
+        public string WhenStateIs { get; set; }
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
         /// In case the value is null state will not be changed.
         /// </summary>
-        public object SetStateTo { get; set; }
+        public string SetStateTo { get; set; }
 
         /// <summary>
         /// The request.

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

@@ -11,18 +11,23 @@
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the pattern.
+        /// Gets or sets the pattern. Can be a string (default) or an object;
         /// </summary>
-        public string Pattern { get; set; }
+        public object Pattern { get; set; }
 
         /// <summary>
-        /// Gets or sets the patterns.
+        /// Gets or sets the patterns. Can be array of strings (default) or an array of objects;
         /// </summary>
-        public string[] Patterns { get; set; }
+        public object[] Patterns { get; set; }
 
         /// <summary>
         /// Gets or sets the ignore case.
         /// </summary>
         public bool? IgnoreCase { get; set; }
+
+        /// <summary>
+        /// Reject on match.
+        /// </summary>
+        public bool? RejectOnMatch { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/ParamModel.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings
 {
     /// <summary>
     /// Param Model
@@ -13,13 +11,8 @@ namespace WireMock.Admin.Mappings
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the values.
+        /// Gets or sets the matchers.
         /// </summary>
-        public IList<string> Values { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
+        public MatcherModel[] Matchers { get; set; }
     }
 }

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

@@ -9,10 +9,5 @@
         /// Gets or sets the matchers.
         /// </summary>
         public MatcherModel[] Matchers { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
     }
 }

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

@@ -32,6 +32,11 @@ namespace WireMock.Admin.Mappings
         /// </summary>
         public object BodyAsJson { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.
+        /// </summary>
+        public bool? BodyAsJsonIndented { get; set; }
+
         /// <summary>
         /// Gets or sets the body (as bytearray).
         /// </summary>

src/WireMock.Net/Admin/Mappings/StatusModel.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// Status
+    /// </summary>
+    public class StatusModel
+    {
+        /// <summary>
+        /// The optional guid.
+        /// </summary>
+        public Guid? Guid { get; set; }
+
+        /// <summary>
+        /// The status (can also contain the error message).
+        /// </summary>
+        public string Status { get; set; }
+    }
+}

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

@@ -9,10 +9,5 @@
         /// Gets or sets the matchers.
         /// </summary>
         public MatcherModel[] Matchers { get; set; }
-
-        ///// <summary>
-        ///// Gets or sets the functions.
-        ///// </summary>
-        //public string[] Funcs { get; set; }
     }
 }

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

@@ -26,7 +26,17 @@ namespace WireMock.Admin.Requests
         public string Path { get; set; }
 
         /// <summary>
-        ///The absolete URL.
+        /// The Absolute Path.
+        /// </summary>
+        public string AbsolutePath { get; set; }
+
+        /// <summary>
+        /// Gets the url (relative).
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// The absolete URL.
         /// </summary>
         public string AbsoluteUrl { get; set; }
 

src/WireMock.Net/Admin/Scenarios/ScenarioStateModel.cs

@@ -0,0 +1,28 @@
+namespace WireMock.Admin.Scenarios
+{
+    /// <summary>
+    /// ScenarioStateModel
+    /// </summary>
+    public class ScenarioStateModel
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the NextState.
+        /// </summary>
+        public string NextState { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is started.
+        /// </summary>
+        public bool Started { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is finished.
+        /// </summary>
+        public bool Finished { get; set; }
+    }
+}

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -33,7 +33,7 @@ namespace WireMock.Client
         /// <param name="settings">SettingsModel</param>
         [Put("__admin/settings")]
         [Header("Content-Type", "application/json")]
-        Task<string> PutSettingsAsync([Body] SettingsModel settings);
+        Task<StatusModel> PutSettingsAsync([Body] SettingsModel settings);
 
         /// <summary>
         /// Update the settings
@@ -41,7 +41,7 @@ namespace WireMock.Client
         /// <param name="settings">SettingsModel</param>
         [Post("__admin/settings")]
         [Header("Content-Type", "application/json")]
-        Task<string> PostSettingsAsync([Body] SettingsModel settings);
+        Task<StatusModel> PostSettingsAsync([Body] SettingsModel settings);
 
         /// <summary>
         /// Get the mappings.
@@ -56,19 +56,19 @@ namespace WireMock.Client
         /// <param name="mapping">MappingModel</param>
         [Post("__admin/mappings")]
         [Header("Content-Type", "application/json")]
-        Task<string> PostMappingAsync([Body] MappingModel mapping);
+        Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);
 
         /// <summary>
         /// Delete all mappings.
         /// </summary>
         [Delete("__admin/mappings")]
-        Task<string> DeleteMappingsAsync();
+        Task<StatusModel> DeleteMappingsAsync();
 
         /// <summary>
         /// Delete (reset) all mappings.
         /// </summary>
         [Post("__admin/mappings/reset")]
-        Task<string> ResetMappingsAsync();
+        Task<StatusModel> ResetMappingsAsync();
 
         /// <summary>
         /// Get a mapping based on the guid
@@ -84,20 +84,20 @@ namespace WireMock.Client
         /// <param name="guid">The Guid</param>
         /// <param name="mapping">MappingModel</param>
         [Put("__admin/mappings/{guid}")]
-        Task<string> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);
+        Task<StatusModel> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);
 
         /// <summary>
         /// Delete a mapping based on the guid
         /// </summary>
         /// <param name="guid">The Guid</param>
         [Delete("__admin/mappings/{guid}")]
-        Task<string> DeleteMappingAsync([Path] Guid guid);
+        Task<StatusModel> DeleteMappingAsync([Path] Guid guid);
 
         /// <summary>
         /// Save the mappings
         /// </summary>
         [Post("__admin/mappings/save")]
-        Task<string> SaveMappingAsync();
+        Task<StatusModel> SaveMappingAsync();
 
         /// <summary>
         /// Get the requests.
@@ -110,13 +110,13 @@ namespace WireMock.Client
         /// Delete all requests.
         /// </summary>
         [Delete("__admin/requests")]
-        Task<string> DeleteRequestsAsync();
+        Task<StatusModel> DeleteRequestsAsync();
 
         /// <summary>
         /// Delete (reset) all requests.
         /// </summary>
         [Post("__admin/requests/reset")]
-        Task<string> ResetRequestsAsync();
+        Task<StatusModel> ResetRequestsAsync();
 
         /// <summary>
         /// Get a request based on the guid
@@ -131,7 +131,7 @@ namespace WireMock.Client
         /// </summary>
         /// <param name="guid">The Guid</param>
         [Delete("__admin/requests/{guid}")]
-        Task<string> DeleteRequestAsync([Path] Guid guid);
+        Task<StatusModel> DeleteRequestAsync([Path] Guid guid);
 
         /// <summary>
         /// Find a request based on the criteria
@@ -145,18 +145,18 @@ namespace WireMock.Client
         /// Get all scenarios
         /// </summary>
         [Get("__admin/scenarios")]
-        Task<string> GetScenariosAsync();
+        Task<IList<ScenarioState>> GetScenariosAsync();
 
         /// <summary>
         /// Delete (reset) all scenarios
         /// </summary>
         [Delete("__admin/scenarios")]
-        Task<string> DeleteScenariosAsync();
+        Task<StatusModel> DeleteScenariosAsync();
 
         /// <summary>
         /// Delete (reset) all scenarios
         /// </summary>
         [Post("__admin/scenarios")]
-        Task<string> ResetScenariosAsync();
+        Task<StatusModel> ResetScenariosAsync();
     }
 }

src/WireMock.Net/HttpsCertificate/ClientCertificateHelper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Security.Cryptography.X509Certificates;
 
 namespace WireMock.HttpsCertificate
@@ -10,19 +11,19 @@ namespace WireMock.HttpsCertificate
             X509Store certStore = new X509Store(StoreName.My, StoreLocation.LocalMachine);
             try
             {
-                //Certificate must be in the local machine store
+                // Certificate must be in the local machine store
                 certStore.Open(OpenFlags.ReadOnly);
 
-                //Attempt to find by thumbprint first
+                // Attempt to find by thumbprint first
                 var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectName, false);
                 if (matchingCertificates.Count == 0)
                 {
-                    //Fallback to subject name
+                    // Fallback to subject name
                     matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectName, false);
                     if (matchingCertificates.Count == 0)
                     {
                         // No certificates matched the search criteria.
-                        throw new Exception($"No certificate found with Thumbprint or SubjectName '{thumbprintOrSubjectName}'");
+                        throw new FileNotFoundException("No certificate found with specified Thumbprint or SubjectName.", thumbprintOrSubjectName);
                     }
                 }
                 // Use the first matching certificate.

src/WireMock.Net/Logging/IWireMockLogger.cs

@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using WireMock.Admin.Requests;
 
 namespace WireMock.Logging
 {
@@ -43,5 +44,13 @@ namespace WireMock.Logging
         [PublicAPI]
         [StringFormatMethod("formatString")]
         void Error([NotNull] string formatString, [NotNull] params object[] args);
+
+        /// <summary>
+        /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
+        /// </summary>
+        /// <param name="logEntryModel">The Request Log Model.</param>
+        /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
+        [PublicAPI]
+        void DebugRequestResponse([NotNull] LogEntryModel logEntryModel, bool isAdminRequest);
     }
 }

src/WireMock.Net/Logging/WireMockConsoleLogger.cs

@@ -1,4 +1,6 @@
 using System;
+using Newtonsoft.Json;
+using WireMock.Admin.Requests;
 
 namespace WireMock.Logging
 {
@@ -8,6 +10,14 @@ namespace WireMock.Logging
     /// <seealso cref="IWireMockLogger" />
     public class WireMockConsoleLogger : IWireMockLogger
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WireMockConsoleLogger"/> class.
+        /// </summary>
+        public WireMockConsoleLogger()
+        {
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+        }
+
         /// <see cref="IWireMockLogger.Debug"/>
         public void Debug(string formatString, params object[] args)
         {
@@ -32,9 +42,16 @@ namespace WireMock.Logging
             Console.WriteLine(Format("Error", formatString, args));
         }
 
+        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+        {
+            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+            Console.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+        }
+
         private static string Format(string level, string formatString, params object[] args)
         {
-            string message = string.Format(formatString, args);
+            var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
 
             return $"{DateTime.UtcNow} [{level}] : {message}";
         }

src/WireMock.Net/Logging/WireMockNullLogger.cs

@@ -1,4 +1,6 @@
-namespace WireMock.Logging
+using WireMock.Admin.Requests;
+
+namespace WireMock.Logging
 {
     /// <summary>
     /// WireMockNullLogger which does not log.
@@ -9,21 +11,31 @@
         /// <see cref="IWireMockLogger.Debug"/>
         public void Debug(string formatString, params object[] args)
         {
+            // Log nothing
         }
 
         /// <see cref="IWireMockLogger.Info"/>
         public void Info(string formatString, params object[] args)
         {
+            // Log nothing
         }
 
         /// <see cref="IWireMockLogger.Warn"/>
         public void Warn(string formatString, params object[] args)
         {
+            // Log nothing
         }
 
         /// <see cref="IWireMockLogger.Error"/>
         public void Error(string formatString, params object[] args)
         {
+            // Log nothing
+        }
+
+        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+        {
+            // Log nothing
         }
     }
 }

src/WireMock.Net/Mapping.cs

@@ -41,14 +41,14 @@ namespace WireMock
         /// Execution state condition for the current mapping.
         /// </summary>
         [CanBeNull]
-        public object ExecutionConditionState { get; }
+        public string ExecutionConditionState { get; }
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
-        /// In case the value is null state will not be changed.
+        /// In case the value is null, state will not be changed.
         /// </summary>
         [CanBeNull]
-        public object NextState { get; }
+        public string NextState { get; }
 
         /// <summary>
         /// The Request matcher.
@@ -77,7 +77,7 @@ namespace WireMock
         /// <param name="scenario">The scenario. [Optional]</param>
         /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
         /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
-        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] object executionConditionState, [CanBeNull] object nextState)
+        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
         {
             Guid = guid;
             Title = title;
@@ -106,7 +106,7 @@ namespace WireMock
         /// <param name="requestMessage">The request message.</param>
         /// <param name="nextState">The Next State.</param>
         /// <returns>The <see cref="RequestMatchResult"/>.</returns>
-        public RequestMatchResult GetRequestMatchResult(RequestMessage requestMessage, [CanBeNull] object nextState)
+        public RequestMatchResult GetRequestMatchResult(RequestMessage requestMessage, [CanBeNull] string nextState)
         {
             var result = new RequestMatchResult();
 

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -12,21 +12,34 @@ namespace WireMock.Matchers
     {
         private readonly string[] _values;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
         /// </summary>
         /// <param name="values">The values.</param>
-        public ExactMatcher([NotNull] params string[] values)
+        public ExactMatcher([NotNull] params string[] values) : this(MatchBehaviour.AcceptOnMatch, values)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="values">The values.</param>
+        public ExactMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] values)
         {
             Check.HasNoNulls(values, nameof(values));
 
             _values = values;
+            MatchBehaviour = matchBehaviour;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            return MatchScores.ToScore(_values.Select(value => value.Equals(input)));
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Select(value => value.Equals(input))));
         }
 
         /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
@@ -35,10 +48,7 @@ namespace WireMock.Matchers
             return _values;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public string GetName()
-        {
-            return "ExactMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "ExactMatcher";
     }
 }

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -1,10 +1,11 @@
 using System.Linq;
 using JetBrains.Annotations;
+using WireMock.Validation;
 
 namespace WireMock.Matchers
 {
     /// <summary>
-    /// ExactMatcher
+    /// ExactObjectMatcher
     /// </summary>
     /// <seealso cref="IObjectMatcher" />
     public class ExactObjectMatcher : IObjectMatcher
@@ -12,35 +13,59 @@ namespace WireMock.Matchers
         private readonly object _object;
         private readonly byte[] _bytes;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="value">The value.</param>
-        public ExactObjectMatcher([NotNull] object value)
+        public ExactObjectMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
         {
-            _object = value;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
+        {
+            Check.NotNull(value, nameof(value));
+
+            _object = value;
+            MatchBehaviour = matchBehaviour;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="value">The value.</param>
-        public ExactObjectMatcher([NotNull] byte[] value)
+        public ExactObjectMatcher([NotNull] byte[] value) : this(MatchBehaviour.AcceptOnMatch, value)
         {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] value)
+        {
+            Check.NotNull(value, nameof(value));
+
             _bytes = value;
+            MatchBehaviour = matchBehaviour;
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
         public double IsMatch(object input)
         {
             bool equals = _object != null ? Equals(_object, input) : _bytes.SequenceEqual((byte[])input);
-            return MatchScores.ToScore(equals);
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(equals));
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public string GetName()
-        {
-            return "ExactObjectMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "ExactObjectMatcher";
     }
 }

src/WireMock.Net/Matchers/IIgnoreCaseMatcher.cs

@@ -3,10 +3,11 @@
     /// <summary>
     /// IIgnoreCaseMatcher
     /// </summary>
+    /// <inheritdoc cref="IMatcher"/>
     public interface IIgnoreCaseMatcher : IMatcher
     {
         /// <summary>
-        /// Ignore the case.
+        /// Ignore the case from the pattern.
         /// </summary>
         bool IgnoreCase { get; }
     }

src/WireMock.Net/Matchers/IMatcher.cs

@@ -8,7 +8,11 @@
         /// <summary>
         /// Gets the name.
         /// </summary>
-        /// <returns>Name</returns>
-        string GetName();
+        string Name { get; }
+
+        /// <summary>
+        /// Gets the match behaviour.
+        /// </summary>
+        MatchBehaviour MatchBehaviour { get; }
     }
 }

src/WireMock.Net/Matchers/IStringMatcher.cs

@@ -3,6 +3,7 @@
     /// <summary>
     /// IStringMatcher
     /// </summary>
+    /// <inheritdoc cref="IMatcher"/>
     public interface IStringMatcher : IMatcher
     {
         /// <summary>

src/WireMock.Net/Matchers/IValueMatcher.cs

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

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -1,6 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 using JetBrains.Annotations;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Validation;
 
@@ -10,58 +10,76 @@ namespace WireMock.Matchers
     /// JsonPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
+    /// <seealso cref="IObjectMatcher" />
     public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
         private readonly string[] _patterns;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher([NotNull] params string[] patterns)
+        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        public JsonPathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
         {
             Check.NotNull(patterns, nameof(patterns));
 
+            MatchBehaviour = matchBehaviour;
             _patterns = patterns;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            if (input == null)
+            double match = MatchScores.Mismatch;
+            if (input != null)
             {
-                return MatchScores.Mismatch;
+                try
+                {
+                    var jtoken = JToken.Parse(input);
+                    match = IsMatch(jtoken);
+                }
+                catch (JsonException)
+                {
+                    // just ignore JsonException
+                }
             }
 
-            try
-            {
-                var jtoken = JToken.Parse(input);
-                return IsMatch(jtoken);
-            }
-            catch (Exception)
-            {
-                return MatchScores.Mismatch;
-            }
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
         public double IsMatch(object input)
         {
-            if (input == null)
+            double match = MatchScores.Mismatch;
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
             {
-                return MatchScores.Mismatch;
+                try
+                {
+                    // Check if JToken or object
+                    JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
+                    match = IsMatch(jtoken);
+                }
+                catch (JsonException)
+                {
+                    // just ignore JsonException
+                }
             }
 
-            try
-            {
-                // Check if JToken or object
-                JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
-                return IsMatch(jtoken);
-            }
-            catch (Exception)
-            {
-                return MatchScores.Mismatch;
-            }
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
         /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
@@ -70,18 +88,15 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public string GetName()
-        {
-            return "JsonPathMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "JsonPathMatcher";
 
         private double IsMatch(JToken jtoken)
         {
             // Wrap in array if needed
-            JToken jarray = jtoken is JArray ? jtoken : new JArray(jtoken);
+            JToken tokenOrArray = jtoken is JArray ? jtoken : new JArray(jtoken);
 
-            return MatchScores.ToScore(_patterns.Select(pattern => jarray.SelectToken(pattern) != null));
+            return MatchScores.ToScore(_patterns.Select(pattern => tokenOrArray.SelectToken(pattern) != null));
         }
     }
 }

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -0,0 +1,105 @@
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Validation;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// JsonMatcher
+    /// </summary>
+    public class JsonMatcher : IValueMatcher
+    {
+        /// <inheritdoc cref="IValueMatcher.Value"/>
+        public object Value { get; }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "JsonMatcher";
+
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The string value to check for equality.</param>
+        public JsonMatcher([NotNull] string value) : this(MatchBehaviour.AcceptOnMatch, value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The object value to check for equality.</param>
+        public JsonMatcher([NotNull] object value) : this(MatchBehaviour.AcceptOnMatch, value)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The string value to check for equality.</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value)
+        {
+            Check.NotNull(value, nameof(value));
+
+            MatchBehaviour = matchBehaviour;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="value">The object value to check for equality.</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value)
+        {
+            Check.NotNull(value, nameof(value));
+
+            MatchBehaviour = matchBehaviour;
+            Value = value;
+        }
+
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            bool match = false;
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
+            {
+                try
+                {
+                    // Check if JToken or object
+                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);
+
+                    // Check if JToken or string or object
+                    JToken jtokenValue;
+                    switch (Value)
+                    {
+                        case JToken tokenValue:
+                            jtokenValue = tokenValue;
+                            break;
+
+                        case string stringValue:
+                            jtokenValue = JToken.Parse(stringValue);
+                            break;
+
+                        default:
+                            jtokenValue = JObject.FromObject(Value);
+                            break;
+                    }
+
+                    match = JToken.DeepEquals(jtokenValue, jtokenInput);
+                }
+                catch (JsonException)
+                {
+                    // just ignore JsonException
+                }
+            }
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+        }
+    }
+}

src/WireMock.Net/Matchers/MatchBehaviour.cs

@@ -0,0 +1,18 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// MatchBehaviour
+    /// </summary>
+    public enum MatchBehaviour
+    {
+        /// <summary>
+        /// Accept on match (default)
+        /// </summary>
+        AcceptOnMatch,
+
+        /// <summary>
+        /// Reject on match
+        /// </summary>
+        RejectOnMatch
+    }
+}

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -0,0 +1,27 @@
+namespace WireMock.Matchers
+{
+    internal static class MatchBehaviourHelper
+    {
+        /// <summary>
+        /// Converts the specified match behaviour and match value to a new match value.
+        /// 
+        /// if AcceptOnMatch --> return match (default)
+        /// if RejectOnMatch and match = 0.0 --> return 1.0
+        /// if RejectOnMatch and match = 0.? --> return 0.0
+        /// if RejectOnMatch and match = 1.0 --> return 0.0
+        /// </summary>
+        /// 
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="match">The match.</param>
+        /// <returns>match value</returns>
+        internal static double Convert(MatchBehaviour matchBehaviour, double match)
+        {
+            if (matchBehaviour == MatchBehaviour.AcceptOnMatch)
+            {
+                return match;
+            }
+
+            return match <= MatchScores.Tolerance ? MatchScores.Perfect : MatchScores.Mismatch;
+        }
+    }
+}

src/WireMock.Net/Matchers/RegexMatcher.cs

@@ -9,18 +9,32 @@ namespace WireMock.Matchers
     /// <summary>
     /// Regular Expression Matcher
     /// </summary>
-    /// <seealso cref="IStringMatcher" />
+    /// <inheritdoc cref="IStringMatcher"/>
+    /// <inheritdoc cref="IIgnoreCaseMatcher"/>
     public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
     {
         private readonly string[] _patterns;
         private readonly Regex[] _expressions;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
         /// </summary>
         /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">IgnoreCase</param>
-        public RegexMatcher([NotNull, RegexPattern] string pattern, bool ignoreCase = false) : this(new [] { pattern }, ignoreCase )
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        public RegexMatcher([NotNull, RegexPattern] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
         {
         }
 
@@ -28,13 +42,24 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">IgnoreCase</param>
-        public RegexMatcher([NotNull, RegexPattern] string[] patterns, bool ignoreCase = false)
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        public RegexMatcher([NotNull, RegexPattern] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string[] patterns, bool ignoreCase = false)
         {
             Check.NotNull(patterns, nameof(patterns));
 
             _patterns = patterns;
             IgnoreCase = ignoreCase;
+            MatchBehaviour = matchBehaviour;
 
             RegexOptions options = RegexOptions.Compiled;
             if (ignoreCase)
@@ -48,19 +73,20 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            if (input == null)
+            double match = MatchScores.Mismatch;
+            if (input != null)
             {
-                return MatchScores.Mismatch;
-            }
-
-            try
-            {
-                return MatchScores.ToScore(_expressions.Select(e => e.IsMatch(input)));
-            }
-            catch (Exception)
-            {
-                return MatchScores.Mismatch;
+                try
+                {
+                    match = MatchScores.ToScore(_expressions.Select(e => e.IsMatch(input)));
+                }
+                catch (Exception)
+                {
+                    // just ignore exception
+                }
             }
+            
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
         /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
@@ -69,11 +95,8 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public virtual string GetName()
-        {
-            return "RegexMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public virtual string Name => "RegexMatcher";
 
         /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
         public bool IgnoreCase { get; }

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

@@ -32,24 +32,27 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher([NotNull] string body) : this(new SimMetricsMatcher(body))
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new WildcardMatcher(matchBehaviour, body))
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher([NotNull] byte[] body) : this(new ExactObjectMatcher(body))
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new ExactObjectMatcher(matchBehaviour, body))
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher([NotNull] object body) : this(new ExactObjectMatcher(body))
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new ExactObjectMatcher(matchBehaviour, body))
         {
         }
 
@@ -102,27 +105,38 @@ namespace WireMock.Matchers.Request
 
         private double IsMatch(RequestMessage requestMessage)
         {
-            if (requestMessage.Body != null)
-            {
-                if (Matcher is IStringMatcher stringMatcher)
-                {
-                    return stringMatcher.IsMatch(requestMessage.Body);
-                }
-            }
-
+            // Check if the matcher is a IObjectMatcher
             if (Matcher is IObjectMatcher objectMatcher)
             {
+                // If the body is a JSON object, try to match.
                 if (requestMessage.BodyAsJson != null)
                 {
                     return objectMatcher.IsMatch(requestMessage.BodyAsJson);
                 }
 
+                // If the body is a byte array, try to match.
                 if (requestMessage.BodyAsBytes != null)
                 {
                     return objectMatcher.IsMatch(requestMessage.BodyAsBytes);
                 }
             }
 
+            // Check if the matcher is a IStringMatcher
+            if (Matcher is IStringMatcher stringMatcher)
+            {
+                // If the  body is a JSON object, try to use Body (string) to match.
+                if (requestMessage.BodyAsJson != null && requestMessage.Body != null)
+                {
+                    return stringMatcher.IsMatch(requestMessage.Body);
+                }
+
+                // If the string body is defined, try to match.
+                if (requestMessage.Body != null)
+                {
+                    return stringMatcher.IsMatch(requestMessage.Body);
+                }
+            }
+
             if (Func != null)
             {
                 return MatchScores.ToScore(requestMessage.Body != null && Func(requestMessage.Body));

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

@@ -25,7 +25,8 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
         /// </summary>
         /// <param name="clientIPs">The clientIPs.</param>
-        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IStringMatcher>().ToArray())
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        public RequestMessageClientIPMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(matchBehaviour, ip)).Cast<IStringMatcher>().ToArray())
         {
         }
 

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

@@ -11,6 +11,8 @@ namespace WireMock.Matchers.Request
     /// </summary>
     public class RequestMessageCookieMatcher : IRequestMatcher
     {
+        private readonly MatchBehaviour _matchBehaviour;
+
         /// <value>
         /// The funcs.
         /// </value>
@@ -29,16 +31,18 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageCookieMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="name">The name.</param>
         /// <param name="pattern">The pattern.</param>
         /// <param name="ignoreCase">The ignoreCase.</param>
-        public RequestMessageCookieMatcher([NotNull] string name, [NotNull] string pattern, bool ignoreCase = true)
+        public RequestMessageCookieMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, [NotNull] string pattern, bool ignoreCase = true)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(pattern, nameof(pattern));
 
+            _matchBehaviour = matchBehaviour;
             Name = name;
-            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -77,7 +81,7 @@ namespace WireMock.Matchers.Request
         {
             if (requestMessage.Cookies == null)
             {
-                return MatchScores.Mismatch;
+                return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
             if (Funcs != null)
@@ -92,7 +96,7 @@ namespace WireMock.Matchers.Request
 
             if (!requestMessage.Cookies.ContainsKey(Name))
             {
-                return MatchScores.Mismatch;
+                return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
             string value = requestMessage.Cookies[Name];

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

@@ -13,6 +13,8 @@ namespace WireMock.Matchers.Request
     /// <inheritdoc cref="IRequestMatcher"/>
     public class RequestMessageHeaderMatcher : IRequestMatcher
     {
+        private readonly MatchBehaviour _matchBehaviour;
+
         /// <summary>
         /// The functions
         /// </summary>
@@ -33,14 +35,16 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string pattern, bool ignoreCase = true)
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, [NotNull] string pattern, bool ignoreCase)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(pattern, nameof(pattern));
 
+            _matchBehaviour = matchBehaviour;
             Name = name;
-            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(matchBehaviour, pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -48,14 +52,16 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] string[] patterns, bool ignoreCase = true)
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        public RequestMessageHeaderMatcher(MatchBehaviour matchBehaviour, [NotNull] string name, [NotNull] string[] patterns, bool ignoreCase)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(patterns, nameof(patterns));
 
+            _matchBehaviour = matchBehaviour;
             Name = name;
-            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IStringMatcher>().ToArray();
+            Matchers = patterns.Select(pattern => new WildcardMatcher(matchBehaviour, pattern, ignoreCase)).Cast<IStringMatcher>().ToArray();
         }
 
         /// <summary>
@@ -94,7 +100,7 @@ namespace WireMock.Matchers.Request
         {
             if (requestMessage.Headers == null)
             {
-                return MatchScores.Mismatch;
+                return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
             if (Funcs != null)
@@ -109,7 +115,7 @@ namespace WireMock.Matchers.Request
 
             if (!requestMessage.Headers.ContainsKey(Name))
             {
-                return MatchScores.Mismatch;
+                return MatchBehaviourHelper.Convert(_matchBehaviour, MatchScores.Mismatch);
             }
 
             WireMockList<string> list = requestMessage.Headers[Name];

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

@@ -9,6 +9,8 @@ namespace WireMock.Matchers.Request
     /// </summary>
     internal class RequestMessageMethodMatcher : IRequestMatcher
     {
+        private readonly MatchBehaviour _matchBehaviour;
+
         /// <summary>
         /// The methods
         /// </summary>
@@ -17,26 +19,20 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageMethodMatcher"/> class.
         /// </summary>
-        /// <param name="methods">
-        /// The verb.
-        /// </param>
-        public RequestMessageMethodMatcher([NotNull] params string[] methods)
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="methods">The methods.</param>
+        public RequestMessageMethodMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] methods)
         {
             Check.NotNull(methods, nameof(methods));
+            _matchBehaviour = matchBehaviour;
+
             Methods = methods.Select(v => v.ToLower()).ToArray();
         }
 
-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
-            double score = IsMatch(requestMessage);
+            double score = MatchBehaviourHelper.Convert(_matchBehaviour, IsMatch(requestMessage));
             return requestMatchResult.AddScore(GetType(), score);
         }
 

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

@@ -12,6 +12,8 @@ namespace WireMock.Matchers.Request
     /// </summary>
     public class RequestMessageParamMatcher : IRequestMatcher
     {
+        private readonly MatchBehaviour _matchBehaviour;
+
         /// <summary>
         /// The funcs
         /// </summary>
@@ -23,29 +25,42 @@ namespace WireMock.Matchers.Request
         public string Key { get; }
 
         /// <summary>
-        /// The values
+        /// The matchers.
         /// </summary>
-        public IEnumerable<string> Values { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="key">The key.</param>
-        public RequestMessageParamMatcher([NotNull] string key) : this(key, null)
+        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key) : this(matchBehaviour, key, (IStringMatcher[])null)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="key">The key.</param>
         /// <param name="values">The values.</param>
-        public RequestMessageParamMatcher([NotNull] string key, [CanBeNull] IEnumerable<string> values)
+        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, [CanBeNull] string[] values) : this(matchBehaviour, key, values?.Select(value => new ExactMatcher(matchBehaviour, value)).Cast<IStringMatcher>().ToArray())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageParamMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="matchers">The matchers.</param>
+        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, [CanBeNull] IStringMatcher[] matchers)
         {
             Check.NotNull(key, nameof(key));
 
+            _matchBehaviour = matchBehaviour;
             Key = key;
-            Values = values;
+            Matchers = matchers;
         }
 
         /// <summary>
@@ -62,7 +77,7 @@ namespace WireMock.Matchers.Request
         /// <inheritdoc cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
-            double score = IsMatch(requestMessage);
+            double score = MatchBehaviourHelper.Convert(_matchBehaviour, IsMatch(requestMessage));
             return requestMatchResult.AddScore(GetType(), score);
         }
 
@@ -73,21 +88,33 @@ namespace WireMock.Matchers.Request
                 return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
             }
 
-            var values = requestMessage.GetParameter(Key);
-            if (values == null)
+            WireMockList<string> valuesPresentInRequestMessage = requestMessage.GetParameter(Key);
+            if (valuesPresentInRequestMessage == null)
             {
-                // Key is not present, just return Mismatch
+                // Key is not present at all, just return Mismatch
                 return MatchScores.Mismatch;
             }
 
-            if (values.Count == 0 && (Values == null || !Values.Any()))
+            if (Matchers != null && Matchers.Any())
             {
-                // Key is present, but no values or null, just return Perfect
+                // Matchers are defined, just use the matchers to calculate the match score.
+                var scores = new List<double>();
+                foreach (string valuePresentInRequestMessage in valuesPresentInRequestMessage)
+                {
+                    double score = Matchers.Max(m => m.IsMatch(valuePresentInRequestMessage));
+                    scores.Add(score);
+                }
+
+                return scores.Any() ? scores.Average() : MatchScores.Mismatch;
+            }
+
+            if (Matchers == null || !Matchers.Any())
+            {
+                // Matchers are null or not defined, and Key is present, just return Perfect.
                 return MatchScores.Perfect;
             }
 
-            var matches = Values.Select(v => values.Contains(v));
-            return MatchScores.ToScore(matches);
+            return MatchScores.Mismatch;
         }
     }
 }

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

@@ -12,7 +12,7 @@ namespace WireMock.Matchers.Request
     public class RequestMessagePathMatcher : IRequestMatcher
     {
         /// <summary>
-        /// The matcher.
+        /// The matchers
         /// </summary>
         public IReadOnlyList<IStringMatcher> Matchers { get; }
 
@@ -24,8 +24,9 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="paths">The paths.</param>
-        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IStringMatcher>().ToArray())
+        public RequestMessagePathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(matchBehaviour, path)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -36,6 +37,7 @@ namespace WireMock.Matchers.Request
         public RequestMessagePathMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
+
             Matchers = matchers;
         }
 
@@ -46,6 +48,7 @@ namespace WireMock.Matchers.Request
         public RequestMessagePathMatcher([NotNull] params Func<string, bool>[] funcs)
         {
             Check.NotNull(funcs, nameof(funcs));
+
             Funcs = funcs;
         }
 

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

@@ -7,30 +7,25 @@ namespace WireMock.Matchers.Request
     /// </summary>
     internal class RequestMessageScenarioAndStateMatcher : IRequestMatcher
     {
-        ///// <summary>
-        ///// Scenario.
-        ///// </summary>
-        //[CanBeNull] private string _scenario;
-
         /// <summary>
         /// Execution state condition for the current mapping.
         /// </summary>
         [CanBeNull]
-        private readonly object _executionConditionState;
+        private readonly string _executionConditionState;
 
         /// <summary>
         /// The next state which will be signaled after the current mapping execution.
         /// In case the value is null state will not be changed.
         /// </summary>
         [CanBeNull]
-        private readonly object _nextState;
+        private readonly string _nextState;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageScenarioAndStateMatcher"/> class.
         /// </summary>
         /// <param name="nextState">The next state.</param>
         /// <param name="executionConditionState">Execution state condition for the current mapping.</param>
-        public RequestMessageScenarioAndStateMatcher([CanBeNull] object nextState, [CanBeNull] object executionConditionState)
+        public RequestMessageScenarioAndStateMatcher([CanBeNull] string nextState, [CanBeNull] string executionConditionState)
         {
             _nextState = nextState;
             _executionConditionState = executionConditionState;

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

@@ -24,8 +24,9 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
         /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="urls">The urls.</param>
-        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IStringMatcher>().ToArray())
+        public RequestMessageUrlMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(matchBehaviour, url)).Cast<IStringMatcher>().ToArray())
         {
         }
 

src/WireMock.Net/Matchers/SimMetricsMatcher.cs

@@ -16,12 +16,25 @@ namespace WireMock.Matchers
         private readonly string[] _patterns;
         private readonly SimMetricType _simMetricType;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
         /// </summary>
         /// <param name="pattern">The pattern.</param>
         /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] string pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new [] { pattern }, simMetricType)
+        public SimMetricsMatcher([NotNull] string pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new[] { pattern }, simMetricType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="simMetricType">The SimMetric Type</param>
+        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(matchBehaviour, new[] { pattern }, simMetricType)
         {
         }
 
@@ -30,10 +43,21 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="patterns">The patterns.</param>
         /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein)
+        public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns, simMetricType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="simMetricType">The SimMetric Type</param>
+        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein)
         {
             Check.NotNullOrEmpty(patterns, nameof(patterns));
 
+            MatchBehaviour = matchBehaviour;
             _patterns = patterns;
             _simMetricType = simMetricType;
         }
@@ -43,7 +67,7 @@ namespace WireMock.Matchers
         {
             IStringMetric m = GetStringMetricType();
 
-            return MatchScores.ToScore(_patterns.Select(p => m.GetSimilarity(p, input)));
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => m.GetSimilarity(p, input))));
         }
 
         private IStringMetric GetStringMetricType()
@@ -95,10 +119,7 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public string GetName()
-        {
-            return $"SimMetricsMatcher.{_simMetricType}";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => $"SimMetricsMatcher.{_simMetricType}";
     }
 }

src/WireMock.Net/Matchers/WildcardMatcher.cs

@@ -17,7 +17,17 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="pattern">The pattern.</param>
         /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher([NotNull] string pattern, bool ignoreCase = false) : this(new [] { pattern }, ignoreCase)
+        public WildcardMatcher([NotNull] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WildcardMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">IgnoreCase</param>
+        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
         {
         }
 
@@ -26,7 +36,17 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="patterns">The patterns.</param>
         /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher([NotNull] string[] patterns, bool ignoreCase = false) : base(patterns.Select(pattern => "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", ".") + "$").ToArray(), ignoreCase)
+        public WildcardMatcher([NotNull] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WildcardMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">IgnoreCase</param>
+        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns.Select(pattern => "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", ".") + "$").ToArray(), ignoreCase)
         {
             _patterns = patterns;
         }
@@ -37,10 +57,7 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public override string GetName()
-        {
-            return "WildcardMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public override string Name => "WildcardMatcher";
     }
 }

src/WireMock.Net/Matchers/XPathMatcher.cs

@@ -17,38 +17,52 @@ namespace WireMock.Matchers
     {
         private readonly string[] _patterns;
 
+        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+        public MatchBehaviour MatchBehaviour { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public XPathMatcher([NotNull] params string[] patterns)
+        public XPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        public XPathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
         {
             Check.NotNull(patterns, nameof(patterns));
 
+            MatchBehaviour = matchBehaviour;
             _patterns = patterns;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            if (input == null)
+            double match = MatchScores.Mismatch;
+            if (input != null)
             {
-                return MatchScores.Mismatch;
+                try
+                {
+                    var nav = new XmlDocument { InnerXml = input }.CreateNavigator();
+#if NETSTANDARD1_3
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p})"))));
+#else
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p})"))));
+#endif
+                }
+                catch (Exception)
+                {
+                    // just ignore exception
+                }
             }
 
-            try
-            {
-                var nav = new XmlDocument { InnerXml = input }.CreateNavigator();
-#if NETSTANDARD1_3
-                return MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p})"))));
-#else
-                return MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p})"))));
-#endif
-            }
-            catch (Exception)
-            {
-                return MatchScores.Mismatch;
-            }
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
         }
 
         /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
@@ -57,10 +71,7 @@ namespace WireMock.Matchers
             return _patterns;
         }
 
-        /// <inheritdoc cref="IMatcher.GetName"/>
-        public string GetName()
-        {
-            return "XPathMatcher";
-        }
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "XPathMatcher";
     }
 }

src/WireMock.Net/Models/UrlDetails.cs

@@ -0,0 +1,51 @@
+using System;
+using WireMock.Validation;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// UrlDetails
+    /// </summary>
+    public class UrlDetails
+    {
+        /// <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(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)
+        {
+            Check.NotNull(absoluteUrl, nameof(absoluteUrl));
+            Check.NotNull(url, nameof(url));
+
+            AbsoluteUrl = absoluteUrl;
+            Url = url;
+        }
+    }
+}

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using WireMock.Http;
 using WireMock.HttpsCertificate;
+using WireMock.Logging;
 using WireMock.Validation;
 
 namespace WireMock.Owin
@@ -18,6 +19,8 @@ namespace WireMock.Owin
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly WireMockMiddlewareOptions _options;
         private readonly string[] _urls;
+        private readonly IWireMockLogger _logger;
+        private Exception _runningException;
 
         private IWebHost _host;
 
@@ -27,11 +30,15 @@ namespace WireMock.Owin
 
         public List<int> Ports { get; } = new List<int>();
 
+        public Exception RunningException => _runningException;
+
         public AspNetCoreSelfHost([NotNull] WireMockMiddlewareOptions options, [NotNull] params string[] uriPrefixes)
         {
             Check.NotNull(options, nameof(options));
             Check.NotNullOrEmpty(uriPrefixes, nameof(uriPrefixes));
 
+            _logger = options.Logger ?? new WireMockConsoleLogger();
+
             foreach (string uriPrefix in uriPrefixes)
             {
                 Urls.Add(uriPrefix);
@@ -69,13 +76,13 @@ namespace WireMock.Owin
                     foreach (string url in _urls.Where(u => u.StartsWith("http://", StringComparison.OrdinalIgnoreCase)))
                     {
                         PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
-                        options.Listen(System.Net.IPAddress.Loopback, port);
+                        options.Listen(System.Net.IPAddress.Any, port);
                     }
 
                     foreach (string url in _urls.Where(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
                     {
                         PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
-                        options.Listen(System.Net.IPAddress.Loopback, port, listenOptions =>
+                        options.Listen(System.Net.IPAddress.Any, port, listenOptions =>
                         {
                             listenOptions.UseHttps(PublicCertificateHelper.GetX509Certificate2());
                         });
@@ -87,22 +94,34 @@ namespace WireMock.Owin
 #endif
                 .Build();
 
-            IsStarted = true;
+            return Task.Run(() =>
+            {
+                StartServers();
+            }, _cts.Token);
+        }
 
+        private void StartServers()
+        {
+            try
+            {
+                IsStarted = true;
 #if NETSTANDARD1_3
-            Console.WriteLine("WireMock.Net server using netstandard1.3");
-            return Task.Run(() =>
-            {
+                _logger.Info("WireMock.Net server using netstandard1.3");
                 _host.Run(_cts.Token);
-            }, _cts.Token);
 #else
-            System.Console.WriteLine("WireMock.Net server using netstandard2.0");
-
-            return Task.Run(() =>
-            {
-                _host.Run();
-            }, _cts.Token);
+                _logger.Info("WireMock.Net server using netstandard2.0");
+                _host.RunAsync(_cts.Token).Wait();
 #endif
+            }
+            catch (Exception e)
+            {
+                _runningException = e;
+                _logger.Error(e.ToString());
+            }
+            finally
+            {
+                IsStarted = false;
+            }
         }
 
         public Task StopAsync()

src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs

@@ -49,7 +49,7 @@ namespace WireMock.Owin
             catch (Exception ex)
             {
                 _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
-                await _responseMapper.MapAsync(new ResponseMessage { StatusCode = 500, Body = JsonConvert.SerializeObject(ex) }, ctx.Response);
+                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response);
             }
         }
     }

src/WireMock.Net/Owin/IOwinSelfHost.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System;
 
 namespace WireMock.Owin
 {
@@ -16,19 +17,18 @@ namespace WireMock.Owin
         /// <summary>
         /// Gets the urls.
         /// </summary>
-        /// <value>
-        /// The urls.
-        /// </value>
         List<string> Urls { get; }
 
         /// <summary>
         /// Gets the ports.
         /// </summary>
-        /// <value>
-        /// The ports.
-        /// </value>
         List<int> Ports { get; }
 
+        /// <summary>
+        /// The exception occurred when the host is running
+        /// </summary>
+        Exception RunningException { get; }
+
         Task StartAsync();
 
         Task StopAsync();

src/WireMock.Net/Owin/OwinRequestMapper.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-// using System.IO;
 using System.Linq;
-// using System.Text;
 using System.Threading.Tasks;
 using WireMock.Util;
 #if !NETSTANDARD
@@ -33,10 +31,10 @@ namespace WireMock.Owin
             )
         {
 #if !NETSTANDARD
-            Uri url = request.Uri;
+            var urldetails = UrlUtils.Parse(request.Uri, request.PathBase);
             string clientIP = request.RemoteIpAddress;
 #else
-            Uri url = new Uri(request.GetEncodedUrl());
+            var urldetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);
             var connection = request.HttpContext.Connection;
             string clientIP = connection.RemoteIpAddress.IsIPv4MappedToIPv6
                 ? connection.RemoteIpAddress.MapToIPv4().ToString()
@@ -70,7 +68,7 @@ namespace WireMock.Owin
                 body = await BodyParser.Parse(request.Body, request.ContentType);
             }
 
-            return new RequestMessage(url, method, clientIP, body, headers, cookies) { DateTime = DateTime.Now };
+            return new RequestMessage(urldetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.Now };
         }
 
         private bool ShouldParseBody(string method)

src/WireMock.Net/Owin/OwinResponseMapper.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using WireMock.Http;
 using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
@@ -21,21 +23,48 @@ namespace WireMock.Owin
     {
         private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
 
-        // https://stackoverflow.com/questions/239725/cannot-set-some-http-headers-when-using-system-net-webrequest
+        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
 #if !NETSTANDARD
-        private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+        private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
 #else
-        private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> RestrictedResponseHeaders = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
+        private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
 #endif
-            { "Content-Length", null },
-            { "Content-Type", (r, v) => r.ContentType = v.FirstOrDefault() },
-            { "Keep-Alive", null },
-            { "Transfer-Encoding", null },
-            { "WWW-Authenticate", null }
+            { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() }
         };
 
+        private void SetResponseHeaders(ResponseMessage responseMessage
+#if !NETSTANDARD
+            , IOwinResponse response
+#else
+            , HttpResponse response
+#endif
+        )
+        {
+            // Set headers
+            foreach (var pair in responseMessage.Headers)
+            {
+                if (ResponseHeadersToFix.ContainsKey(pair.Key))
+                {
+                    ResponseHeadersToFix[pair.Key]?.Invoke(response, pair.Value);
+                }
+                else
+                {
+#if !NETSTANDARD
+                    // For non-NETSTANDARD, check if this response header can be added (#148)
+                    if (!WebHeaderCollection.IsRestricted(pair.Key, true))
+                    {
+                        response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
+                    }
+#else
+                    // NETSTANDARD can add any header (or so it seems)
+                    response.Headers.Append(pair.Key, pair.Value.ToArray());
+#endif
+                }
+            }
+        }
+
         /// <summary>
-        /// MapAsync ResponseMessage to OwinResponse
+        /// Map ResponseMessage to OwinResponse/HttpResponse
         /// </summary>
         /// <param name="responseMessage"></param>
         /// <param name="response"></param>
@@ -47,58 +76,38 @@ namespace WireMock.Owin
 #endif
             )
         {
+            if (responseMessage == null)
+            {
+                return;
+            }
+
             response.StatusCode = responseMessage.StatusCode;
 
-            // Set headers
-            foreach (var pair in responseMessage.Headers)
-            {
-                if (RestrictedResponseHeaders.ContainsKey(pair.Key))
-                {
-                    RestrictedResponseHeaders[pair.Key]?.Invoke(response, pair.Value);
-                }
-                else
-                {
-#if !NETSTANDARD
-                    response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
-#else
-                    response.Headers.Append(pair.Key, pair.Value.ToArray());
-#endif
-                }
-            }
-
-            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null && responseMessage.BodyAsJson == null)
-            {
-                return;
-            }
-
+            byte[] bytes = null;
             if (responseMessage.BodyAsBytes != null)
             {
-                await response.Body.WriteAsync(responseMessage.BodyAsBytes, 0, responseMessage.BodyAsBytes.Length);
-                return;
+                bytes = responseMessage.BodyAsBytes;
+            }
+            else if (responseMessage.BodyAsFile != null)
+            {
+                bytes = File.ReadAllBytes(responseMessage.BodyAsFile);
+            }
+            else if (responseMessage.BodyAsJson != null)
+            {
+                Formatting formatting = responseMessage.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
+                string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
+                bytes = (responseMessage.BodyEncoding ?? _utf8NoBom).GetBytes(jsonBody);
+            }
+            else if (responseMessage.Body != null)
+            {
+                bytes = (responseMessage.BodyEncoding ?? _utf8NoBom).GetBytes(responseMessage.Body);
             }
 
-            if (responseMessage.BodyAsFile != null)
-            {
-                byte[] bytes = File.ReadAllBytes(responseMessage.BodyAsFile);
+            SetResponseHeaders(responseMessage, response);
 
+            if (bytes != null)
+            {
                 await response.Body.WriteAsync(bytes, 0, bytes.Length);
-                return;
-            }
-
-            if (responseMessage.BodyAsJson != null)
-            {
-                string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyAsJson, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
-                using (var writer = new StreamWriter(response.Body, responseMessage.BodyEncoding ?? _utf8NoBom))
-                {
-                    await writer.WriteAsync(jsonBody);
-                }
-
-                return;
-            }
-
-            using (var writer = new StreamWriter(response.Body, responseMessage.BodyEncoding ?? _utf8NoBom))
-            {
-                await writer.WriteAsync(responseMessage.Body);
             }
         }
     }

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -1,13 +1,14 @@
 #if !NETSTANDARD
+using JetBrains.Annotations;
+using Microsoft.Owin.Hosting;
+using Owin;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
-using WireMock.Validation;
-using Owin;
-using Microsoft.Owin.Hosting;
 using WireMock.Http;
+using WireMock.Logging;
+using WireMock.Validation;
 
 namespace WireMock.Owin
 {
@@ -15,12 +16,16 @@ namespace WireMock.Owin
     {
         private readonly WireMockMiddlewareOptions _options;
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+        private readonly IWireMockLogger _logger;
+        private Exception _runningException;
 
         public OwinSelfHost([NotNull] WireMockMiddlewareOptions options, [NotNull] params string[] uriPrefixes)
         {
             Check.NotNull(options, nameof(options));
             Check.NotNullOrEmpty(uriPrefixes, nameof(uriPrefixes));
 
+            _logger = options.Logger ?? new WireMockConsoleLogger();
+
             foreach (string uriPrefix in uriPrefixes)
             {
                 Urls.Add(uriPrefix);
@@ -38,6 +43,8 @@ namespace WireMock.Owin
 
         public List<int> Ports { get; } = new List<int>();
 
+        public Exception RunningException => _runningException;
+
         [PublicAPI]
         public Task StartAsync()
         {
@@ -58,37 +65,46 @@ namespace WireMock.Owin
         private void StartServers()
         {
 #if NET46
-            Console.WriteLine("WireMock.Net server using .net 4.6.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.6.x or higher");
 #else
-            Console.WriteLine("WireMock.Net server using .net 4.5.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.5.x or higher");
 #endif
-
-            Action<IAppBuilder> startup = app =>
-            {
-                app.Use<GlobalExceptionMiddleware>(_options);
-                _options.PreWireMockMiddlewareInit?.Invoke(app);
-                app.Use<WireMockMiddleware>(_options);
-                _options.PostWireMockMiddlewareInit?.Invoke(app);
-            };
-
             var servers = new List<IDisposable>();
-            foreach (var url in Urls)
+
+            try
             {
-                servers.Add(WebApp.Start(url, startup));
+                Action<IAppBuilder> startup = app =>
+                {
+                    app.Use<GlobalExceptionMiddleware>(_options);
+                    _options.PreWireMockMiddlewareInit?.Invoke(app);
+                    app.Use<WireMockMiddleware>(_options);
+                    _options.PostWireMockMiddlewareInit?.Invoke(app);
+                };
+
+                foreach (var url in Urls)
+                {
+                    servers.Add(WebApp.Start(url, startup));
+                }
+
+                IsStarted = true;
+
+                // WaitHandle is signaled when the token is cancelled,
+                // which will be more efficent than Thread.Sleep in while loop
+                _cts.Token.WaitHandle.WaitOne();
             }
-
-            IsStarted = true;
-
-            while (!_cts.IsCancellationRequested)
+            catch (Exception e)
             {
-                Thread.Sleep(30000);
+                // Expose exception of starting host, otherwise it's hard to be troubleshooting if keeping quiet
+                // For example, WebApp.Start will fail with System.MissingMemberException if Microsoft.Owin.Host.HttpListener.dll is being located
+                // https://stackoverflow.com/questions/25090211/owin-httplistener-not-located/31369857
+                _runningException = e;
+                _logger.Error(e.ToString());
             }
-
-            IsStarted = false;
-
-            foreach (var server in servers)
+            finally
             {
-                server.Dispose();
+                IsStarted = false;
+                // Dispose all servers in finally block to make sure clean up allocated resource on error happening
+                servers.ForEach(s => s.Dispose());
             }
         }
     }

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using WireMock.Logging;
 using WireMock.Matchers.Request;
@@ -7,6 +8,7 @@ using WireMock.Matchers;
 using WireMock.Util;
 using Newtonsoft.Json;
 using WireMock.Http;
+using WireMock.Serialization;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -58,7 +60,10 @@ namespace WireMock.Owin
                     // Set start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
                     {
-                        _options.Scenarios.Add(mapping.Scenario, null);
+                        _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
+                        {
+                            Name = mapping.Scenario
+                        });
                     }
                 }
 
@@ -66,7 +71,7 @@ namespace WireMock.Owin
                     .Select(m => new
                     {
                         Mapping = m,
-                        MatchResult = m.GetRequestMatchResult(request, m.Scenario != null && _options.Scenarios.ContainsKey(m.Scenario) ? _options.Scenarios[m.Scenario] : null)
+                        MatchResult = m.GetRequestMatchResult(request, m.Scenario != null && _options.Scenarios.ContainsKey(m.Scenario) ? _options.Scenarios[m.Scenario].NextState : null)
                     })
                     .ToList();
 
@@ -97,7 +102,7 @@ namespace WireMock.Owin
                 {
                     logRequest = true;
                     _options.Logger.Warn("HttpStatusCode set to 404 : No matching mapping found");
-                    response = new ResponseMessage { StatusCode = 404, Body = "No matching mapping found" };
+                    response = ResponseMessageBuilder.Create("No matching mapping found", 404);
                     return;
                 }
 
@@ -109,7 +114,7 @@ namespace WireMock.Owin
                     if (!present || _options.AuthorizationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
                     {
                         _options.Logger.Error("HttpStatusCode set to 401");
-                        response = new ResponseMessage { StatusCode = 401 };
+                        response = ResponseMessageBuilder.Create(null, 401);
                         return;
                     }
                 }
@@ -123,13 +128,15 @@ namespace WireMock.Owin
 
                 if (targetMapping.Scenario != null)
                 {
-                    _options.Scenarios[targetMapping.Scenario] = targetMapping.NextState;
+                    _options.Scenarios[targetMapping.Scenario].NextState = targetMapping.NextState;
+                    _options.Scenarios[targetMapping.Scenario].Started = true;
+                    _options.Scenarios[targetMapping.Scenario].Finished = targetMapping.NextState == null;
                 }
             }
             catch (Exception ex)
             {
                 _options.Logger.Error("HttpStatusCode set to 500");
-                response = new ResponseMessage { StatusCode = 500, Body = JsonConvert.SerializeObject(ex) };
+                response = ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500);
             }
             finally
             {
@@ -153,6 +160,8 @@ namespace WireMock.Owin
 
         private void LogRequest(LogEntry entry, bool addRequest)
         {
+            _options.Logger.DebugRequestResponse(LogEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));
+
             if (addRequest)
             {
                 _options.LogEntries.Add(entry);

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -23,7 +22,9 @@ namespace WireMock.Owin
 
         public bool AllowPartialMapping { get; set; }
 
-        public IDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>();
+        public ConcurrentDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>();
+
+        public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new ConcurrentDictionary<string, ScenarioState>();
 
         public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurentObservableCollection<LogEntry>();
 
@@ -31,8 +32,6 @@ namespace WireMock.Owin
 
         public int? MaxRequestLogCount { get; set; }
 
-        public IDictionary<string, object> Scenarios { get; } = new ConcurrentDictionary<string, object>();
-
 #if !NETSTANDARD
         public Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }
 

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -20,39 +20,42 @@ namespace WireMock.RequestBuilders
         /// WithBody: Body as string
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(string body);
+        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
         /// WithBody: Body as byte[]
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(byte[] body);
+        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
         /// WithBody: Body as object
         /// </summary>
         /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(object body);
+        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        ///WithBody: func (string)
+        /// WithBody: func (string)
         /// </summary>
         /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] Func<string, bool> func);
 
         /// <summary>
-        ///WithBody: func (byte[])
+        /// WithBody: func (byte[])
         /// </summary>
         /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
 
         /// <summary>
-        ///WithBody: func (object)
+        /// WithBody: func (object)
         /// </summary>
         /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>

src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs

@@ -10,21 +10,29 @@ namespace WireMock.RequestBuilders
     public interface IClientIPRequestBuilder : IUrlAndPathRequestBuilder
     {
         /// <summary>
-        /// The with ClientIP.
+        /// WithClientIP: add matching on ClientIP matchers.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithClientIP([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
-        /// The with ClientIP.
+        /// WithClientIP: add matching on clientIPs.
         /// </summary>
         /// <param name="clientIPs">The clientIPs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithClientIP([NotNull] params string[] clientIPs);
 
         /// <summary>
-        /// The with ClientIP.
+        /// WithClientIP: add matching on clientIPs and matchBehaviour.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="clientIPs">The clientIPs.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithClientIP(MatchBehaviour matchBehaviour, [NotNull] params string[] clientIPs);
+
+        /// <summary>
+        /// WithClientIP: add matching on ClientIP funcs.
         /// </summary>
         /// <param name="funcs">The path funcs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>

src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs

@@ -12,25 +12,45 @@ namespace WireMock.RequestBuilders
     public interface IHeadersAndCookiesRequestBuilder : IBodyRequestBuilder, IRequestMatcher, IParamsRequestBuilder
     {
         /// <summary>
-        /// Add Header matching based on name, pattern and ignoreCase.
+        /// WithHeader: matching based on name, pattern and matchBehaviour.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">ignore Case</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string pattern, bool ignoreCase = true);
+        IRequestBuilder WithHeader([NotNull] string name, string pattern, MatchBehaviour matchBehaviour);
 
         /// <summary>
-        /// Add Header matching based on name, patterns and ignoreCase.
+        /// WithHeader: matching based on name, pattern, ignoreCase and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="pattern">The pattern.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithHeader([NotNull] string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithHeader: matching based on name, patterns and matchBehaviour.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">ignore Case</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, bool ignoreCase = true);
+        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, MatchBehaviour matchBehaviour);
 
         /// <summary>
-        /// The with header.
+        /// WithHeader: matching based on name, patterns, ignoreCase and matchBehaviour.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithHeader([NotNull] string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithHeader: matching based on name and IStringMatcher[].
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
@@ -38,23 +58,24 @@ namespace WireMock.RequestBuilders
         IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
-        /// The with header.
+        /// WithHeader: matching based on functions.
         /// </summary>
         /// <param name="funcs">The headers funcs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithHeader([NotNull] params Func<IDictionary<string, string[]>, bool>[] funcs);
 
         /// <summary>
-        /// The with cookie.
+        /// WithCookie: cookie matching based on name, pattern, ignoreCase and matchBehaviour.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">ignore Case</param>
+        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, string pattern, bool ignoreCase = true);
+        IRequestBuilder WithCookie([NotNull] string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The with cookie.
+        /// WithCookie: matching based on name and IStringMatcher[].
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
@@ -62,10 +83,10 @@ namespace WireMock.RequestBuilders
         IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
-        /// The with cookie.
+        /// WithCookie: matching based on functions.
         /// </summary>
-        /// <param name="cookieFuncs">The funcs.</param>
+        /// <param name="funcs">The funcs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] params Func<IDictionary<string, string>, bool>[] cookieFuncs);
+        IRequestBuilder WithCookie([NotNull] params Func<IDictionary<string, string>, bool>[] funcs);
     }
 }

src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs

@@ -1,4 +1,6 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
+using WireMock.Matchers;
 
 namespace WireMock.RequestBuilders
 {
@@ -8,66 +10,81 @@ namespace WireMock.RequestBuilders
     public interface IMethodRequestBuilder : IHeadersAndCookiesRequestBuilder
     {
         /// <summary>
-        /// The using delete.
+        /// UsingDelete: add HTTP Method matching on `delete` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingDelete();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using get.
+        /// UsingGet: add HTTP Method matching on `get` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingGet();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using head.
+        /// Add HTTP Method matching on `head` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingHead();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using post.
+        /// UsingPost: add HTTP Method matching on `post` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingPost();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using patch.
+        /// UsingPatch: add HTTP Method matching on `patch` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingPatch();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using put.
+        /// UsingPut: add HTTP Method matching on `put` and matchBehaviour (optional).
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
-        IRequestBuilder UsingPut();
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// The using any verb.
+        /// UsingAnyMethod: add HTTP Method matching on any method.
         /// </summary>
-        /// <returns>
-        /// The <see cref="IRequestBuilder"/>.
-        /// </returns>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingAnyMethod();
+
+        /// <summary>
+        /// UsingAnyVerb: add HTTP Method matching on any method.
+        /// </summary>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        [Obsolete("Use the method UsingAnyMethod().")]
         IRequestBuilder UsingAnyVerb();
 
         /// <summary>
-        /// The using verb.
+        /// UsingMethod: add HTTP Method matching on any methods and matchBehaviour.
         /// </summary>
-        /// <param name="verbs">The verb.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="methods">The methods.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, [NotNull] params string[] methods);
+
+        /// <summary>
+        /// UsingMethod: add HTTP Method matching on any methods.
+        /// </summary>
+        /// <param name="methods">The methods.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder UsingMethod([NotNull] params string[] methods);
+
+        /// <summary>
+        /// UsingVerb: add HTTP Method matching on any methods.
+        /// </summary>
+        /// <param name="verbs">The methods.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        [Obsolete("Use the method UsingMethod(...).")]
         IRequestBuilder UsingVerb([NotNull] params string[] verbs);
     }
 }

src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using WireMock.Matchers;
 using WireMock.Util;
 
 namespace WireMock.RequestBuilders
@@ -11,14 +12,15 @@ namespace WireMock.RequestBuilders
     public interface IParamsRequestBuilder
     {
         /// <summary>
-        /// WithParam (key only)
+        /// WithParam: matching on key only.
         /// </summary>
         /// <param name="key">The key.</param>
+        /// <param name="matchBehaviour">The match behaviour (optional).</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithParam([NotNull] string key);
+        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
         /// <summary>
-        /// WithParam (values)
+        /// WithParam: matching on key and values.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="values">The values.</param>
@@ -26,7 +28,33 @@ namespace WireMock.RequestBuilders
         IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params string[] values);
 
         /// <summary>
-        /// WithParam (funcs)
+        /// WithParam: matching on key and matchers.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params IStringMatcher[] matchers);
+
+        /// <summary>
+        /// WithParam: matching on key, values and matchBehaviour.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, [CanBeNull] params string[] values);
+
+        /// <summary>
+        /// WithParam: matching on key, matchers and matchBehaviour.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithParam([NotNull] string key, MatchBehaviour matchBehaviour, [CanBeNull] params IStringMatcher[] matchers);
+
+        /// <summary>
+        /// WithParam: matching on functions.
         /// </summary>
         /// <param name="funcs">The funcs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>

src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs

@@ -10,45 +10,61 @@ namespace WireMock.RequestBuilders
     public interface IUrlAndPathRequestBuilder : IMethodRequestBuilder
     {
         /// <summary>
-        /// The with path.
+        /// WithPath: add path matching based on IStringMatchers.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithPath([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
-        /// The with path.
+        /// WithPath: add path matching based on paths.
         /// </summary>
         /// <param name="paths">The paths.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithPath([NotNull] params string[] paths);
 
         /// <summary>
-        /// The with path.
+        /// WithPath: add path matching based on paths and matchBehaviour.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="paths">The paths.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithPath(MatchBehaviour matchBehaviour, [NotNull] params string[] paths);
+
+        /// <summary>
+        /// WithPath: add path matching based on functions.
         /// </summary>
         /// <param name="funcs">The path funcs.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithPath([NotNull] params Func<string, bool>[] funcs);
 
         /// <summary>
-        /// The with url.
+        /// WithUrl: add url matching based on IStringMatcher[].
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithUrl([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
-        /// The with url.
+        /// WithUrl: add url matching based on urls.
         /// </summary>
         /// <param name="urls">The urls.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithUrl([NotNull] params string[] urls);
 
         /// <summary>
-        /// The with path.
+        /// WithUrl: add url matching based on urls.
         /// </summary>
-        /// <param name="func">The path func.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="urls">The urls.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params Func<string, bool>[] func);
+        IRequestBuilder WithUrl(MatchBehaviour matchBehaviour, [NotNull] params string[] urls);
+
+        /// <summary>
+        /// WithUrl: add url matching based on functions.
+        /// </summary>
+        /// <param name="funcs">The url functions.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithUrl([NotNull] params Func<string, bool>[] funcs);
     }
 }

src/WireMock.Net/RequestBuilders/Request.cs

@@ -54,11 +54,7 @@ namespace WireMock.RequestBuilders
             return _requestMatchers.Where(rm => rm is T).Cast<T>().FirstOrDefault();
         }
 
-        /// <summary>
-        /// The with clientIP.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(IStringMatcher[])"/>
         public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
@@ -67,24 +63,22 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with clientIP.
-        /// </summary>
-        /// <param name="clientIPs">The ClientIPs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(string[])"/>
         public IRequestBuilder WithClientIP(params string[] clientIPs)
+        {
+            return WithClientIP(MatchBehaviour.AcceptOnMatch, clientIPs);
+        }
+
+        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(string[])"/>
+        public IRequestBuilder WithClientIP(MatchBehaviour matchBehaviour, params string[] clientIPs)
         {
             Check.NotNullOrEmpty(clientIPs, nameof(clientIPs));
 
-            _requestMatchers.Add(new RequestMessageClientIPMatcher(clientIPs));
+            _requestMatchers.Add(new RequestMessageClientIPMatcher(matchBehaviour, clientIPs));
             return this;
         }
 
-        /// <summary>
-        /// The with clientIP.
-        /// </summary>
-        /// <param name="funcs">The clientIP funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IClientIPRequestBuilder.WithClientIP(Func{string, bool}[])"/>
         public IRequestBuilder WithClientIP(params Func<string, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));
@@ -93,11 +87,7 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with path.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(IStringMatcher[])"/>
         public IRequestBuilder WithPath(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
@@ -106,24 +96,22 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with path.
-        /// </summary>
-        /// <param name="paths">The paths.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(string[])"/>
         public IRequestBuilder WithPath(params string[] paths)
+        {
+            return WithPath(MatchBehaviour.AcceptOnMatch, paths);
+        }
+
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(MatchBehaviour, string[])"/>
+        public IRequestBuilder WithPath(MatchBehaviour matchBehaviour, params string[] paths)
         {
             Check.NotNullOrEmpty(paths, nameof(paths));
 
-            _requestMatchers.Add(new RequestMessagePathMatcher(paths));
+            _requestMatchers.Add(new RequestMessagePathMatcher(matchBehaviour, paths));
             return this;
         }
 
-        /// <summary>
-        /// The with path.
-        /// </summary>
-        /// <param name="funcs">The path func.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithPath(Func{string, bool}[])"/>
         public IRequestBuilder WithPath(params Func<string, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));
@@ -132,11 +120,7 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with url.
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(IStringMatcher[])"/>
         public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
@@ -145,24 +129,22 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with url.
-        /// </summary>
-        /// <param name="urls">The urls.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(string[])"/>
         public IRequestBuilder WithUrl(params string[] urls)
+        {
+            return WithUrl(MatchBehaviour.AcceptOnMatch, urls);
+        }
+
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(MatchBehaviour, string[])"/>
+        public IRequestBuilder WithUrl(MatchBehaviour matchBehaviour, params string[] urls)
         {
             Check.NotNullOrEmpty(urls, nameof(urls));
 
-            _requestMatchers.Add(new RequestMessageUrlMatcher(urls));
+            _requestMatchers.Add(new RequestMessageUrlMatcher(matchBehaviour, urls));
             return this;
         }
 
-        /// <summary>
-        /// The with url.
-        /// </summary>
-        /// <param name="funcs">The url func.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IUrlAndPathRequestBuilder.WithUrl(Func{string, bool}[])"/>
         public IRequestBuilder WithUrl(params Func<string, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));
@@ -171,50 +153,50 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingDelete"/>
-        public IRequestBuilder UsingDelete()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingDelete(MatchBehaviour)"/>
+        public IRequestBuilder UsingDelete(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("delete"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "delete"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingGet"/>
-        public IRequestBuilder UsingGet()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingGet(MatchBehaviour)"/>
+        public IRequestBuilder UsingGet(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("get"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "get"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingHead"/>
-        public IRequestBuilder UsingHead()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingHead(MatchBehaviour)"/>
+        public IRequestBuilder UsingHead(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("head"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "head"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPost"/>
-        public IRequestBuilder UsingPost()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPost(MatchBehaviour)"/>
+        public IRequestBuilder UsingPost(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("post"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "post"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPatch"/>
-        public IRequestBuilder UsingPatch()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPatch(MatchBehaviour)"/>
+        public IRequestBuilder UsingPatch(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("patch"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "patch"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingPut"/>
-        public IRequestBuilder UsingPut()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingPut(MatchBehaviour)"/>
+        public IRequestBuilder UsingPut(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageMethodMatcher("put"));
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, "put"));
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyVerb"/>
-        public IRequestBuilder UsingAnyVerb()
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyMethod"/>
+        public IRequestBuilder UsingAnyMethod()
         {
             var matchers = _requestMatchers.Where(m => m is RequestMessageMethodMatcher).ToList();
             foreach (var matcher in matchers)
@@ -225,33 +207,51 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb"/>
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyVerb"/>
+        public IRequestBuilder UsingAnyVerb()
+        {
+            return UsingAnyMethod();
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(string[])"/>
+        public IRequestBuilder UsingMethod(params string[] methods)
+        {
+            return UsingMethod(MatchBehaviour.AcceptOnMatch, methods);
+        }
+
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb(string[])"/>
         public IRequestBuilder UsingVerb(params string[] verbs)
         {
-            Check.NotNullOrEmpty(verbs, nameof(verbs));
+            return UsingMethod(verbs);
+        }
 
-            _requestMatchers.Add(new RequestMessageMethodMatcher(verbs));
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(MatchBehaviour, string[])"/>
+        public IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, params string[] methods)
+        {
+            Check.NotNullOrEmpty(methods, nameof(methods));
+
+            _requestMatchers.Add(new RequestMessageMethodMatcher(matchBehaviour, methods));
             return this;
         }
 
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string)"/>
-        public IRequestBuilder WithBody(string body)
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
+        public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(body));
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
             return this;
         }
 
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[])"/>
-        public IRequestBuilder WithBody(byte[] body)
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
+        public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(body));
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
             return this;
         }
 
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object)"/>
-        public IRequestBuilder WithBody(object body)
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
+        public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(body));
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
             return this;
         }
 
@@ -291,21 +291,42 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string)"/>
-        public IRequestBuilder WithParam(string key)
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour)"/>
+        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
             Check.NotNull(key, nameof(key));
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(key));
+            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key));
             return this;
         }
 
         /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, string[])"/>
         public IRequestBuilder WithParam(string key, params string[] values)
+        {
+            return WithParam(key, MatchBehaviour.AcceptOnMatch, values);
+        }
+
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, IStringMatcher[])"/>
+        public IRequestBuilder WithParam(string key, params IStringMatcher[] matchers)
+        {
+            return WithParam(key, MatchBehaviour.AcceptOnMatch, matchers);
+        }
+
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, string[])"/>
+        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params string[] values)
         {
             Check.NotNull(key, nameof(key));
 
-            _requestMatchers.Add(new RequestMessageParamMatcher(key, values));
+            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, values));
+            return this;
+        }
+
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, IStringMatcher[])"/>
+        public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
+        {
+            Check.NotNull(key, nameof(key));
+
+            _requestMatchers.Add(new RequestMessageParamMatcher(matchBehaviour, key, matchers));
             return this;
         }
 
@@ -318,32 +339,39 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string,string,bool)"/>
-        public IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true)
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string, string, MatchBehaviour)"/>
+        public IRequestBuilder WithHeader(string name, string pattern, MatchBehaviour matchBehaviour)
+        {
+            return WithHeader(name, pattern, true, matchBehaviour);
+        }
+
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string, string, bool, MatchBehaviour)"/>
+        public IRequestBuilder WithHeader(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(pattern, nameof(pattern));
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(name, pattern, ignoreCase));
+            _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, pattern, ignoreCase));
             return this;
         }
 
-        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string,string[],bool)"/>
-        public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true)
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string, string[], MatchBehaviour)"/>
+        public IRequestBuilder WithHeader(string name, string[] patterns, MatchBehaviour matchBehaviour)
+        {
+            return WithHeader(name, patterns, true, matchBehaviour);
+        }
+
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string, string[], bool, MatchBehaviour)"/>
+        public IRequestBuilder WithHeader(string name, string[] patterns, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(patterns, nameof(patterns));
 
-            _requestMatchers.Add(new RequestMessageHeaderMatcher(name, patterns, ignoreCase));
+            _requestMatchers.Add(new RequestMessageHeaderMatcher(matchBehaviour, name, patterns, ignoreCase));
             return this;
         }
 
-        /// <summary>
-        /// With header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(string, IStringMatcher[])"/>
         public IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
@@ -353,11 +381,7 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// With header.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithHeader(Func{IDictionary{string, string[]}, bool}[])"/>
         public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));
@@ -366,25 +390,14 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// With cookie.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="pattern">The pattern.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true)
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithCookie(string, string, bool, MatchBehaviour)"/>
+        public IRequestBuilder WithCookie(string name, string pattern, bool ignoreCase = true, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
         {
-            _requestMatchers.Add(new RequestMessageCookieMatcher(name, pattern, ignoreCase));
+            _requestMatchers.Add(new RequestMessageCookieMatcher(matchBehaviour, name, pattern, ignoreCase));
             return this;
         }
 
-        /// <summary>
-        /// With cookie.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithCookie(string, IStringMatcher[])"/>
         public IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers)
         {
             Check.NotNullOrEmpty(matchers, nameof(matchers));
@@ -393,11 +406,7 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// With header.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IHeadersAndCookiesRequestBuilder.WithCookie(Func{IDictionary{string, string}, bool}[])"/>
         public IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));

src/WireMock.Net/RequestMessage.cs

@@ -4,13 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Net;
 using JetBrains.Annotations;
+using WireMock.Models;
 using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock
 {
     /// <summary>
-    /// The request.
+    /// The RequestMessage.
     /// </summary>
     public class RequestMessage
     {
@@ -20,20 +21,40 @@ namespace WireMock
         public string ClientIP { get; }
 
         /// <summary>
-        /// Gets the url.
+        /// Gets the url (relative).
         /// </summary>
         public string Url { get; }
 
+        /// <summary>
+        /// Gets the AbsoluteUrl.
+        /// </summary>
+        public string AbsoluteUrl { get; }
+
         /// <summary>
         /// Gets the DateTime.
         /// </summary>
         public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets the path.
+        /// Gets the path (relative).
         /// </summary>
         public string Path { get; }
 
+        /// <summary>
+        /// Gets the AbsolutePath.
+        /// </summary>
+        public string AbsolutePath { get; }
+
+        /// <summary>
+        /// Gets the path segments.
+        /// </summary>
+        public string[] PathSegments { get; }
+
+        /// <summary>
+        /// Gets the absolute path segments.
+        /// </summary>
+        public string[] AbsolutePathSegments { get; }
+
         /// <summary>
         /// Gets the method.
         /// </summary>
@@ -60,7 +81,7 @@ namespace WireMock
         public string RawQuery { get; }
 
         /// <summary>
-        /// The body as string.
+        /// The original body as string, this is defined when Body or BodyAsJson are not null.
         /// </summary>
         public string Body { get; }
 
@@ -102,24 +123,30 @@ namespace WireMock
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessage"/> class.
         /// </summary>
-        /// <param name="url">The original url.</param>
+        /// <param name="urlDetails">The original url details.</param>
         /// <param name="method">The HTTP method.</param>
         /// <param name="clientIP">The client IP Address.</param>
         /// <param name="body">The body.</param>
         /// <param name="headers">The headers.</param>
         /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] BodyData body, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        public RequestMessage([NotNull] UrlDetails urlDetails, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] BodyData body = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
         {
-            Check.NotNull(url, nameof(url));
+            Check.NotNull(urlDetails, nameof(urlDetails));
             Check.NotNull(method, nameof(method));
             Check.NotNull(clientIP, nameof(clientIP));
 
-            Url = url.ToString();
-            Protocol = url.Scheme;
-            Host = url.Host;
-            Port = url.Port;
-            Origin = $"{url.Scheme}://{url.Host}:{url.Port}";
-            Path = WebUtility.UrlDecode(url.AbsolutePath);
+            AbsoluteUrl = urlDetails.AbsoluteUrl.ToString();
+            Url = urlDetails.Url.ToString();
+            Protocol = urlDetails.Url.Scheme;
+            Host = urlDetails.Url.Host;
+            Port = urlDetails.Url.Port;
+            Origin = $"{Protocol}://{Host}:{Port}";
+
+            AbsolutePath = WebUtility.UrlDecode(urlDetails.AbsoluteUrl.AbsolutePath);
+            Path = WebUtility.UrlDecode(urlDetails.Url.AbsolutePath);
+            PathSegments = Path.Split('/').Skip(1).ToArray();
+            AbsolutePathSegments = AbsolutePath.Split('/').Skip(1).ToArray();
+
             Method = method.ToLower();
             ClientIP = clientIP;
 
@@ -130,41 +157,7 @@ namespace WireMock
 
             Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
             Cookies = cookies;
-            RawQuery = WebUtility.UrlDecode(url.Query);
-            Query = ParseQuery(RawQuery);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequestMessage"/> class.
-        /// </summary>
-        /// <param name="url">The original url.</param>
-        /// <param name="method">The HTTP method.</param>
-        /// <param name="clientIP">The client IP Address.</param>
-        /// <param name="bodyAsBytes">The bodyAsBytes byte[].</param>
-        /// <param name="body">The body string.</param>
-        /// <param name="bodyEncoding">The body encoding</param>
-        /// <param name="headers">The headers.</param>
-        /// <param name="cookies">The cookies.</param>
-        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] byte[] bodyAsBytes = null, [CanBeNull] string body = null, [CanBeNull] Encoding bodyEncoding = null, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
-        {
-            Check.NotNull(url, nameof(url));
-            Check.NotNull(method, nameof(method));
-            Check.NotNull(clientIP, nameof(clientIP));
-
-            Url = url.ToString();
-            Protocol = url.Scheme;
-            Host = url.Host;
-            Port = url.Port;
-            Origin = $"{url.Scheme}://{url.Host}:{url.Port}";
-            Path = WebUtility.UrlDecode(url.AbsolutePath);
-            Method = method.ToLower();
-            ClientIP = clientIP;
-            BodyAsBytes = bodyAsBytes;
-            Body = body;
-            BodyEncoding = bodyEncoding;
-            Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-            Cookies = cookies;
-            RawQuery = WebUtility.UrlDecode(url.Query);
+            RawQuery = WebUtility.UrlDecode(urlDetails.Url.Query);
             Query = ParseQuery(RawQuery);
         }
 

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -18,7 +18,6 @@ namespace WireMock.ResponseBuilders
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
         IResponseBuilder WithBody([NotNull] string body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
 
-
         /// <summary>
         /// WithBody : Create a ... response based on a callback function.
         /// </summary>
@@ -26,8 +25,7 @@ namespace WireMock.ResponseBuilders
         /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
         /// <param name="encoding">The body encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] Func<RequestMessage,string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
-
+        IResponseBuilder WithBody([NotNull] Func<RequestMessage, string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
 
         /// <summary>
         /// WithBody : Create a ... response based on a bytearray.
@@ -43,8 +41,17 @@ namespace WireMock.ResponseBuilders
         /// </summary>
         /// <param name="body">The body.</param>
         /// <param name="encoding">The body encoding.</param>
+        /// <param name="indented">Use JSON indented.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBodyAsJson([NotNull] object body, [CanBeNull] Encoding encoding = null);
+        IResponseBuilder WithBodyAsJson([NotNull] object body, [CanBeNull] Encoding encoding = null, bool? indented = null);
+
+        /// <summary>
+        /// WithBody : Create a string response based on a object (which will be converted to a JSON string).
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="indented">Define whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyAsJson([NotNull] object body, bool indented);
 
         /// <summary>
         /// WithBody : Create a string response based on a Base64 string (which will be decoded to a normal string).
@@ -52,7 +59,7 @@ namespace WireMock.ResponseBuilders
         /// <param name="bodyAsbase64">The body.</param>
         /// <param name="encoding">The Encoding.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        [Obsolete]
+        [Obsolete("Should not be used, will be removed in future.")]
         IResponseBuilder WithBodyFromBase64([NotNull] string bodyAsbase64, [CanBeNull] Encoding encoding = null);
 
         /// <summary>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -31,9 +31,6 @@ namespace WireMock.ResponseBuilders
         /// <summary>
         /// Gets a value indicating whether [use transformer].
         /// </summary>
-        /// <value>
-        ///   <c>true</c> if [use transformer]; otherwise, <c>false</c>.
-        /// </value>
         public bool UseTransformer { get; private set; }
 
         /// <summary>
@@ -176,7 +173,7 @@ namespace WireMock.ResponseBuilders
         }
 
         /// <inheritdoc cref="IBodyResponseBuilder.WithBody(byte[], string, Encoding)"/>
-        public IResponseBuilder WithBody(byte[] body, string destination, Encoding encoding = null)
+        public IResponseBuilder WithBody(byte[] body, string destination = BodyDestinationFormat.SameAsSource, Encoding encoding = null)
         {
             Check.NotNull(body, nameof(body));
 
@@ -258,18 +255,25 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyAsJson"/>
-        public IResponseBuilder WithBodyAsJson(object body, Encoding encoding = null)
+        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyAsJson(object, Encoding, bool?)"/>
+        public IResponseBuilder WithBodyAsJson(object body, Encoding encoding = null, bool? indented = null)
         {
             Check.NotNull(body, nameof(body));
 
             ResponseMessage.BodyDestination = null;
             ResponseMessage.BodyAsJson = body;
             ResponseMessage.BodyEncoding = encoding;
+            ResponseMessage.BodyAsJsonIndented = indented;
 
             return this;
         }
 
+        /// <inheritdoc cref="IBodyResponseBuilder.WithBodyAsJson(object, bool)"/>
+        public IResponseBuilder WithBodyAsJson(object body, bool indented)
+        {
+            return WithBodyAsJson(body, null, indented);
+        }
+
         /// <inheritdoc cref="IBodyResponseBuilder.WithBodyFromBase64"/>
         public IResponseBuilder WithBodyFromBase64(string bodyAsbase64, Encoding encoding = null)
         {