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,7 +1,79 @@
+# 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
 
 

GitReleaseNotes.txt

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

README.md

@@ -1,58 +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).
 
-[![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby)
-[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
-[![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 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

@@ -42,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
@@ -52,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
@@ -114,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
@@ -133,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}

appveyor.yml

@@ -1,6 +1,6 @@
 os: Visual Studio 2017
 
-version: 1.0.2.{build}
+version: 1.0.4.{build}
 
 configuration:
 - Debug
@@ -8,29 +8,34 @@ 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:
@@ -41,3 +46,4 @@ test_script:
   - 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
+  - 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.ConsoleApplication/MainApp.cs

@@ -38,6 +38,33 @@ namespace WireMock.Net.ConsoleApplication
 
             server.AllowPartialMapping();
 
+            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()
@@ -57,12 +84,22 @@ namespace WireMock.Net.ConsoleApplication
             server
                 .Given(Request
                     .Create()
-                    .WithPath("/jsonbodytest")
+                    .WithPath("/jsonbodytest1")
                     .WithBody(new JsonMatcher("{ \"x\": 42, \"s\": \"s\" }"))
                     .UsingPost())
                 .WithGuid("debaf408-3b23-4c04-9d18-ef1c020e79f2")
                 .RespondWith(Response.Create()
-                    .WithBody(@"{ ""result"": ""jsonbodytest"" }"));
+                    .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
@@ -71,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" }));
 
@@ -95,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
@@ -127,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)
@@ -184,8 +235,6 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(HttpStatusCode.Unauthorized)
                     .WithBody(@"{ ""result"": ""api-key missing""}"));
 
-
-
             server
                 .Given(Request.Create().WithPath("/nobody").UsingGet())
                 .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
@@ -195,7 +244,7 @@ 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
+            // http://localhost:8080/trans?start=1000&stop=1&stop=2
             server
                 .Given(Request.Create().WithPath("/trans").UsingGet())
                 .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
@@ -203,11 +252,52 @@ namespace WireMock.Net.ConsoleApplication
                     .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()
                     .WithPath("/state1")

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.4.1</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,19 +11,14 @@
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the value. Used by <see cref="Matchers.JsonMatcher"/>.
+        /// Gets or sets the pattern. Can be a string (default) or an object;
         /// </summary>
-        public string Value { get; set; }
+        public object Pattern { get; set; }
 
         /// <summary>
-        /// Gets or sets the pattern.
+        /// Gets or sets the patterns. Can be array of strings (default) or an array of objects;
         /// </summary>
-        public string Pattern { get; set; }
-
-        /// <summary>
-        /// Gets or sets the patterns.
-        /// </summary>
-        public string[] Patterns { get; set; }
+        public object[] Patterns { get; set; }
 
         /// <summary>
         /// Gets or sets the ignore case.

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

@@ -49,8 +49,8 @@ namespace WireMock.Logging
         /// 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>
+        /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
         [PublicAPI]
-        void DebugRequestResponse([NotNull] LogEntryModel logEntryModel, bool isAdminrequest);
+        void DebugRequestResponse([NotNull] LogEntryModel logEntryModel, bool isAdminRequest);
     }
 }

src/WireMock.Net/Logging/WireMockNullLogger.cs

@@ -11,26 +11,31 @@ namespace WireMock.Logging
         /// <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/IValueMatcher.cs

@@ -7,9 +7,9 @@
     public interface IValueMatcher: IObjectMatcher
     {
         /// <summary>
-        /// Gets the value.
+        /// Gets the value (can be a string or an obejct).
         /// </summary>
         /// <returns>Value</returns>
-        string GetValue();
+        object Value { get; }
     }
 }

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -63,7 +63,9 @@ namespace WireMock.Matchers
         public double IsMatch(object input)
         {
             double match = MatchScores.Mismatch;
-            if (input != null)
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
             {
                 try
                 {

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -10,7 +10,8 @@ namespace WireMock.Matchers
     /// </summary>
     public class JsonMatcher : IValueMatcher
     {
-        private readonly string _value;
+        /// <inheritdoc cref="IValueMatcher.Value"/>
+        public object Value { get; }
 
         /// <inheritdoc cref="IMatcher.Name"/>
         public string Name => "JsonMatcher";
@@ -21,36 +22,76 @@ namespace WireMock.Matchers
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
         /// </summary>
-        /// <param name="value">The value to check for equality.</param>
+        /// <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 value to check for equality.</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;
+            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;
-            if (input != null)
+
+            // When input is null or byte[], return Mismatch.
+            if (input != null && !(input is byte[]))
             {
                 try
                 {
                     // Check if JToken or object
-                    JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
+                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);
 
-                    match = JToken.DeepEquals(JToken.Parse(_value), jtoken);
+                    // 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)
                 {
@@ -60,8 +101,5 @@ namespace WireMock.Matchers
 
             return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
         }
-
-        /// <inheritdoc cref="IValueMatcher.GetValue"/>
-        public string GetValue() => _value;
     }
 }

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -1,5 +1,4 @@
-
-namespace WireMock.Matchers
+namespace WireMock.Matchers
 {
     internal static class MatchBehaviourHelper
     {

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

@@ -25,16 +25,16 @@ 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(MatchBehaviour matchBehaviour, [NotNull] string key) : this(matchBehaviour, key, null)
+        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key) : this(matchBehaviour, key, (IStringMatcher[])null)
         {
         }
 
@@ -44,13 +44,23 @@ namespace WireMock.Matchers.Request
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="key">The key.</param>
         /// <param name="values">The values.</param>
-        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [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>
@@ -78,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/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/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/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/OwinRequestMapper.cs

@@ -31,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()
@@ -68,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,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -49,8 +50,13 @@ namespace WireMock.Owin
                 else
                 {
 #if !NETSTANDARD
-                    response.Headers.AppendValues(pair.Key, pair.Value.ToArray());
+                    // 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
                 }
@@ -70,6 +76,11 @@ namespace WireMock.Owin
 #endif
             )
         {
+            if (responseMessage == null)
+            {
+                return;
+            }
+
             response.StatusCode = responseMessage.StatusCode;
 
             byte[] bytes = null;

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;
@@ -59,7 +60,10 @@ namespace WireMock.Owin
                     // Set start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
                     {
-                        _options.Scenarios.TryAdd(mapping.Scenario, null);
+                        _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
+                        {
+                            Name = mapping.Scenario
+                        });
                     }
                 }
 
@@ -67,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();
 
@@ -98,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;
                 }
 
@@ -110,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;
                     }
                 }
@@ -124,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
             {

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -22,9 +22,9 @@ namespace WireMock.Owin
 
         public bool AllowPartialMapping { get; set; }
 
-        public ConcurrentDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>(); // Checked
+        public ConcurrentDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>();
 
-        public ConcurrentDictionary<string, object> Scenarios { get; } = new ConcurrentDictionary<string, object>(); // Checked
+        public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new ConcurrentDictionary<string, ScenarioState>();
 
         public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurentObservableCollection<LogEntry>();
 

src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs

@@ -85,8 +85,8 @@ namespace WireMock.RequestBuilders
         /// <summary>
         /// 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

@@ -61,7 +61,7 @@ namespace WireMock.RequestBuilders
         /// UsingAnyVerb: add HTTP Method matching on any method.
         /// </summary>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        [Obsolete]
+        [Obsolete("Use the method UsingAnyMethod().")]
         IRequestBuilder UsingAnyVerb();
 
         /// <summary>
@@ -84,7 +84,7 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="verbs">The methods.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        [Obsolete]
+        [Obsolete("Use the method UsingMethod(...).")]
         IRequestBuilder UsingVerb([NotNull] params string[] verbs);
     }
 }

src/WireMock.Net/RequestBuilders/IParamsRequestBuilder.cs

@@ -27,6 +27,14 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params string[] values);
 
+        /// <summary>
+        /// WithParam: matching on key and matchers.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithParam([NotNull] string key, [CanBeNull] params IStringMatcher[] matchers);
+
         /// <summary>
         /// WithParam: matching on key, values and matchBehaviour.
         /// </summary>
@@ -36,6 +44,15 @@ namespace WireMock.RequestBuilders
         /// <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>

src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs

@@ -63,8 +63,8 @@ namespace WireMock.RequestBuilders
         /// <summary>
         /// WithUrl: add url matching based on functions.
         /// </summary>
-        /// <param name="func">The path func.</param>
+        /// <param name="funcs">The url functions.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params Func<string, bool>[] func);
+        IRequestBuilder WithUrl([NotNull] params Func<string, bool>[] funcs);
     }
 }

src/WireMock.Net/RequestBuilders/Request.cs

@@ -306,6 +306,12 @@ namespace WireMock.RequestBuilders
             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)
         {
@@ -315,6 +321,15 @@ namespace WireMock.RequestBuilders
             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;
+        }
+
         /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
         public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] 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,25 +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>
@@ -107,25 +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 = null, [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;
 
@@ -136,7 +157,7 @@ namespace WireMock
 
             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

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

@@ -173,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));
 

src/WireMock.Net/ResponseMessageBuilder.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using WireMock.Admin.Mappings;
+using WireMock.Http;
+using WireMock.Util;
+
+namespace WireMock
+{
+    internal static class ResponseMessageBuilder
+    {
+        private static string ContentTypeJson = "application/json";
+        private static readonly IDictionary<string, WireMockList<string>> ContentTypeJsonHeaders = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string> { ContentTypeJson } } };
+
+        internal static ResponseMessage Create(string message, int statusCode = 200, Guid? guid = null)
+        {
+            var response = new ResponseMessage
+            {
+                StatusCode = statusCode,
+                Headers = ContentTypeJsonHeaders,
+                BodyAsJson = message != null ? new StatusModel { Status = message, Guid = guid } : null
+            };
+
+            return response;
+        }
+    }
+}

src/WireMock.Net/ScenarioState.cs

@@ -0,0 +1,28 @@
+namespace WireMock
+{
+    /// <summary>
+    /// The ScenarioState
+    /// </summary>
+    public class ScenarioState
+    {
+        /// <summary>
+        /// Gets or sets the Name (from the Scenario).
+        /// </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="ScenarioState"/> is started.
+        /// </summary>
+        public bool Started { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="ScenarioState"/> is finished.
+        /// </summary>
+        public bool Finished { get; set; }
+    }
+}

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -17,7 +17,9 @@ namespace WireMock.Serialization
                     DateTime = logEntry.RequestMessage.DateTime,
                     ClientIP = logEntry.RequestMessage.ClientIP,
                     Path = logEntry.RequestMessage.Path,
-                    AbsoluteUrl = logEntry.RequestMessage.Url,
+                    AbsolutePath = logEntry.RequestMessage.AbsolutePath,
+                    Url = logEntry.RequestMessage.Url,
+                    AbsoluteUrl = logEntry.RequestMessage.AbsoluteUrl,
                     Query = logEntry.RequestMessage.Query,
                     Method = logEntry.RequestMessage.Method,
                     Body = logEntry.RequestMessage.Body,

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -37,19 +37,16 @@ namespace WireMock.Serialization
                     ClientIP = clientIPMatchers != null && clientIPMatchers.Any() ? new ClientIPModel
                     {
                         Matchers = MatcherMapper.Map(clientIPMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(clientIPMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Path = pathMatchers != null && pathMatchers.Any() ? new PathModel
                     {
                         Matchers = MatcherMapper.Map(pathMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(pathMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Url = urlMatchers != null && urlMatchers.Any() ? new UrlModel
                     {
                         Matchers = MatcherMapper.Map(urlMatchers.Where(m => m.Matchers != null).SelectMany(m => m.Matchers))
-                        //Funcs = Map(urlMatchers.Where(m => m.Funcs != null).SelectMany(m => m.Funcs))
                     } : null,
 
                     Methods = methodMatcher?.Methods,
@@ -58,28 +55,23 @@ namespace WireMock.Serialization
                     {
                         Name = hm.Name,
                         Matchers = MatcherMapper.Map(hm.Matchers)
-                        //Funcs = Map(hm.Funcs)
                     }).ToList() : null,
 
                     Cookies = cookieMatchers != null && cookieMatchers.Any() ? cookieMatchers.Select(cm => new CookieModel
                     {
                         Name = cm.Name,
                         Matchers = MatcherMapper.Map(cm.Matchers)
-                        //Funcs = Map(cm.Funcs)
                     }).ToList() : null,
 
                     Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
                     {
                         Name = pm.Key,
-                        Values = pm.Values?.ToList()
-                        //Funcs = Map(pm.Funcs)
+                        Matchers = MatcherMapper.Map(pm.Matchers)
                     }).ToList() : null,
 
                     Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
                     {
                         Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null
-                        //Func = bodyMatcher != null ? Map(bodyMatcher.Func) : null,
-                        //DataFunc = bodyMatcher != null ? Map(bodyMatcher.DataFunc) : null
                     }
                 },
                 Response = new ResponseModel
@@ -146,15 +138,5 @@ namespace WireMock.Serialization
 
             return newDictionary;
         }
-
-        //private static string[] Map<T>([CanBeNull] IEnumerable<Func<T, bool>> funcs)
-        //{
-        //    return funcs?.Select(Map).Where(x => x != null).ToArray();
-        //}
-
-        //private static string Map<T>([CanBeNull] Func<T, bool> func)
-        //{
-        //    return func?.ToString();
-        //}
     }
 }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -21,28 +21,28 @@ namespace WireMock.Serialization
             string matcherName = parts[0];
             string matcherType = parts.Length > 1 ? parts[1] : null;
 
-            string[] patterns = matcher.Patterns ?? new[] { matcher.Pattern };
+            string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.Cast<string>().ToArray() : new[] { matcher.Pattern as string };
             MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
 
             switch (matcherName)
             {
                 case "ExactMatcher":
-                    return new ExactMatcher(matchBehaviour, patterns);
+                    return new ExactMatcher(matchBehaviour, stringPatterns);
 
                 case "RegexMatcher":
-                    return new RegexMatcher(matchBehaviour, patterns, matcher.IgnoreCase == true);
+                    return new RegexMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
 
                 case "JsonMatcher":
                     return new JsonMatcher(matchBehaviour, matcher.Pattern);
 
                 case "JsonPathMatcher":
-                    return new JsonPathMatcher(matchBehaviour, patterns);
+                    return new JsonPathMatcher(matchBehaviour, stringPatterns);
 
                 case "XPathMatcher":
-                    return new XPathMatcher(matchBehaviour, matcher.Pattern);
+                    return new XPathMatcher(matchBehaviour, (string)matcher.Pattern);
 
                 case "WildcardMatcher":
-                    return new WildcardMatcher(matchBehaviour, patterns, matcher.IgnoreCase == true);
+                    return new WildcardMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
 
                 case "SimMetricsMatcher":
                     SimMetricType type = SimMetricType.Levenstein;
@@ -51,7 +51,7 @@ namespace WireMock.Serialization
                         throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
                     }
 
-                    return new SimMetricsMatcher(matchBehaviour, matcher.Pattern, type);
+                    return new SimMetricsMatcher(matchBehaviour, (string)matcher.Pattern, type);
 
                 default:
                     throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
@@ -70,9 +70,13 @@ namespace WireMock.Serialization
                 return null;
             }
 
-            string[] patterns = matcher is IStringMatcher stringMatcher ?
-                stringMatcher.GetPatterns() :
-                matcher is IValueMatcher valueMatcher ? new[] { valueMatcher.GetValue() } : new string[0];
+            // If the matcher is a IStringMatcher, get the patterns.
+            // If the matcher is a IValueMatcher, get the value (can be string or object).
+            // Else empty array
+            object[] patterns = matcher is IStringMatcher stringMatcher ?
+                stringMatcher.GetPatterns().Cast<object>().ToArray() :
+                matcher is IValueMatcher valueMatcher ? new[] { valueMatcher.Value } :
+                new object[0];
             bool? ignorecase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : (bool?)null;
             bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?)null;
 

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

@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
+using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
 using WireMock.Http;
 using WireMock.Logging;
@@ -41,7 +42,13 @@ namespace WireMock.Server
         private readonly JsonSerializerSettings _settings = new JsonSerializerSettings
         {
             Formatting = Formatting.Indented,
-            NullValueHandling = NullValueHandling.Ignore,
+            NullValueHandling = NullValueHandling.Ignore
+        };
+
+        private readonly JsonSerializerSettings _settingsIncludeNullValues = new JsonSerializerSettings
+        {
+            Formatting = Formatting.Indented,
+            NullValueHandling = NullValueHandling.Include
         };
 
         #region InitAdmin
@@ -114,7 +121,15 @@ namespace WireMock.Server
             foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
             {
                 _logger.Info("Reading Static MappingFile : '{0}'", filename);
-                ReadStaticMappingAndAddOrUpdate(filename);
+
+                try
+                {
+                    ReadStaticMappingAndAddOrUpdate(filename);
+                }
+                catch
+                {
+                    _logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
+                }
             }
         }
 
@@ -238,7 +253,11 @@ namespace WireMock.Server
                 }
             });
 
-            if (requestMessage.Body != null)
+            if (requestMessage.BodyAsJson != null)
+            {
+                request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyAsJson));
+            }
+            else if (requestMessage.Body != null)
             {
                 request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.Body));
             }
@@ -279,7 +298,7 @@ namespace WireMock.Server
                 _options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
             }
 
-            return new ResponseMessage { Body = "Settings updated" };
+            return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings
 
@@ -292,7 +311,7 @@ namespace WireMock.Server
             if (mapping == null)
             {
                 _logger.Warn("HttpStatusCode set to 404 : Mapping not found");
-                return new ResponseMessage { StatusCode = 404, Body = "Mapping not found" };
+                return ResponseMessageBuilder.Create("Mapping not found", 404);
             }
 
             var model = MappingConverter.ToMappingModel(mapping);
@@ -305,9 +324,9 @@ namespace WireMock.Server
             Guid guid = Guid.Parse(requestMessage.Path.TrimStart(AdminMappings.ToCharArray()));
 
             var mappingModel = DeserializeObject<MappingModel>(requestMessage);
-            DeserializeAndAddOrUpdateMapping(mappingModel, guid);
+            Guid? guidFromPut = DeserializeAndAddOrUpdateMapping(mappingModel, guid);
 
-            return new ResponseMessage { Body = "Mapping added or updated" };
+            return ResponseMessageBuilder.Create("Mapping added or updated", 200, guidFromPut);
         }
 
         private ResponseMessage MappingDelete(RequestMessage requestMessage)
@@ -316,10 +335,10 @@ namespace WireMock.Server
 
             if (DeleteMapping(guid))
             {
-                return new ResponseMessage { Body = "Mapping removed" };
+                return ResponseMessageBuilder.Create("Mapping removed", 200, guid);
             }
 
-            return new ResponseMessage { Body = "Mapping not found" };
+            return ResponseMessageBuilder.Create("Mapping not found", 404);
         }
         #endregion Mapping/{guid}
 
@@ -331,7 +350,7 @@ namespace WireMock.Server
                 SaveMappingToFile(mapping);
             }
 
-            return new ResponseMessage { Body = "Mappings saved to disk" };
+            return ResponseMessageBuilder.Create("Mappings saved to disk");
         }
 
         private void SaveMappingToFile(Mapping mapping)
@@ -370,35 +389,41 @@ namespace WireMock.Server
 
         private ResponseMessage MappingsPost(RequestMessage requestMessage)
         {
+            Guid? guid;
             try
             {
                 var mappingModel = DeserializeObject<MappingModel>(requestMessage);
-                DeserializeAndAddOrUpdateMapping(mappingModel);
+                guid = DeserializeAndAddOrUpdateMapping(mappingModel);
             }
             catch (ArgumentException a)
             {
                 _logger.Error("HttpStatusCode set to 400 {0}", a);
-                return new ResponseMessage { StatusCode = 400, Body = a.Message };
+                return ResponseMessageBuilder.Create(a.Message, 400);
             }
             catch (Exception e)
             {
                 _logger.Error("HttpStatusCode set to 500 {0}", e);
-                return new ResponseMessage { StatusCode = 500, Body = e.ToString() };
+                return ResponseMessageBuilder.Create(e.ToString(), 500);
             }
 
-            return new ResponseMessage { StatusCode = 201, Body = "Mapping added" };
+            return ResponseMessageBuilder.Create("Mapping added", 201, guid);
         }
 
-        private void DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
+        private Guid? DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
         {
             Check.NotNull(mappingModel, nameof(mappingModel));
             Check.NotNull(mappingModel.Request, nameof(mappingModel.Request));
             Check.NotNull(mappingModel.Response, nameof(mappingModel.Response));
 
-            var requestBuilder = InitRequestBuilder(mappingModel.Request);
+            var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
+            if (requestBuilder == null)
+            {
+                return null;
+            }
+
             var responseBuilder = InitResponseBuilder(mappingModel.Response);
 
-            IRespondWithAProvider respondProvider = Given(requestBuilder);
+            var respondProvider = Given(requestBuilder);
 
             if (guid != null)
             {
@@ -432,6 +457,8 @@ namespace WireMock.Server
             }
 
             respondProvider.RespondWith(responseBuilder);
+
+            return respondProvider.Guid;
         }
 
         private ResponseMessage MappingsDelete(RequestMessage requestMessage)
@@ -440,7 +467,7 @@ namespace WireMock.Server
 
             ResetScenarios();
 
-            return new ResponseMessage { Body = "Mappings deleted" };
+            return ResponseMessageBuilder.Create("Mappings deleted");
         }
         #endregion Mappings
 
@@ -453,7 +480,7 @@ namespace WireMock.Server
             if (entry == null)
             {
                 _logger.Warn("HttpStatusCode set to 404 : Request not found");
-                return new ResponseMessage { StatusCode = 404, Body = "Request not found" };
+                return ResponseMessageBuilder.Create("Request not found", 404);
             }
 
             var model = LogEntryMapper.Map(entry);
@@ -466,9 +493,11 @@ namespace WireMock.Server
             Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminRequests.Length + 1));
 
             if (DeleteLogEntry(guid))
-                return new ResponseMessage { Body = "Request removed" };
+            {
+                return ResponseMessageBuilder.Create("Request removed");
+            }
 
-            return new ResponseMessage { Body = "Request not found" };
+            return ResponseMessageBuilder.Create("Request not found", 404);
         }
         #endregion Request/{guid}
 
@@ -486,7 +515,7 @@ namespace WireMock.Server
         {
             ResetLogEntries();
 
-            return new ResponseMessage { Body = "Requests deleted" };
+            return ResponseMessageBuilder.Create("Requests deleted");
         }
         #endregion Requests
 
@@ -495,7 +524,7 @@ namespace WireMock.Server
         {
             var requestModel = DeserializeObject<RequestModel>(requestMessage);
 
-            var request = (Request)InitRequestBuilder(requestModel);
+            var request = (Request)InitRequestBuilder(requestModel, false);
 
             var dict = new Dictionary<LogEntry, RequestMatchResult>();
             foreach (var logEntry in LogEntries.Where(le => !le.RequestMessage.Path.StartsWith("/__admin/")))
@@ -516,24 +545,26 @@ namespace WireMock.Server
         #region Scenarios
         private ResponseMessage ScenariosGet(RequestMessage requestMessage)
         {
-            var scenarios = Scenarios.ToArray().Select(s => new
+            var scenariosStates = Scenarios.Values.Select(s => new ScenarioStateModel
             {
-                Name = s.Key,
-                Started = s.Value != null,
-                NextState = s.Value
+                Name = s.Name,
+                NextState = s.NextState,
+                Started = s.Started,
+                Finished = s.Finished
             });
-            return ToJson(scenarios);
+
+            return ToJson(scenariosStates, true);
         }
 
         private ResponseMessage ScenariosReset(RequestMessage requestMessage)
         {
             ResetScenarios();
 
-            return new ResponseMessage { Body = "Scenarios reset" };
+            return ResponseMessageBuilder.Create("Scenarios reset");
         }
         #endregion
 
-        private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
+        private IRequestBuilder InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
         {
             IRequestBuilder requestBuilder = Request.Create();
 
@@ -553,11 +584,13 @@ namespace WireMock.Server
                 }
             }
 
+            bool pathOrUrlmatchersValid = false;
             if (requestModel.Path != null)
             {
                 if (requestModel.Path is string path)
                 {
                     requestBuilder = requestBuilder.WithPath(path);
+                    pathOrUrlmatchersValid = true;
                 }
                 else
                 {
@@ -565,15 +598,16 @@ namespace WireMock.Server
                     if (pathModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+                        pathOrUrlmatchersValid = true;
                     }
                 }
             }
-
-            if (requestModel.Url != null)
+            else if (requestModel.Url != null)
             {
                 if (requestModel.Url is string url)
                 {
                     requestBuilder = requestBuilder.WithUrl(url);
+                    pathOrUrlmatchersValid = true;
                 }
                 else
                 {
@@ -581,10 +615,17 @@ namespace WireMock.Server
                     if (urlModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
+                        pathOrUrlmatchersValid = true;
                     }
                 }
             }
 
+            if (pathOrUrlRequired && !pathOrUrlmatchersValid)
+            {
+                _logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
+                return null;
+            }
+
             if (requestModel.Methods != null)
             {
                 requestBuilder = requestBuilder.UsingMethod(requestModel.Methods);
@@ -608,9 +649,9 @@ namespace WireMock.Server
 
             if (requestModel.Params != null)
             {
-                foreach (var paramModel in requestModel.Params)
+                foreach (var paramModel in requestModel.Params.Where(c => c.Matchers != null))
                 {
-                    requestBuilder = paramModel.Values == null ? requestBuilder.WithParam(paramModel.Name) : requestBuilder.WithParam(paramModel.Name, paramModel.Values.ToArray());
+                    requestBuilder = requestBuilder.WithParam(paramModel.Name, paramModel.Matchers.Select(MatcherMapper.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -683,7 +724,6 @@ namespace WireMock.Server
             {
                 responseBuilder = responseBuilder.WithBodyFromBase64(responseModel.BodyFromBase64, ToEncoding(responseModel.BodyEncoding));
             }
-
             else if (responseModel.BodyAsFile != null)
             {
                 responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
@@ -697,11 +737,11 @@ namespace WireMock.Server
             return responseBuilder;
         }
 
-        private ResponseMessage ToJson<T>(T result)
+        private ResponseMessage ToJson<T>(T result, bool keepNullValues = false)
         {
             return new ResponseMessage
             {
-                Body = JsonConvert.SerializeObject(result, _settings),
+                Body = JsonConvert.SerializeObject(result, keepNullValues ? _settingsIncludeNullValues : _settings),
                 StatusCode = 200,
                 Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>("application/json") } }
             };

src/WireMock.Net/Server/FluentMockServer.cs

@@ -14,6 +14,7 @@ using WireMock.Owin;
 using WireMock.RequestBuilders;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
+using WireMock.Transformers;
 using WireMock.Validation;
 
 namespace WireMock.Server
@@ -56,7 +57,30 @@ namespace WireMock.Server
         /// Gets the scenarios.
         /// </summary>
         [PublicAPI]
-        public ConcurrentDictionary<string, object> Scenarios => new ConcurrentDictionary<string, object>(_options.Scenarios); // Checked
+        public ConcurrentDictionary<string, ScenarioState> Scenarios => new ConcurrentDictionary<string, ScenarioState>(_options.Scenarios);
+
+        #region IDisposable Members
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_httpServer != null && _httpServer.IsStarted)
+            {
+                _httpServer.StopAsync();
+            }
+        }
+        #endregion
 
         #region Start/Stop
         /// <summary>
@@ -250,8 +274,7 @@ namespace WireMock.Server
         public void Stop()
         {
             var result = _httpServer?.StopAsync();
-            if (result != null)
-                result.Wait();          //wait for stop to actually happen
+            result?.Wait(); // wait for stop to actually happen
         }
         #endregion
 
@@ -264,18 +287,7 @@ namespace WireMock.Server
             Given(Request.Create().WithPath("/*").UsingAnyMethod())
                 .WithGuid(Guid.Parse("90008000-0000-4444-a17e-669cd84f1f05"))
                 .AtPriority(1000)
-                .RespondWith(new DynamicResponseProvider(request => new ResponseMessage { StatusCode = 404, Body = "No matching mapping found" }));
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            if (_httpServer != null && _httpServer.IsStarted)
-            {
-                _httpServer.StopAsync();
-            }
+                .RespondWith(new DynamicResponseProvider(request => ResponseMessageBuilder.Create("No matching mapping found", 404)));
         }
 
         /// <summary>
@@ -376,7 +388,6 @@ namespace WireMock.Server
         public void SetMaxRequestLogCount([CanBeNull] int? maxRequestLogCount)
         {
             _options.MaxRequestLogCount = maxRequestLogCount;
-
         }
 
         /// <summary>

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -8,6 +8,11 @@ namespace WireMock.Server
     /// </summary>
     public interface IRespondWithAProvider
     {
+        /// <summary>
+        /// Gets the unique identifier for this mapping.
+        /// </summary>
+        Guid Guid { get; }
+
         /// <summary>
         /// Define a unique identifier for this mapping.
         /// </summary>
@@ -61,13 +66,13 @@ namespace WireMock.Server
         /// </summary>
         /// <param name="state">Any object which identifies the current state</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WhenStateIs(object state);
+        IRespondWithAProvider WhenStateIs(string state);
 
         /// <summary>
         /// Once this mapping is executed the state will be changed to specified one.
         /// </summary>
         /// <param name="state">Any object which identifies the new state</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(object state);
+        IRespondWithAProvider WillSetStateTo(string state);
     }
 }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -10,15 +10,16 @@ namespace WireMock.Server
     internal class RespondWithAProvider : IRespondWithAProvider
     {
         private int _priority;
-        private Guid? _guid;
         private string _title;
         private string _path;
-        private object _executionConditionState;
-        private object _nextState;
+        private string _executionConditionState;
+        private string _nextState;
         private string _scenario;
         private readonly RegistrationCallback _registrationCallback;
         private readonly IRequestMatcher _requestMatcher;
 
+        public Guid Guid { get; private set; } = Guid.NewGuid();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RespondWithAProvider"/> class.
         /// </summary>
@@ -36,8 +37,7 @@ namespace WireMock.Server
         /// <param name="provider">The provider.</param>
         public void RespondWith(IResponseProvider provider)
         {
-            var mappingGuid = _guid ?? Guid.NewGuid();
-            _registrationCallback(new Mapping(mappingGuid, _title, _path, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState));
+            _registrationCallback(new Mapping(Guid, _title, _path, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState));
         }
 
         /// <see cref="IRespondWithAProvider.WithGuid(string)"/>
@@ -49,7 +49,7 @@ namespace WireMock.Server
         /// <see cref="IRespondWithAProvider.WithGuid(Guid)"/>
         public IRespondWithAProvider WithGuid(Guid guid)
         {
-            _guid = guid;
+            Guid = guid;
 
             return this;
         }
@@ -87,25 +87,20 @@ namespace WireMock.Server
         }
 
         /// <see cref="IRespondWithAProvider.WhenStateIs"/>
-        public IRespondWithAProvider WhenStateIs(object state)
+        public IRespondWithAProvider WhenStateIs(string state)
         {
             if (string.IsNullOrEmpty(_scenario))
             {
                 throw new NotSupportedException("Unable to set state condition when no scenario is defined.");
             }
 
-            //if (_nextState != null)
-            //{
-            //    throw new NotSupportedException("Unable to set state condition when next state is defined.");
-            //}
-
             _executionConditionState = state;
 
             return this;
         }
 
         /// <see cref="IRespondWithAProvider.WillSetStateTo"/>
-        public IRespondWithAProvider WillSetStateTo(object state)
+        public IRespondWithAProvider WillSetStateTo(string state)
         {
             if (string.IsNullOrEmpty(_scenario))
             {

src/WireMock.Net/Transformers/HandleBarsHelpers.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using HandlebarsDotNet;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Validation;
+
+namespace WireMock.Transformers
+{
+    internal static class HandlebarsHelpers
+    {
+        public static void Register()
+        {
+            Handlebars.RegisterHelper("JsonPath.SelectToken", (writer, context, arguments) =>
+            {
+                (JObject valueToProcess, string jsonpath) = Parse(arguments);
+
+                JToken result = null;
+                try
+                {
+                    result = valueToProcess.SelectToken(jsonpath);
+                }
+                catch (JsonException)
+                {
+                    // Ignore JsonException and return
+                    return;
+                }
+
+                if (result != null)
+                {
+                    writer.WriteSafeString(result);
+                }
+            });
+
+            Handlebars.RegisterHelper("JsonPath.SelectTokens", (writer, options, context, arguments) =>
+            {
+                (JObject valueToProcess, string jsonpath) = Parse(arguments);
+
+                IEnumerable<JToken> values = null;
+                try
+                {
+                    values = valueToProcess.SelectTokens(jsonpath);
+                }
+                catch (JsonException)
+                {
+                    // Ignore JsonException and return
+                    return;
+                }
+
+                if (values == null)
+                {
+                    return;
+                }
+
+                int id = 0;
+                foreach (JToken value in values)
+                {
+                    options.Template(writer, new { id, value });
+                    id++;
+                }
+            });
+        }
+
+        private static (JObject valueToProcess, string jsonpath) Parse(object[] arguments)
+        {
+            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
+            Check.NotNull(arguments[0], "arguments[0]");
+            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
+
+            JObject valueToProcess;
+
+            switch (arguments[0])
+            {
+                case string jsonAsString:
+                    valueToProcess = JObject.Parse(jsonAsString);
+                    break;
+
+                case JObject jsonAsJObject:
+                    valueToProcess = jsonAsJObject;
+                    break;
+
+                default:
+                    throw new NotSupportedException($"The value '{arguments[0]}' with type {arguments[0].GetType()} cannot be used in Handlebars JsonPath.");
+            }
+
+            return (valueToProcess, arguments[1] as string);
+        }
+    }
+}

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -2,12 +2,18 @@
 using System.Linq;
 using HandlebarsDotNet;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WireMock.Util;
 
 namespace WireMock.Transformers
 {
     internal static class ResponseMessageTransformer
     {
+        static ResponseMessageTransformer()
+        {
+            HandlebarsHelpers.Register();
+        }
+
         public static ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original)
         {
             bool bodyIsJson = original.BodyAsJson != null;
@@ -20,21 +26,13 @@ namespace WireMock.Transformers
 
             var template = new { request = requestMessage };
 
-            // Body
-            Formatting formatting = original.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
-            string body = bodyIsJson ? JsonConvert.SerializeObject(original.BodyAsJson, formatting) : original.Body;
-            if (body != null)
+            if (!bodyIsJson)
             {
-                var templateBody = Handlebars.Compile(body);
-
-                if (!bodyIsJson)
-                {
-                    responseMessage.Body = templateBody(template);
-                }
-                else
-                {
-                    responseMessage.BodyAsJson = JsonConvert.DeserializeObject(templateBody(template));
-                }
+                TransformBodyAsString(template, original, responseMessage);
+            }
+            else
+            {
+                TransformBodyAsJson(template, original, responseMessage);
             }
 
             // Headers
@@ -54,5 +52,79 @@ namespace WireMock.Transformers
 
             return responseMessage;
         }
+
+        private static void TransformBodyAsJson(object template, ResponseMessage original, ResponseMessage responseMessage)
+        {
+            JObject jobject;
+            switch (original.BodyAsJson)
+            {
+                case JObject bodyAsJObject:
+                    jobject = bodyAsJObject;
+                    break;
+
+                default:
+                    jobject = JObject.FromObject(original.BodyAsJson);
+                    break;
+            }
+
+            WalkNode(jobject, template);
+
+            responseMessage.BodyAsJson = jobject;
+        }
+
+        private static void WalkNode(JToken node, object template)
+        {
+            if (node.Type == JTokenType.Object)
+            {
+                // In case of Object, loop all children.
+                foreach (JProperty child in node.Children<JProperty>())
+                {
+                    WalkNode(child.Value, template);
+                }
+            }
+            else if (node.Type == JTokenType.Array)
+            {
+                // In case of Array, loop all items.
+                foreach (JToken child in node.Children())
+                {
+                    WalkNode(child, template);
+                }
+            }
+            else if (node.Type == JTokenType.String)
+            {
+                // In case of string, try to transform the value.
+                string stringValue = node.Value<string>();
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    return;
+                }
+
+                var templateForStringValue = Handlebars.Compile(stringValue);
+                string transformedString = templateForStringValue(template);
+                if (!string.Equals(stringValue, transformedString))
+                {
+                    JToken value;
+                    try
+                    {
+                        // Try to convert this string into a real JsonObject
+                        value = JToken.Parse(transformedString);
+                    }
+                    catch (JsonException)
+                    {
+                        // Ignore JsonException and just convert to JToken
+                        value = transformedString;
+                    }
+
+                    node.Replace(value);
+                }
+            }
+        }
+
+        private static void TransformBodyAsString(object template, ResponseMessage original, ResponseMessage responseMessage)
+        {
+            var templateBody = Handlebars.Compile(original.Body);
+
+            responseMessage.Body = templateBody(template);
+        }
     }
 }

src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs

@@ -9,9 +9,8 @@ namespace WireMock.Util
     /// <summary>
     /// An EnhancedFileSystemWatcher, which can be used to suppress duplicate events that fire on a single change to the file.
     /// </summary>
-    /// <seealso cref="System.IO.FileSystemWatcher" />
-    /// <seealso cref="System.IDisposable" />
-    public class EnhancedFileSystemWatcher : FileSystemWatcher, IDisposable
+    /// <seealso cref="FileSystemWatcher" />
+    public class EnhancedFileSystemWatcher : FileSystemWatcher
     {
         #region Private Members
         // Default Watch Interval in Milliseconds
@@ -251,15 +250,5 @@ namespace WireMock.Util
         }
         #endregion
         #endregion
-
-        #region IDisposable Members
-        /// <summary>
-        /// Releases all resources used by the <see cref="T:System.ComponentModel.Component" />.
-        /// </summary>
-        public new void Dispose()
-        {
-            base.Dispose();
-        }
-        #endregion
     }
 }

src/WireMock.Net/Util/UrlUtils.cs

@@ -0,0 +1,38 @@
+using System;
+using JetBrains.Annotations;
+using WireMock.Models;
+#if !NETSTANDARD
+using Microsoft.Owin;
+#else
+using Microsoft.AspNetCore.Http;
+#endif
+
+namespace WireMock.Util
+{
+    internal static class UrlUtils
+    {
+        public static UrlDetails Parse([NotNull] Uri uri, PathString pathBase)
+        {
+            if (!pathBase.HasValue)
+            {
+                return new UrlDetails(uri, uri);
+            }
+
+            var builder = new UriBuilder(uri);
+            builder.Path = RemoveFirst(builder.Path, pathBase.Value);
+
+            return new UrlDetails(uri, builder.Uri);
+        }
+
+        private static string RemoveFirst(string text, string search)
+        {
+            int pos = text.IndexOf(search);
+            if (pos < 0)
+            {
+                return text;
+            }
+
+            return text.Substring(0, pos) + text.Substring(pos + search.Length);
+        }
+    }
+}

src/WireMock.Net/Util/WireMockList.cs

@@ -38,10 +38,7 @@ namespace WireMock.Util
         /// </summary>
         public override string ToString()
         {
-            if (this != null && this.Any())
-                return this.First().ToString();
-
-            return base.ToString();
+            return this.Any() ? this.First().ToString() : base.ToString();
         }
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.4.1</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>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -40,7 +41,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="11.1.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Handlebars.Net" Version="1.9.0" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
@@ -49,25 +50,28 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.3" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
     <PackageReference Include="XPath2" Version="1.0.5.1" />
     <Reference Include="System.Net.Http.WebRequest" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.4" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
     <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
     <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
     <PackageReference Include="XPath2" Version="1.0.5.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

test/WireMock.Net.Tests/ClientTests.cs

@@ -33,10 +33,12 @@ namespace WireMock.Net.Tests
                 Priority = 500,
                 Title = "test"
             };
-            string result = await api.PostMappingAsync(model);
+            var result = await api.PostMappingAsync(model);
 
             // Assert
             Check.That(result).IsNotNull();
+            Check.That(result.Status).IsNotNull();
+            Check.That(result.Guid).IsNotNull();
 
             var mapping = server.Mappings.Single(m => m.Priority == 500);
             Check.That(mapping).IsNotNull();

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -88,7 +88,7 @@ namespace WireMock.Net.Tests
             string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
             string json = File.ReadAllText(folder);
 
-            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "ResponseBodyFiles", "responsebody.json");
+            string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
 
             dynamic jsonObj = JsonConvert.DeserializeObject(json);
             jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
@@ -585,6 +585,23 @@ namespace WireMock.Net.Tests
             Check.That(response).IsEqualTo("/fooBar");
         }
 
+        [Fact]
+        public async Task FluentMockServer_Should_exclude_restrictedResponseHeader_for_IOwinResponse()
+        {
+            _server = FluentMockServer.Start();
+
+            _server
+                .Given(Request.Create().WithPath("/foo").UsingGet())
+                .RespondWith(Response.Create().WithHeader("Keep-Alive", "").WithHeader("test", ""));
+
+            // Act
+            var response = await new HttpClient().GetAsync("http://localhost:" + _server.Ports[0] + "/foo");
+
+            // Assert
+            Check.That(response.Headers.Contains("test")).IsTrue();
+            Check.That(response.Headers.Contains("Keep-Alive")).IsFalse();
+        }
+
         public void Dispose()
         {
             _server?.Stop();

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using NFluent;
 using WireMock.Http;
+using WireMock.Models;
 using WireMock.Util;
 using Xunit;
 
@@ -21,7 +22,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsString = "<xml>hello</xml>"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -38,7 +39,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsBytes = Encoding.UTF8.GetBytes("hi")
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -55,7 +56,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsJson = new { x = 42 }
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -73,7 +74,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsJson = new { x = 42 }
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "GET", ClientIp, body, headers);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body, headers);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -92,7 +93,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsString = "<xml>hello</xml>"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -110,7 +111,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsString = "<xml>hello</xml>"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");
@@ -128,7 +129,7 @@ namespace WireMock.Net.Tests.Http
             {
                 BodyAsString = "<xml>hello</xml>"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, headers);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, headers);
 
             // Act
             var message = HttpRequestMessageHelper.Create(request, "http://url");

test/WireMock.Net.Tests/Matchers/JsonMatcherTests.cs

@@ -27,12 +27,26 @@ namespace WireMock.Net.Tests.Matchers
             var matcher = new JsonMatcher("{}");
 
             // Act
-            string value = matcher.GetValue();
+            object value = matcher.Value;
 
             // Assert
             Check.That(value).Equals("{}");
         }
 
+        [Fact]
+        public void JsonMatcher_IsMatch_ByteArray()
+        {
+            // Assign
+            var bytes = new byte[0];
+            var matcher = new JsonMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(bytes);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
         [Fact]
         public void JsonMatcher_IsMatch_NullString()
         {
@@ -62,7 +76,39 @@ namespace WireMock.Net.Tests.Matchers
         }
 
         [Fact]
-        public void JsonMatcher_IsMatch_JObject()
+        public void JsonMatcher_IsMatch_JObject1()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
+
+            // Act 
+            var jobject = new JObject
+            {
+                { "Id", new JValue(1) },
+                { "Name", new JValue("Test") }
+            };
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObject2()
+        {
+            // Assign 
+            var matcher = new JsonMatcher(new { Id = 1, Name = "Test" });
+
+            // Act 
+            var jobject = JObject.Parse("{ \"Id\" : 1, \"Name\" : \"Test\" }");
+            double match = matcher.IsMatch(jobject);
+
+            // Assert 
+            Assert.Equal(1.0, match);
+        }
+
+        [Fact]
+        public void JsonMatcher_IsMatch_JObjectAsString()
         {
             // Assign 
             var matcher = new JsonMatcher("{ \"Id\" : 1, \"Name\" : \"Test\" }");
@@ -80,7 +126,7 @@ namespace WireMock.Net.Tests.Matchers
         }
 
         [Fact]
-        public void JsonMatcher_IsMatch_JObject_RejectOnMatch()
+        public void JsonMatcher_IsMatch_JObjectAsString_RejectOnMatch()
         {
             // Assign 
             var matcher = new JsonMatcher(MatchBehaviour.RejectOnMatch, "{ \"Id\" : 1, \"Name\" : \"Test\" }");

test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs

@@ -33,6 +33,20 @@ namespace WireMock.Net.Tests.Matchers
             Check.That(patterns).ContainsExactly("X");
         }
 
+        [Fact]
+        public void JsonPathMatcher_IsMatch_ByteArray()
+        {
+            // Assign
+            var bytes = new byte[0];
+            var matcher = new JsonPathMatcher("");
+
+            // Act 
+            double match = matcher.IsMatch(bytes);
+
+            // Assert 
+            Check.That(match).IsEqualTo(0);
+        }
+
         [Fact]
         public void JsonPathMatcher_IsMatch_NullString()
         {

test/WireMock.Net.Tests/RequestCookieTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.RequestBuilders;
 using Xunit;
 
@@ -18,7 +19,7 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyMethod().WithCookie("session", "a*");
 
             // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, null, null, new Dictionary<string, string> { { "session", "abc" } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, null, null, new Dictionary<string, string> { { "session", "abc" } });
 
             // then
             var requestMatchResult = new RequestMatchResult();

test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs

@@ -3,6 +3,7 @@ using Moq;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.Util;
 using Xunit;
 
@@ -21,7 +22,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var stringMatcherMock = new Mock<IStringMatcher>();
             stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
 
@@ -48,7 +49,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var stringMatcherMock = new Mock<IStringMatcher>();
             stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
 
@@ -75,7 +76,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var stringMatcherMock = new Mock<IStringMatcher>();
             stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
 
@@ -102,7 +103,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var stringMatcherMock = new Mock<IStringMatcher>();
             stringMatcherMock.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(stringMatcherMock.Object);
 
@@ -128,7 +129,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var objectMatcherMock = new Mock<IObjectMatcher>();
             objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
 
@@ -154,7 +155,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var objectMatcherMock = new Mock<IObjectMatcher>();
             objectMatcherMock.Setup(m => m.IsMatch(It.IsAny<object>())).Returns(0.5d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", body);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
 
             var matcher = new RequestMessageBodyMatcher(objectMatcherMock.Object);
 

test/WireMock.Net.Tests/RequestMatchers/RequestMessageCompositeMatcherTests.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Moq;
 using NFluent;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using Xunit;
 
 namespace WireMock.Net.Tests.RequestMatchers
@@ -21,7 +22,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         public void RequestMessageCompositeMatcher_GetMatchingScore_EmptyArray()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new Helper(Enumerable.Empty<IRequestMatcher>());
 
             // Act
@@ -41,7 +42,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var requestMatcher2Mock = new Mock<IRequestMatcher>();
             requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object });
 
             // Act
@@ -65,7 +66,7 @@ namespace WireMock.Net.Tests.RequestMatchers
             var requestMatcher2Mock = new Mock<IRequestMatcher>();
             requestMatcher2Mock.Setup(rm => rm.GetMatchingScore(It.IsAny<RequestMessage>(), It.IsAny<RequestMatchResult>())).Returns(0.8d);
 
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new Helper(new[] { requestMatcher1Mock.Object, requestMatcher2Mock.Object }, CompositeMatcherType.Or);
 
             // Act

test/WireMock.Net.Tests/RequestMatchers/RequestMessageCookieMatcherTests.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using Xunit;
 
 namespace WireMock.Net.Tests.RequestMatchers
@@ -13,7 +14,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         public void RequestMessageCookieMatcher_GetMatchingScore_AcceptOnMatch_CookieDoesNotExists()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "c", "x");
 
             // Act
@@ -28,7 +29,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         public void RequestMessageCookieMatcher_GetMatchingScore_RejectOnMatch_CookieDoesNotExists()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "c", "x");
 
             // Act
@@ -44,7 +45,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "c", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "no-match", "123");
 
             // Act
@@ -59,7 +60,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "h", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "no-match", "123");
 
             // Act
@@ -75,7 +76,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "h", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.AcceptOnMatch, "h", "x");
 
             // Act
@@ -91,7 +92,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "h", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher(MatchBehaviour.RejectOnMatch, "h", "x");
 
             // Act
@@ -107,7 +108,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "cook", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher("cook", new ExactMatcher("x"));
 
             // Act
@@ -123,7 +124,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var cookies = new Dictionary<string, string> { { "cook", "x" } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, null, cookies);
             var matcher = new RequestMessageCookieMatcher(x => x.ContainsKey("cook"));
 
             // Act

test/WireMock.Net.Tests/RequestMatchers/RequestMessageHeaderMatcherTests.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using Xunit;
 
 namespace WireMock.Net.Tests.RequestMatchers
@@ -13,7 +14,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         public void RequestMessageHeaderMatcher_GetMatchingScore_AcceptOnMatch_HeaderDoesNotExists()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, "h", "x", true);
 
             // Act
@@ -28,7 +29,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         public void RequestMessageHeaderMatcher_GetMatchingScore_RejectOnMatch_HeaderDoesNotExists()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1");
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.RejectOnMatch, "h", "x", true);
 
             // Act
@@ -44,7 +45,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, "no-match", "123", true);
 
             // Act
@@ -59,7 +60,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.RejectOnMatch, "no-match", "123", true);
 
             // Act
@@ -75,7 +76,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.AcceptOnMatch, "h", "x", true);
 
             // Act
@@ -91,7 +92,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher(MatchBehaviour.RejectOnMatch, "h", "x", true);
 
             // Act
@@ -107,7 +108,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher("h", new ExactMatcher("x"));
 
             // Act
@@ -123,7 +124,7 @@ namespace WireMock.Net.Tests.RequestMatchers
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "h", new[] { "x" } } };
-            var requestMessage = new RequestMessage(new Uri("http://localhost"), "GET", "127.0.0.1", null, headers);
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", null, headers);
             var matcher = new RequestMessageHeaderMatcher(x => x.ContainsKey("h"));
 
             // Act

test/WireMock.Net.Tests/RequestMatchers/RequestMessageParamMatcherTests.cs

@@ -2,6 +2,7 @@
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using Xunit;
 
 namespace WireMock.Net.Tests.RequestMatchers
@@ -9,10 +10,10 @@ namespace WireMock.Net.Tests.RequestMatchers
     public class RequestMessageParamMatcherTests
     {
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_AllMatch()
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchExactOnStringValues()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
             var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", new[] { "test1", "test2" });
 
             // Act
@@ -24,10 +25,25 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_PartialMatch()
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchExactOnExactMatchers()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost?key=test0,test2"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test1,test2"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", new IStringMatcher[] { new ExactMatcher("test1"), new ExactMatcher("test2") });
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuesPresentInUrl_MatchOnKeyWithValues_PartialMatch()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=test0,test2"), "GET", "127.0.0.1");
             var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", new[] { "test1", "test2" });
 
             // Act
@@ -39,10 +55,10 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresent()
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithValues_Fails()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost?key"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
             var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", new[] { "test1", "test2" });
 
             // Act
@@ -54,10 +70,10 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresent_WithNull()
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKey()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost?key"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
             var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key");
 
             // Act
@@ -69,10 +85,10 @@ namespace WireMock.Net.Tests.RequestMatchers
         }
 
         [Fact]
-        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresent_WithEmptyArray()
+        public void RequestMessageParamMatcher_GetMatchingScore_OnlyKeyPresentInUrl_MatchOnKeyWithEmptyArray()
         {
             // Assign
-            var requestMessage = new RequestMessage(new Uri("http://localhost?key"), "GET", "127.0.0.1");
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key"), "GET", "127.0.0.1");
             var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key", new string[] { });
 
             // Act
@@ -82,5 +98,20 @@ namespace WireMock.Net.Tests.RequestMatchers
             // Assert
             Check.That(score).IsEqualTo(1.0d);
         }
+
+        [Fact]
+        public void RequestMessageParamMatcher_GetMatchingScore_KeyWithValuePresentInUrl_MatchOnKey()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost?key=frank@contoso.com"), "GET", "127.0.0.1");
+            var matcher = new RequestMessageParamMatcher(MatchBehaviour.AcceptOnMatch, "key");
+
+            // Act
+            var result = new RequestMatchResult();
+            double score = matcher.GetMatchingScore(requestMessage, result);
+
+            // Assert
+            Check.That(score).IsEqualTo(1.0d);
+        }
     }
 }

test/WireMock.Net.Tests/RequestMessageTests.cs

@@ -1,5 +1,6 @@
 using System;
 using NFluent;
+using WireMock.Models;
 using WireMock.Util;
 using Xunit;
 
@@ -13,7 +14,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_ParseQuery_NoKeys()
         {
             // given
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "POST", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp);
 
             // then
             Check.That(request.GetParameter("not_there")).IsNull();
@@ -23,7 +24,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_ParseQuery_SingleKey_SingleValue()
         {
             // Assign
-            var request = new RequestMessage(new Uri("http://localhost?foo=bar"), "POST", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost?foo=bar"), "POST", ClientIp);
 
             // Assert
             Check.That(request.GetParameter("foo")).ContainsExactly("bar");
@@ -33,7 +34,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_ParseQuery_MultipleKeys_MultipleValues()
         {
             // Assign
-            var request = new RequestMessage(new Uri("http://localhost?key=1&key=2"), "POST", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost?key=1&key=2"), "POST", ClientIp);
 
             // Assert
             Check.That(request.GetParameter("key")).Contains("1");
@@ -44,7 +45,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_ParseQuery_SingleKey_MultipleValues()
         {
             // Assign
-            var request = new RequestMessage(new Uri("http://localhost?key=1,2&foo=bar&key=3"), "POST", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost?key=1,2&foo=bar&key=3"), "POST", ClientIp);
 
             // Assert
             Check.That(request.GetParameter("key")).Contains("1");
@@ -56,7 +57,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_Constructor1_PathSegments()
         {
             // Assign
-            var request = new RequestMessage(new Uri("http://localhost/a/b/c"), "POST", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/a/b/c"), "POST", ClientIp);
 
             // Assert
             Check.That(request.PathSegments).ContainsExactly("a", "b", "c");
@@ -66,7 +67,7 @@ namespace WireMock.Net.Tests
         public void RequestMessage_Constructor2_PathSegments()
         {
             // Assign
-            var request = new RequestMessage(new Uri("http://localhost/a/b/c"), "POST", ClientIp, new BodyData());
+            var request = new RequestMessage(new UrlDetails("http://localhost/a/b/c"), "POST", ClientIp, new BodyData());
 
             // Assert
             Check.That(request.PathSegments).ContainsExactly("a", "b", "c");

test/WireMock.Net.Tests/RequestTests.cs

@@ -5,6 +5,7 @@ using NFluent;
 using Xunit;
 using WireMock.RequestBuilders;
 using WireMock.Matchers.Request;
+using WireMock.Models;
 using WireMock.Util;
 
 namespace WireMock.Net.Tests
@@ -20,7 +21,7 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithPath("/bar").UsingPut();
 
             // when
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp);
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -38,7 +39,7 @@ namespace WireMock.Net.Tests
             {
                 BodyAsString = "whatever"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -56,7 +57,7 @@ namespace WireMock.Net.Tests
             {
                 BodyAsString = "whatever"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "ABC" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "ABC" } } });
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -74,7 +75,7 @@ namespace WireMock.Net.Tests
             {
                 BodyAsString = "whatever"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "TaTa" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "TaTa" } } });
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -92,7 +93,7 @@ namespace WireMock.Net.Tests
             {
                 BodyAsString = "Hello world!"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body);
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -110,7 +111,7 @@ namespace WireMock.Net.Tests
             {
                 BodyAsString = "xxx"
             };
-            var request = new RequestMessage(new Uri("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "PUT", ClientIp, body, new Dictionary<string, string[]> { { "X-toto", new[] { "tata" } } });
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -124,7 +125,7 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithParam("bar", "1", "2");
 
             // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -138,7 +139,7 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().UsingAnyMethod().WithParam(p => p.ContainsKey("bar"));
 
             // when
-            var request = new RequestMessage(new Uri("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?bar=1&bar=2"), "PUT", ClientIp);
 
             // then
             var requestMatchResult = new RequestMatchResult();
@@ -152,7 +153,7 @@ namespace WireMock.Net.Tests
             var spec = Request.Create().WithParam("bar", "1");
 
             // when
-            var request = new RequestMessage(new Uri("http://localhost/test=7"), "PUT", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/test=7"), "PUT", ClientIp);
 
             // then
             var requestMatchResult = new RequestMatchResult();