Also handle application/x-www-form-urlencoded as string body

* Callback

* Add more tests

CHANGELOG.md

@@ -0,0 +1,184 @@
+# 1.0.3.4 (04 March 2018)
+
+ - [#102](https://github.com/WireMock-Net/WireMock.Net/pull/102) - Feature: add WithBody(req => dostuff) style callback contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree)) +feature
+ - [#101](https://github.com/WireMock-Net/WireMock.Net/pull/101) - ICallbackResponseBuilder + added more unit-tests contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +fix
+ - [#100](https://github.com/WireMock-Net/WireMock.Net/issues/100) - Question: JsonPathMatcher - not working for rootless jsons?
+ - [#99](https://github.com/WireMock-Net/WireMock.Net/pull/99) - feat: simple implementation/spike of dynamic responses using callbacks contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#98](https://github.com/WireMock-Net/WireMock.Net/issues/98) - IBodyResponseBuilder.WithBody* should receive the request as a parameter
+ - [#96](https://github.com/WireMock-Net/WireMock.Net/pull/96) - Replace log4net by custom logger (#94) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#95](https://github.com/WireMock-Net/WireMock.Net/pull/95) - Unittest fix contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#94](https://github.com/WireMock-Net/WireMock.Net/issues/94) - Issue: Introduced dependency on log4net
+ - [#93](https://github.com/WireMock-Net/WireMock.Net/issues/93) - Bug: FluentMockServer IsStarted after calling Start()
+ - [#66](https://github.com/WireMock-Net/WireMock.Net/issues/66) - Interested in callbacks?
+
+Commits: e850126184...a2df91a2a2
+
+
+# 1.0.3.3 (24 February 2018)
+
+ - [#92](https://github.com/WireMock-Net/WireMock.Net/pull/92) - Json fixes (#91) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#91](https://github.com/WireMock-Net/WireMock.Net/issues/91) - Bug: WireMock.Net is not matching application/json http requests using JSONPathMatcher +fix
+
+Commits: 1ffd56701c...ad6c59e3b5
+
+
+# 1.0.3.2 (14 February 2018)
+
+ - [#90](https://github.com/WireMock-Net/WireMock.Net/pull/90) - Concurrent issue (#88) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#89](https://github.com/WireMock-Net/WireMock.Net/pull/89) - Add log4net logging contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#88](https://github.com/WireMock-Net/WireMock.Net/issues/88) - Bug: Standalone server throws 500 error when receiving concurrent requests +fix
+ - [#87](https://github.com/WireMock-Net/WireMock.Net/issues/87) - Feature: Add logging
+
+Commits: 51070dab63...4f87146622
+
+
+# 1.0.3.0 (05 February 2018)
+
+ - [#86](https://github.com/WireMock-Net/WireMock.Net/issues/86) - Feature : Add FileSystemWatcher logic for watching static mapping files +feature
+ - [#85](https://github.com/WireMock-Net/WireMock.Net/issues/85) - Bug: https for netstandard does not work ? +fix
+ - [#83](https://github.com/WireMock-Net/WireMock.Net/issues/83) - Feature : Add also a method in IProxyResponseBuilder to provide proxy-settings +feature
+ - [#82](https://github.com/WireMock-Net/WireMock.Net/issues/82) - Feature: make it possible to ignore some headers when proxying +feature
+ - [#81](https://github.com/WireMock-Net/WireMock.Net/issues/81) - Feature: When using proxy, only BodyAsBytes in case of binary data?
+ - [#80](https://github.com/WireMock-Net/WireMock.Net/issues/80) - Feature: When using proxy, in case Content-Type is JSON, use BodyAsJson in Response
+
+Commits: 40ff8514ac...9778c5adbe
+
+
+# 1.0.2.13 (23 January 2018)
+
+ - [#79](https://github.com/WireMock-Net/WireMock.Net/pull/79) - Fix missed content headers contributed by ([vladimir-fed](https://github.com/vladimir-fed))
+ - [#78](https://github.com/WireMock-Net/WireMock.Net/issues/78) - WireMock not working when attempting to access from anything other than localhost.
+ - [#57](https://github.com/WireMock-Net/WireMock.Net/issues/57) - ProxyAndRecord does not save query-parameters, headers and body +fix
+
+Commits: 6d60b3773a...cdcaaa970a
+
+
+# 1.0.2.12 (16 January 2018)
+
+ - [#77](https://github.com/WireMock-Net/WireMock.Net/pull/77) - Fixed issue #76 contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#76](https://github.com/WireMock-Net/WireMock.Net/issues/76) - Bug: IFluentMockServerAdmin is missing content-type for some POST/PUT calls
+ - [#75](https://github.com/WireMock-Net/WireMock.Net/pull/75) - Add WireMock.Net.WebApplication example contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#74](https://github.com/WireMock-Net/WireMock.Net/pull/74) - Capturing the index of the existing mapping before removing and insert the updated mapping at the same index of the list contributed by ([raghavendrabankapur](https://github.com/raghavendrabankapur))
+ - [#73](https://github.com/WireMock-Net/WireMock.Net/issues/73) - Updated mapping is not being picked and responded with the response
+
+Commits: da798a59aa...e6af765777
+
+
+# 1.0.2.11 (20 December 2017)
+
+ - [#72](https://github.com/WireMock-Net/WireMock.Net/issues/72) - Matching WithParam on OData End Points
+
+Commits: 71196b51c9...71196b51c9
+
+
+# 1.0.2.9 (07 December 2017)
+
+ - [#71](https://github.com/WireMock-Net/WireMock.Net/pull/71) - Fixed restricted headers on response contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#69](https://github.com/WireMock-Net/WireMock.Net/issues/69) - Instructions are incorrect (?)
+
+Commits: 601af2d6b2...fd5bc203c3
+
+
+# 1.0.2.10 (12 December 2017)
+
+ - [#70](https://github.com/WireMock-Net/WireMock.Net/issues/70) - Proxy/Intercept pattern is throwing a keep alive header error with net461
+
+Commits: d0fc889f42...d0fc889f42
+
+
+# 1.0.2.8 (23 November 2017)
+
+ - [#68](https://github.com/WireMock-Net/WireMock.Net/issues/68) - Full path required in Stub
+ - [#67](https://github.com/WireMock-Net/WireMock.Net/pull/67) - bug: fix supporting the Patch method and logging the body contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#65](https://github.com/WireMock-Net/WireMock.Net/pull/65) - bug: Fix admin api client definition returning the wrong types contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#64](https://github.com/WireMock-Net/WireMock.Net/issues/64) - Pull Requests do not trigger test + codecoverage ?
+
+Commits: d0b48e2967...ea16ee866b
+
+
+# 1.0.2.7 (18 November 2017)
+
+ - [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by ([vladimir-fed](https://github.com/vladimir-fed))
+ - [#62](https://github.com/WireMock-Net/WireMock.Net/pull/62) - Add the Host, Protocol, Port and Origin to the Request message so they can be used in templating contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#61](https://github.com/WireMock-Net/WireMock.Net/issues/61) - Partial mapping
+ - [#53](https://github.com/WireMock-Net/WireMock.Net/issues/53) - New feature request: Access to Owin pipeline
+ - [#42](https://github.com/WireMock-Net/WireMock.Net/issues/42) - Enhancement - Save/load request logs to/from disk +feature
+ - [#27](https://github.com/WireMock-Net/WireMock.Net/issues/27) - New feature: Record and Save
+
+Commits: e25c873765...018d2a904d
+
+
+# 1.0.2.6 (30 October 2017)
+
+ - [#60](https://github.com/WireMock-Net/WireMock.Net/pull/60) - Fix proxy headers handling contributed by Oleksandr Liakhevych ([Dreamescaper](https://github.com/Dreamescaper))
+ - [#59](https://github.com/WireMock-Net/WireMock.Net/pull/59) - Add ability to provide multiple values for headers in response contributed by Oleksandr Liakhevych ([Dreamescaper](https://github.com/Dreamescaper))
+ - [#58](https://github.com/WireMock-Net/WireMock.Net/issues/58) - Multiple headers with same name +feature
+ - [#56](https://github.com/WireMock-Net/WireMock.Net/issues/56) - WithBodyFromFile Support +feature
+ - [#54](https://github.com/WireMock-Net/WireMock.Net/issues/54) - Proxy for AWS: Error unmarshalling response back from AWS +fix
+
+Commits: cbe6a0a2b4...d83f308591
+
+
+# 1.0.2.5 (24 October 2017)
+
+ - [#55](https://github.com/WireMock-Net/WireMock.Net/pull/55) - Fix the problem with headers passthrough contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen)) +fix
+ - [#52](https://github.com/WireMock-Net/WireMock.Net/issues/52) - SimMetrics.NET error when trying to install NuGet Package
+ - [#48](https://github.com/WireMock-Net/WireMock.Net/issues/48) - Stateful support +feature
+ - [#44](https://github.com/WireMock-Net/WireMock.Net/issues/44) - Bug: Server not listening after Start() returns (on macOS) +fix
+
+Commits: 7c289d44a7...15370a89ca
+
+
+# 1.0.2.4 (10 October 2017)
+
+ - [#51](https://github.com/WireMock-Net/WireMock.Net/pull/51) - Observable logs contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen))
+ - [#50](https://github.com/WireMock-Net/WireMock.Net/issues/50) - New Feature: Callbacks
+ - [#49](https://github.com/WireMock-Net/WireMock.Net/pull/49) - stateful behavior contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen))
+ - [#47](https://github.com/WireMock-Net/WireMock.Net/issues/47) - Feature: add matcher details to Request to see which matchers match/not match +feature
+ - [#46](https://github.com/WireMock-Net/WireMock.Net/issues/46) - Log the ip-address from the client/caller also in the RequestLog +feature
+ - [#45](https://github.com/WireMock-Net/WireMock.Net/pull/45) - Add RequestLogExpirationDuration and MaxRequestLogCount (#43) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#43](https://github.com/WireMock-Net/WireMock.Net/issues/43) - Feature: Add RequestLogExpirationDuration and MaxRequestLogCount
+ - [#41](https://github.com/WireMock-Net/WireMock.Net/pull/41) - Dotnet 20 preview final contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#40](https://github.com/WireMock-Net/WireMock.Net/pull/40) - Expose more settings to stand-alone app contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#39](https://github.com/WireMock-Net/WireMock.Net/pull/39) - Listen on http://*:9090 contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#38](https://github.com/WireMock-Net/WireMock.Net/issues/38) - Bug: support also listening on *:{port}
+ - [#37](https://github.com/WireMock-Net/WireMock.Net/issues/37) - Wrong Request Match result is returning
+ - [#36](https://github.com/WireMock-Net/WireMock.Net/issues/36) - How to implement a request body-dependent response?
+ - [#35](https://github.com/WireMock-Net/WireMock.Net/pull/35) - Revert changes that were made by mistake in prior PR contributed by ([phillee007](https://github.com/phillee007))
+ - [#34](https://github.com/WireMock-Net/WireMock.Net/issues/34) - Where is SearchLogsFor method?
+ - [#33](https://github.com/WireMock-Net/WireMock.Net/issues/33) - Issue with launching sample code (StandAlone server) +fix
+ - [#32](https://github.com/WireMock-Net/WireMock.Net/pull/32) - [Feature] Add support for client certificate password and test with real services that require client certificate auth contributed by ([phillee007](https://github.com/phillee007)) +feature
+ - [#31](https://github.com/WireMock-Net/WireMock.Net/issues/31) - Feature request: Nuget package for standalone version +feature
+ - [#20](https://github.com/WireMock-Net/WireMock.Net/issues/20) - Add client certificate authentication
+ - [#19](https://github.com/WireMock-Net/WireMock.Net/issues/19) - Is this the same as Mock4Net?
+ - [#15](https://github.com/WireMock-Net/WireMock.Net/issues/15) - New feature: Proxying +feature
+
+Commits: 538195551d...e87e09e10d
+
+
+# 1.02.1 (14 June 2017)
+
+ - [#30](https://github.com/WireMock-Net/WireMock.Net/issues/30) - [Feature] Disable partial mappings by default in standalone version +fix
+ - [#29](https://github.com/WireMock-Net/WireMock.Net/issues/29) - Support of .Net 4.0
+ - [#28](https://github.com/WireMock-Net/WireMock.Net/issues/28) - Facing issue with WildcardMatcher and '?'
+
+Commits: 84db9bbf0d...7111ab384b
+
+
+# 1.0.2.0 (05 May 2017)
+
+ - [#26](https://github.com/WireMock-Net/WireMock.Net/pull/26) - merge netstandard into main contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#25](https://github.com/WireMock-Net/WireMock.Net/issues/25) - Upgrade to vs2017 +feature
+ - [#23](https://github.com/WireMock-Net/WireMock.Net/issues/23) - Consider port to .Net Core
+ - [#21](https://github.com/WireMock-Net/WireMock.Net/issues/21) - Admin static json mappings +feature
+
+Commits: b547993415...8d9cef6dd1
+
+
+# 1.0.1.2 (27 February 2017)
+
+ - [#24](https://github.com/WireMock-Net/WireMock.Net/pull/24) - Body Encoding contributed by Sebastian Bebrys ([sbebrys](https://github.com/sbebrys))
+ - [#22](https://github.com/WireMock-Net/WireMock.Net/issues/22) - Add basic-authentication for accessing admin-interface +feature
+ - [#8](https://github.com/WireMock-Net/WireMock.Net/issues/8) - admin rest api
+
+Commits: bb35f55bbb...02803562c6

GitReleaseNotes.txt

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

README.md

@@ -2,7 +2,6 @@
 A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based http://WireMock.org
 
 [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net)
-[![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)
 [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master)
 [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
 [![GitHub stars](https://img.shields.io/github/stars/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/stargazers)
@@ -43,6 +42,16 @@ This is quite straight forward to launch a mock server within a console applicat
 ### 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 server = FluentMockServer.Start(port: 8443, ssl: true);
+var server1 = FluentMockServer.Start(port: 8443, ssl: true);
+
+// or like this
+
+var server2 = FluentMockServer.Start(new FluentMockServerSettings
+{
+    Urls = new[] { "http://localhost:9091", "https://localhost:9443" }
+});
 ```
-Obviously 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, 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)
+
+- 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).
+
+- When using **netstandard**, WireMock.Net uses a self signed certificate (which can be overriden if you like) to host https urls.

WireMock.Net Solution.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -9,7 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.runsettings = .runsettings
 		appveyor.yml = appveyor.yml
+		CHANGELOG.md = CHANGELOG.md
 		codecov-local.cmd = codecov-local.cmd
+		GitReleaseNotes.txt = GitReleaseNotes.txt
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -23,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Tests", "test\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Record.NETCoreApp", "examples\WireMock.Net.Console.Record.NETCoreApp\WireMock.Net.Console.Record.NETCoreApp.csproj", "{1995E414-F197-4AB4-90C2-68D806B5AF59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp", "examples\WireMock.Net.Console.Record.NETCoreApp\WireMock.Net.Console.Proxy.NETCoreApp.csproj", "{1995E414-F197-4AB4-90C2-68D806B5AF59}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
 EndProject
@@ -40,6 +42,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.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
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp2", "examples\WireMock.Net.Console.Proxy.NETCoreApp2\WireMock.Net.Console.Proxy.NETCoreApp2.csproj", "{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -86,6 +92,14 @@ Global
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -101,6 +115,8 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

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

@@ -1,11 +1,21 @@
-using WireMock.Net.ConsoleApplication;
+using System.IO;
+using System.Reflection;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using WireMock.Net.ConsoleApplication;
 
 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"));
+
             MainApp.Run();
         }
     }

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

@@ -22,10 +22,17 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <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>
     <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -27,7 +27,7 @@
     },
     "UseTransformer": false,
     "Headers": {
-      "Date": "Wed, 25 Oct 2017 18:57:40 GMT",
+      "Date": "Wed, 27 Oct 2017 18:57:40 GMT",
       "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"39,38,37,35\"",
       "Referrer-Policy": "no-referrer",
       "Connection": "close"

examples/WireMock.Net.Console.NETCoreApp/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.NETCoreApp/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.Proxy.NETCoreApp2/Program.cs

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.NETCoreApp2
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
+                StartAdminInterface = true,
+                ReadStaticMappings = false,
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "https://www.google.com",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    SaveMapping = true,
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                }
+            });
+
+            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            {
+                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            };
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+        }
+    }
+}

examples/WireMock.Net.Console.Proxy.NETCoreApp2/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:63377/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "WireMock.Net.Console.Proxy.NETCoreApp2": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:63378/"
+    }
+  }
+}

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

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.Proxy.Net452/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    </startup>
+</configuration>

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

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.Net452
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
+                StartAdminInterface = true,
+                ReadStaticMappings = false,
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "https://www.google.com",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    SaveMapping = true,
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                }
+            });
+
+            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            {
+                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            };
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+        }
+    }
+}

examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WireMock.Net.Console.Proxy.Net452")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WireMock.Net.Console.Proxy.Net452")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("26433a8f-bf01-4962-97eb-81bffbb61096")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{26433A8F-BF01-4962-97EB-81BFFBB61096}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Console.Proxy.Net452</RootNamespace>
+    <AssemblyName>WireMock.Net.Console.Proxy.Net452</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.Console.Proxy.Net452.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Condition="'$(Platform)' == 'x64'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x64\native\libuv.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+      <Link>libuv.dll</Link>
+    </None>
+    <None Condition="'$(Platform)' == 'x86'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x86\native\libuv.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+      <Link>libuv.dll</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\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.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
+</packages>

examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs

@@ -2,7 +2,7 @@
 using WireMock.Server;
 using WireMock.Settings;
 
-namespace WireMock.Net.Console.Record.NETCoreApp
+namespace WireMock.Net.Console.Proxy.NETCoreApp
 {
     static class Program
     {
@@ -16,9 +16,10 @@ namespace WireMock.Net.Console.Record.NETCoreApp
                 ProxyAndRecordSettings = new ProxyAndRecordSettings
                 {
                     Url = "https://www.google.com",
-                    //X509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
-                    SaveMappingToFile = false
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new [] { "dnt", "Content-Length" }
                 }
             });
 

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

@@ -6,13 +6,9 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CommandLineArgumentsParser" Version="3.0.10" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -21,6 +21,7 @@ namespace WireMock.Net.ConsoleApplication
                 Urls = new[] { url1, url2, url3 },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
+                WatchStaticMappings = true,
                 //ProxyAndRecordSettings = new ProxyAndRecordSettings
                 //{
                 //    SaveMapping = true
@@ -28,7 +29,7 @@ namespace WireMock.Net.ConsoleApplication
                 PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                 PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
             });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(" and ", server.Urls));
+            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
 
             server.SetBasicAuthentication("a", "b");
 
@@ -40,6 +41,15 @@ namespace WireMock.Net.ConsoleApplication
             //    .RespondWith(Response.Create()
             //    .WithProxy("http://restcountries.eu"));
 
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonthings")
+                    .WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"))
+                    .UsingPut())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""JsonPathMatcher !!!""}"));
+
             server
                 .Given(Request
                     .Create()
@@ -53,8 +63,9 @@ namespace WireMock.Net.ConsoleApplication
                 .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
                 .RespondWith(Response.Create()
                     .WithStatusCode(201)
-                    .WithHeader("MyHeader", "application/json", "application/json2")
-                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
+                    //.WithHeader("MyHeader", "application/json", "application/json2")
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "data:headers posted with 201" }));
 
             server
                 .Given(Request.Create().WithPath("/file").UsingGet())
@@ -116,7 +127,7 @@ namespace WireMock.Net.ConsoleApplication
                 .RespondWith(Response.Create()
                     .WithStatusCode(201)
                     .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with FUNC 201""}"));
+                    .WithBodyAsJson(new { result = "data posted with FUNC 201" }));
 
             server
                 .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))

examples/WireMock.Net.ConsoleApplication/Program.cs

@@ -1,9 +1,14 @@
-namespace WireMock.Net.ConsoleApplication
+using System.IO;
+using log4net.Config;
+
+namespace WireMock.Net.ConsoleApplication
 {
     static class Program
     {
         static void Main(params string[] args)
         {
+            XmlConfigurator.Configure(new FileInfo("log4net.config"));
+
             MainApp.Run();
         }
     }

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

@@ -36,17 +36,22 @@
     <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <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.CSharp" />
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\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.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.3\lib\net45\SimMetrics.Net.dll</HintPath>
+    <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainApp.cs" />
@@ -57,6 +62,9 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

examples/WireMock.Net.ConsoleApplication/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.ConsoleApplication/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.3" targetFramework="net452" />
+  <package id="SimMetrics.Net" version="1.0.4" targetFramework="net452" />
 </packages>

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

@@ -1,17 +1,27 @@
 using System;
+using System.IO;
+using System.Reflection;
 using System.Threading;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
 using WireMock.Server;
 
 namespace WireMock.Net.StandAlone.NETCoreApp
 {
-    class Program
+    static class Program
     {
+        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+        // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
         private static int sleepTime = 30000;
         private static FluentMockServer _server;
 
         static void Main(string[] args)
         {
-            _server = StandAloneApp.Start(args);
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
+
+            _server = StandAloneApp.Start(args, new WireMockLog4NetLogger());
 
             Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
 
@@ -27,7 +37,7 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             while (true)
             {
-                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running");
+                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
                 Thread.Sleep(sleepTime);
             }
         }

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

@@ -6,8 +6,18 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.8" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

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

@@ -0,0 +1,30 @@
+using log4net;
+using WireMock.Logging;
+
+namespace WireMock.Net.StandAlone.NETCoreApp
+{
+    internal class WireMockLog4NetLogger : IWireMockLogger
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        public void Debug(string formatString, params object[] args)
+        {
+            Log.DebugFormat(formatString, args);
+        }
+
+        public void Info(string formatString, params object[] args)
+        {
+            Log.InfoFormat(formatString, args);
+        }
+
+        public void Warn(string formatString, params object[] args)
+        {
+            Log.WarnFormat(formatString, args);
+        }
+
+        public void Error(string formatString, params object[] args)
+        {
+            Log.ErrorFormat(formatString, args);
+        }
+    }
+}

examples/WireMock.Net.StandAlone.NETCoreApp/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.StandAlone.Net452/Program.cs

@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using log4net.Config;
 
 namespace WireMock.Net.StandAlone.Net452
 {
@@ -6,6 +8,8 @@ namespace WireMock.Net.StandAlone.Net452
     {
         static void Main(params string[] args)
         {
+            XmlConfigurator.Configure(new FileInfo("log4net.config"));
+
             StandAloneApp.Start(args);
 
             Console.WriteLine("Press any key to stop the server");

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

@@ -39,6 +39,9 @@
     <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <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="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
@@ -50,6 +53,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

examples/WireMock.Net.StandAlone.Net452/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.StandAlone.Net452/packages.config

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
 </packages>

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Linq;
+using System.Linq;
 using WireMock.Server;
 using WireMock.Settings;
 using WireMock.Validation;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
+using WireMock.Logging;
 
 namespace WireMock.Net.StandAlone
 {
@@ -14,7 +13,7 @@ namespace WireMock.Net.StandAlone
     public static class StandAloneApp
     {
         /// <summary>
-        /// Start WireMock.Net standalone based on the FluentMockServerSettings.
+        /// Start WireMock.Net standalone Server based on the FluentMockServerSettings.
         /// </summary>
         /// <param name="settings">The FluentMockServerSettings</param>
         [PublicAPI]
@@ -26,16 +25,15 @@ namespace WireMock.Net.StandAlone
         }
 
         /// <summary>
-        /// Start WireMock.Net standalone based on the commandline arguments.
+        /// Start WireMock.Net standalone Server based on the commandline arguments.
         /// </summary>
         /// <param name="args">The commandline arguments</param>
+        /// <param name="logger">The logger</param>
         [PublicAPI]
-        public static FluentMockServer Start([NotNull] string[] args)
+        public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
         {
             Check.NotNull(args, nameof(args));
 
-            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
-
             var parser = new SimpleCommandLineParser();
             parser.Parse(args);
 
@@ -43,6 +41,7 @@ namespace WireMock.Net.StandAlone
             {
                 StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
                 ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
+                WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
                 AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping", true),
                 AdminUsername = parser.GetStringValue("AdminUsername"),
                 AdminPassword = parser.GetStringValue("AdminPassword"),
@@ -50,6 +49,11 @@ namespace WireMock.Net.StandAlone
                 RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
             };
 
+            if (logger != null)
+            {
+                settings.Logger = logger;
+            }
+
             if (parser.Contains("Port"))
             {
                 settings.Port = parser.GetIntValue("Port");
@@ -67,15 +71,16 @@ namespace WireMock.Net.StandAlone
                     Url = proxyURL,
                     SaveMapping = parser.GetBoolValue("SaveMapping"),
                     SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
-                    X509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("X509Certificate2ThumbprintOrSubjectName")
+                    ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
+                    BlackListedHeaders = parser.GetValues("BlackListedHeaders")
                 };
             }
 
-            Console.WriteLine("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 
             FluentMockServer server = Start(settings);
 
-            Console.WriteLine("WireMock.Net server listening at {0}", string.Join(" and ", server.Urls));
+            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
 
             return server;
         }

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

@@ -1,26 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.2.13</Version>
+    <Version>1.0.3.4</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
     <PackageId>WireMock.Net.StandAlone</PackageId>
     <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <PackageReleaseNotes></PackageReleaseNotes>
+    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <DebugType>portable</DebugType>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
     <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
   </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>NETSTANDARD</DefineConstants>
@@ -30,10 +36,6 @@
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <!-- <PackageReference Include="CommandLineArgumentsParser" Version="3.0.16" /> -->
-    <!-- <PackageReference Include="Marsonsoft.CommandLineParser" Version="1.0.34" /> -->
-    <!-- <PackageReference Include="BurnSystems.CommandLine" Version="1.1.0" /> -->
-    <!-- <ProjectReference Include="..\..\..\CommandLineParser\src\CommandLineArgumentsParser\CommandLineArgumentsParser.csproj" /> -->
   </ItemGroup>
 
   <ItemGroup>

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

@@ -10,29 +10,20 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the unique identifier.
         /// </summary>
-        /// <value>
-        /// The unique identifier.
-        /// </value>
         public Guid? Guid { get; set; }
 
         /// <summary>
-        /// Gets or sets the unique title.
-        /// </summary>
-        /// <value>
         /// The unique title.
-        /// </value>
+        /// </summary>
         public string Title { get; set; }
 
         /// <summary>
-        /// Gets or sets the priority.
-        /// </summary>
-        /// <value>
         /// The priority.
-        /// </value>
+        /// </summary>
         public int? Priority { get; set; }
 
         /// <summary>
-        /// Scenario.
+        /// The Scenario.
         /// </summary>
         public string Scenario { get; set; }
 
@@ -48,19 +39,13 @@ namespace WireMock.Admin.Mappings
         public object SetStateTo { get; set; }
 
         /// <summary>
-        /// Gets or sets the request.
-        /// </summary>
-        /// <value>
         /// The request.
-        /// </value>
+        /// </summary>
         public RequestModel Request { get; set; }
 
         /// <summary>
-        /// Gets or sets the response.
-        /// </summary>
-        /// <value>
         /// The response.
-        /// </value>
+        /// </summary>
         public ResponseModel Response { get; set; }
     }
 }

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

@@ -8,51 +8,33 @@ namespace WireMock.Admin.Requests
     public class LogEntryModel
     {
         /// <summary>
-        /// Gets or sets the unique identifier.
-        /// </summary>
-        /// <value>
         /// The unique identifier.
-        /// </value>
+        /// </summary>
         public Guid Guid { get; set; }
 
         /// <summary>
-        /// Gets or sets the request.
-        /// </summary>
-        /// <value>
         /// The request.
-        /// </value>
+        /// </summary>
         public LogRequestModel Request { get; set; }
 
         /// <summary>
-        /// Gets or sets the response.
-        /// </summary>
-        /// <value>
         /// The response.
-        /// </value>
+        /// </summary>
         public LogResponseModel Response { get; set; }
 
         /// <summary>
-        /// Gets or sets the mapping unique identifier.
-        /// </summary>
-        /// <value>
         /// The mapping unique identifier.
-        /// </value>
+        /// </summary>
         public Guid? MappingGuid { get; set; }
 
         /// <summary>
-        /// Gets or sets the mapping unique title.
-        /// </summary>
-        /// <value>
         /// The mapping unique title.
-        /// </value>
+        /// </summary>
         public string MappingTitle { get; set; }
 
         /// <summary>
-        /// Gets or sets the request match result.
-        /// </summary>
-        /// <value>
         /// The request match result.
-        /// </value>
+        /// </summary>
         public LogRequestMatchModel RequestMatchResult { get; set; }
     }
 }

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

@@ -11,52 +11,62 @@ namespace WireMock.Admin.Requests
     public class LogRequestModel
     {
         /// <summary>
-        /// Gets the Client IP Address.
+        /// The Client IP Address.
         /// </summary>
         public string ClientIP { get; set; }
 
         /// <summary>
-        /// Gets the DateTime.
+        /// The DateTime.
         /// </summary>
         public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets or sets the Path.
+        /// The Path.
         /// </summary>
         public string Path { get; set; }
 
         /// <summary>
-        /// Gets or sets the absolete URL.
+        ///The absolete URL.
         /// </summary>
         public string AbsoluteUrl { get; set; }
 
         /// <summary>
-        /// Gets the query.
+        /// The query.
         /// </summary>
         public IDictionary<string, WireMockList<string>> Query { get; set; }
 
         /// <summary>
-        /// Gets or sets the method.
+        /// The method.
         /// </summary>
         public string Method { get; set; }
 
         /// <summary>
-        /// Gets or sets the Headers.
+        /// The Headers.
         /// </summary>
         public IDictionary<string, WireMockList<string>> Headers { get; set; }
 
         /// <summary>
-        /// Gets or sets the Cookies.
+        /// Tthe Cookies.
         /// </summary>
         public IDictionary<string, string> Cookies { get; set; }
 
         /// <summary>
-        /// Gets or sets the body.
+        /// The body (as string).
         /// </summary>
         public string Body { get; set; }
 
         /// <summary>
-        /// Gets or sets the body encoding.
+        /// The body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
+        /// </summary>
+        public byte[] BodyAsBytes { get; set; }
+
+        /// <summary>
+        /// The body encoding.
         /// </summary>
         public EncodingModel BodyEncoding { get; set; }
     }

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

@@ -25,12 +25,17 @@ namespace WireMock.Admin.Requests
         public string BodyDestination { get; set; }
 
         /// <summary>
-        /// Gets or sets the body.
+        /// The body (as string).
         /// </summary>
         public string Body { get; set; }
 
         /// <summary>
-        /// Gets or sets the body as bytes.
+        /// The body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
         /// </summary>
         public byte[] BodyAsBytes { get; set; }
 

src/WireMock.Net/DynamicResponseProvider.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using WireMock.Validation;
-using WireMock.Settings;
-
-namespace WireMock
-{
-    internal class DynamicResponseProvider : IResponseProvider
-    {
-        private readonly Func<RequestMessage, ResponseMessage> _responseMessageFunc;
-
-        public DynamicResponseProvider([NotNull] Func<RequestMessage, ResponseMessage> responseMessageFunc)
-        {
-            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
-
-            _responseMessageFunc = responseMessageFunc;
-        }
-
-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
-        {
-            return Task.FromResult(_responseMessageFunc(requestMessage));
-        }
-    }
-
-    internal class DynamicAsyncResponseProvider : IResponseProvider
-    {
-        private readonly Func<RequestMessage, Task<ResponseMessage>> _responseMessageFunc;
-
-        public DynamicAsyncResponseProvider([NotNull] Func<RequestMessage, Task<ResponseMessage>> responseMessageFunc)
-        {
-            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
-
-            _responseMessageFunc = responseMessageFunc;
-        }
-
-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
-        {
-            return _responseMessageFunc(requestMessage);
-        }
-    }
-
-    internal class ProxyAsyncResponseProvider : IResponseProvider
-    {
-        private readonly Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly IProxyAndRecordSettings _settings;
-
-        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] IProxyAndRecordSettings settings)
-        {
-            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
-            Check.NotNull(settings, nameof(settings));
-
-            _responseMessageFunc = responseMessageFunc;
-            _settings = settings;
-        }
-
-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
-        {
-            return _responseMessageFunc(requestMessage, _settings);
-        }
-    }
-}

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -1,7 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using WireMock.HttpsCertificate;
+using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock.Http
@@ -10,37 +16,28 @@ namespace WireMock.Http
     {
         public static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
         {
-            HttpClientHandler handler;
-
-            if (string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
-            {
-                handler = new HttpClientHandler();
-            }
-            else
-            {
 #if NETSTANDARD || NET46
-                handler = new HttpClientHandler
-                {
-                    ClientCertificateOptions = ClientCertificateOption.Manual,
-                    SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
-                    ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true
-                };
-
-                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
-                handler.ClientCertificates.Add(x509Certificate2);
+            var handler = new HttpClientHandler
+            {
+                CheckCertificateRevocationList = false,
+                SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
 #else
-
-                var webRequestHandler = new WebRequestHandler
-                {
-                    ClientCertificateOptions = ClientCertificateOption.Manual,
-                    ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
-                    AutomaticDecompression = System.Net.DecompressionMethods.GZip | System.Net.DecompressionMethods.Deflate
-                };
-
-                var x509Certificate2 = CertificateUtil.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
-                webRequestHandler.ClientCertificates.Add(x509Certificate2);
-                handler = webRequestHandler;
+            var handler = new WebRequestHandler
+            {
+                ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
 #endif
+
+            if (!string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            {
+                handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+
+                var x509Certificate2 = ClientCertificateHelper.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
+                handler.ClientCertificates.Add(x509Certificate2);
             }
 
             // For proxy we shouldn't follow auto redirects
@@ -49,23 +46,43 @@ namespace WireMock.Http
             // If UseCookies enabled, httpClient ignores Cookie header
             handler.UseCookies = false;
 
-            return new HttpClient(handler);
+            var client = new HttpClient(handler);
+#if NET452 || NET46
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+#endif
+            return client;
         }
 
-        public static async Task<ResponseMessage> SendAsync(HttpClient client, RequestMessage requestMessage, string url)
+        public static async Task<ResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] RequestMessage requestMessage, string url)
         {
             Check.NotNull(client, nameof(client));
+            Check.NotNull(requestMessage, nameof(requestMessage));
 
             var originalUri = new Uri(requestMessage.Url);
             var requiredUri = new Uri(url);
 
             var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
 
+            WireMockList<string> contentTypeHeader = null;
+            bool contentTypeHeaderPresent = requestMessage.Headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase));
+            if (contentTypeHeaderPresent)
+            {
+                contentTypeHeader = requestMessage.Headers[HttpKnownHeaderNames.ContentType];
+            }
+
             // Set Body if present
             if (requestMessage.BodyAsBytes != null)
             {
                 httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
             }
+            else if (requestMessage.BodyAsJson != null)
+            {
+                httpRequestMessage.Content = new StringContent(JsonConvert.SerializeObject(requestMessage.BodyAsJson), requestMessage.BodyEncoding);
+            }
+            else if (requestMessage.Body != null)
+            {
+                httpRequestMessage.Content = new StringContent(requestMessage.Body, requestMessage.BodyEncoding);
+            }
 
             // Overwrite the host header
             httpRequestMessage.Headers.Host = requiredUri.Authority;
@@ -86,23 +103,25 @@ namespace WireMock.Http
             // Call the URL
             var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
 
-            // Transform response
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = (int)httpResponseMessage.StatusCode,
-
-                BodyAsBytes = await httpResponseMessage.Content.ReadAsByteArrayAsync(),
-                Body = await httpResponseMessage.Content.ReadAsStringAsync()
-            };
+            // Create transform response
+            var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };
 
             // Set both content and response headers, replacing URLs in values
-            var headers = httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers);
+            var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>()).ToArray();
+            if (httpResponseMessage.Content != null)
+            {
+                var stream = await httpResponseMessage.Content.ReadAsStreamAsync();
+                var body = await BodyParser.Parse(stream, contentTypeHeader?.FirstOrDefault());
+                responseMessage.Body = body.BodyAsString;
+                responseMessage.BodyAsJson = body.BodyAsJson;
+                responseMessage.BodyAsBytes = body.BodyAsBytes;
+            }
 
             foreach (var header in headers)
             {
-                // if Location header contains absolute redirect URL, and base URL is one that we proxy to,
+                // If Location header contains absolute redirect URL, and base URL is one that we proxy to,
                 // we need to replace it to original one.
-                if (string.Equals(header.Key, "Location", StringComparison.OrdinalIgnoreCase)
+                if (string.Equals(header.Key, HttpKnownHeaderNames.Location, StringComparison.OrdinalIgnoreCase)
                     && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
                     && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
                 {

src/WireMock.Net/Http/PortUtil.cs

@@ -37,7 +37,7 @@ namespace WireMock.Http
         public static bool TryExtractProtocolAndPort(string url, out string proto, out int port)
         {
             proto = null;
-            port = -1;
+            port = 0;
 
             Match m = UrlDetailsRegex.Match(url);
             if (m.Success)

src/WireMock.Net/HttpsCertificate/ClientCertificateHelper.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WireMock.Http
+namespace WireMock.HttpsCertificate
 {
-    internal static class CertificateUtil
+    internal static class ClientCertificateHelper
     {
         public static X509Certificate2 GetCertificate(string thumbprintOrSubjectName)
         {

src/WireMock.Net/HttpsCertificate/PublicCertificateHelper.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Security.Cryptography.X509Certificates;
+
+namespace WireMock.HttpsCertificate
+{
+    internal static class PublicCertificateHelper
+    {
+        // 1] Generate using https://www.pluralsight.com/blog/software-development/selfcert-create-a-self-signed-certificate-interactively-gui-or-programmatically-in-net
+        // 2] Converted to Base64
+        private const string Data = @"MIIQMgIBAzCCD+4GCSqGSIb3DQEHAaCCD98Egg/bMIIP1zCCCogGCSqGSIb3DQEHAaCCCnkEggp1
+MIIKcTCCCm0GCyqGSIb3DQEMCgECoIIJfjCCCXowHAYKKoZIhvcNAQwBAzAOBAi1j9x1jTfUewIC
+B9AEgglYa48lP16+isiGEVT7zwN3XwaPwPOHZcQ7tRA/DA8LZnZbwU7XhtPObF5bZcHn4engX2An
+ISFpe2S5XJ7BfHmsGOO7Bxj6C2IcZIPTefvAd9vWE0WUAGN11SLhJ3fB/ZRt3Nys7JCJzywQCkYK
+dCA35V7WfETCLT6+ArtRU4qsjop2YXyUzcLw3OuumBAoRsazgUKz8rkZJbifkSikbdxs+Hupcf2I
+NOOuKStKoqouqCO/vmRi8u8g0KQhf2LcQBSqLk6OZ8TQuv07W5tVO2Ky5qCYu6aXBBlHhGSY9fGL
+vqaYcxMcVJQpXUUL6nSWCoaLdaAAB+Anw1Tpbd47W7ieTK5Yq2IROPQIr1mk8nvFbxoTcBuIQ6oU
+RiiLX+mb3hYgbTL3LqDmmm9FFI8enJu6pUxP8iKKROtCqhYXhF1i3EwReBzJzpDGZ+y4rJxb0Es4
+sPVc/TaVPSJCTmgcKzwps7M12uxm8G9Dv3lKgZVmgDRivovCJFxHdCdgCYB08FvNWuFtXO+schsE
+N0nY2i07A2joaJC18yvoNGZ+ySBTBPOBN+5XbiQs0vsQ4MfLETb2O2dFjwE/tErgo6RWYg2qQNAe
+DSh2wHzI0YJM3PqaUR0Q9KnjEWc92hsLI34KnuNkNkVk4NEjPOetxeIBcYN7CDD6tTxp42sU++bT
+o9zyjy1BPS+LuEblxDTSlVPb0dxvkwNBXBi0RXIOWfD15BWcV1Uv972jB6To1XPDIOc+eq7fa5yn
+HRW/GYdGPmOYKietdw6V3t2Et9cPlw4v08IelucF06Ju2a73QtidtkA89vxjn7qOEVACAXpsiMsM
+4JCcAzF7jh0U2mskSB14I9HcZh1Sei0J2ZULcXNyuIw9nsWp8vrH04OOoUDe7/UpX7c8+A+tqDUy
+1W2V1dJDhlwu2SXL5jJFBK4P9p2e+XyHJ+AcYXrHQIKxqoCgvnywT4HnI2bvZ1+lmIR99mp1Cvzj
+RUgJaqhI7u6WH3i6fmkA92hF8MP5WDYTGwjsHPrCg6Xkqykuvub4osu+gLq5t+JC9rOczgrRNYXg
+54FMzlCyQxTfgY6IRwPH/xYHKGbViFF+jA4ksLMRjI2XOV4swbI232SxMoQQDNsjx1la2nZM3P5z
+g7zpmaiyzY44q3kU1viMMR7qM/w1S6nTW0ZkzTXk8Gttor/0JWT1K8KgwK02B6Q9zNwfK60a0cQm
+SbA/dXkWapuIzQLz+ZUPyG/1EP5KuKNnsp0hfVi8TTgOFceoV9kyIhrTQNI0o5O91dqkyWd/bMl2
+OnrnRnhka6f839zJKUpWPTfRX9RMJTk/5HVcL/qsHYcJedZyPawJjMU+cxW1ZZjr1Lo6M0fjKuTI
+Askg0ZKS0FJ60jTKnc1DmldQLtieHh1UTdty+yn1A0rGnrFEyN7if2/d1EduWJaf6bvWzfH+d/36
+1gDwp4OXi0qWu7c5zByGZi2j2sFo4v0cGgjPZUJvF5z0V8OkE15DiA4xtTSkIjCnEmOhODViwrfc
+ONvHB+inBW9wLp26qFgNcYrYxP2FC54pPCxO+KJaAJrtfE3A4lkboB7V0xFu23ecOy4n2gho39tg
+Bxkt1Xj3GCLgeKvcYLzOPytZldXDTtoCcsm5uhCmBHEmPUsnLc7Tt1cFflFtWTOjtyv0Lk8Qu2BU
+B/hSSgjZRpqE+hzjtghjXdFOT5wKULvtUz5eu+lH7kjGghQbF962vLcRCsr+tMPba6MFqhy5Q+dM
+NcHc+HIx2WiuRZ6jdCZSUpH3f1+kH6XYj2P3/F0kLBRAMPGKbXpIi9Px4AVDEDClL77mDpVgeEoh
+kkVh5zvk2PsEPonmTFK0kQE8Q4cYFWTKa9lAE4Wc35EzvpKFdTwQKhr5kN7tEq17n5wJt/499164
+ho0+LjzYy62JI/fv3RPISL0gXr2INLW7fgZ5KNjcnu/AITJu3ycw/XH8BKsx4dcbBgBdrKY8afEn
+IZ1EIv/TuNvmifmAEGX/DWuVmZIOU6pTystzTQwfz0wko3lUKjkPM40RLN9o6lddV6fM3QNtK0ac
+hqOOmG68LzI1U33nvUBol/FeEV0DLvGjvsIRC/TCtDu5Vk2tKS13p9kNj4owJK8d343PZ/eyi/Oe
+sNZCCJJuj4iIodekm1hzj7zc6ZLNudgab/WkF7TbWDOhDPwG1gE/McffGNWPFlwsaopoZaH8E8tl
+QSOnHqAiNa7B3ifxMrGDWHDlxkWddClbKd9ujL4mgB88Wo8JceLawDOcSVGImvWGxsrK2RX7FK57
+GQYuc0zcq3NH4jpoOyS+vpMeigTPDOvQdqjGgEUW3aXdA8Ma0KYVEyAhK/rFXw8FelGREM2ku1kN
+kziOTAe52SWqcrv6NUPfo1/Uc6u7KpwQrcDlFZWxPCKomeRQTm6AmP2QHMgl2gaUbmuBF/C9Ccl2
+1Iqh8vUdDT3lHdf5I5SjRPJJXX2/0/oUFmwIC5AFp8/XXnIG05BER1X2Y+SL15QHW7lYsvd4ZKTv
+tvYaZNWajgAVZl8gJYFUQG+U+cFYcpHhf6SGzcuwcmQJGxptZAVnRtDzNjJ04vJB616/uoI2Qkp2
+ysGAjDNlwgeckmU7TSYoYaML29pRupTTQqKItyFDuebUpSKBTxsEFIJBCTErA8TD8I9T5nzT+rTy
++Lpp9mqcxQR1RhxgTx5bE7D4igdblobX0IONARg4EIAk8xj1Ba3k4skdjAQcJOHKd+xVo+vsrIqg
+a+ycemROE5F3D3s21ozMOn1Dy8iIeQusJQTSkP82+wHYWXRg59N0cq/40CaJskK+yp7afOWFoCqY
+T/D9OGlfeIIiLivwMh8naPZyM4+pd/CFZwcWoGtIno04nWWR/xQVe17jqPMov1xonC2E3AcKxUXl
+PMdZoOARkR+KHZnoBZ/vjqxeDPARKupijkw5QQI3jNmd5IELjcL8OraHlo+e884mRsa/66J7p94D
+bidzjiVLUhCsZnVks9eZF6PIEg49eq/+w8ph3X7XBNnZYAbgola/0yy/PlPzgJ3p/AgXMoGr+HXO
+p2WAs1WRo9mAdeOBMrAMvXKFD04bZPNHke0Ri03O5U7NRRs1T0LnqdZHyF39As8FiktfJl1bn/U0
+sUjhc4fDNnDaBN8VF8VsEa7UolRC6NqQ1oHaeEZRoq0li6NbXIXdxIIT4bbqwajqFkvvO6qc6SEG
+iAlUzTGB2zATBgkqhkiG9w0BCRUxBgQEAQAAADBXBgkqhkiG9w0BCRQxSh5IADcAOAA1ADAAZABj
+ADAAYwAtAGIAZQBmAGIALQA0AGEANQBiAC0AOAA5ADcAMAAtAGIAZAA5ADkAOQAxADEAOQA2AGIA
+YgA1MGsGCSsGAQQBgjcRATFeHlwATQBpAGMAcgBvAHMAbwBmAHQAIABFAG4AaABhAG4AYwBlAGQA
+IABDAHIAeQBwAHQAbwBnAHIAYQBwAGgAaQBjACAAUAByAG8AdgBpAGQAZQByACAAdgAxAC4AMDCC
+BUcGCSqGSIb3DQEHBqCCBTgwggU0AgEAMIIFLQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQMwDgQI
+Amt1zAZpKWkCAgfQgIIFAJoBLiXPEZGuUfsyM2ed66sBIirBctHbhyydZsQDT8V2crq6AI3P0dBT
+Agf/MouK/JcAfdGEEpU6SKxqZBDZoTRbyK7VdW5YiKGUurFGf66L9K3c4MHhVLMWnSkwK+0gwiIB
+RB82Or4ru0cSQbF32vsuJgJY9Ax4YODKokPFUzZjPrmch4AgZWKxslDFDq4xs3tpLIeZbALWYdrR
+PUZaReO+NaLfNKwTZsinzjPkCst7R1Jfjf1abikPrOMPgYFUiQL7GNQFbefeJu9SCXlj09u/qw+l
+uLrwEyMamG0cgjrWbMOohGtvAuHqeZIIWuLnGE2quq7Ah/U55lliZn3IFgs1n6FalW/XGH0T0aRA
+im6f1EgxtJShBNdG6qNrkzYMyY2Xvpk82qtmvMbhJMDstpovsdT1rZ6OGfsyJAlG94BcCWC2wuvW
+MYs6H7AirBG/iocNm7JwSBQ7wjl0keH9vuHDQsI+uu9yWGuyZK6MmxDEOEMZRndU0GrlLIp7zQx8
+gPeagKqSHhPK0ghHhDilMyToE3Euvi5jneh90eofWK6E4E8KtQTWvFeCe9fYRhMaflH9lwfHfXPo
+9J+7GZLRF/MDTlE8jzWoP5csUxV3jnXQkTUOfHvO7QK6POKwLGkCyZ5wKFydyYdTekG+KU2Vml2y
+s6pZ+kME1VMYiHRF3CaXX1ZYKikEdnuB1Qp8BE2uKQTaYO4Wns0vQIVRWTrk/Gp5RXu1ihzoTiFb
+YqLFROQTM+dVTUk3C6W82OroNwofW5ErZwpbdgJJ83gbPLr9W4KZ6YegvEWFT1MawnIYDC6RSKtg
+fI1blSZOo1SIF6+nR0gFPivSEGBJHclIg7TtvGSB1q7TQFS4W5l+AHdgGPqqURnjuJ7/DVFZHqEV
+jJM1QEvH/RY1rDXP8FZC6CZR/Le7tVm5o8bHnlU4gyStvNyLXHCP6o3gHmaBcfYmqJr/0ZEKnwnd
+MBmdIgwQ3+JnKvjAeDe8Z/l0U03CbzeyN3TgUolDlUGVDF2FdPZqrVsLKw6VJv3hoFZmgEbb1fDq
+Jblc82lrYIEW8E7ltRLDyNDmRdyaqkqw0e7SygXXxv6SKerxoJ5E1NyJdHeQXSahRrsj5UZpxlTE
+ylb3upIF0F006w2D5J7xUDktPetVgM97dN3whbOrzWPPkn5CTZMaUdYGTYQK3/K/jQSKuXcaM04A
+EWmcQOQ/5Quco/aMYWTTwFI9+bKZayZKHqQjNKuwss+iWTW2b26cA2XAr2XWCL9PEybVRK/5n4km
+5qkGIMjjczZxNy1+H1QoEOwkGVzQd390ktQajJBFcf9wBO+Ar14EgPKvdL4DRvCvXOK3CtrgbAq6
+GK7uULRrz9t/5lu27ba5wcwxg6bFhgCsJsoSCJnLCR7H+QMB4LhnWA10U4hFWCamCKFoGkiXW6yV
+OF4x+0D0MmrjrrAGi05KzfrsXNtRG0xbkmvrsjqzmsOKyjvtiBCrR0S6NUtKhyxoiz5bCCm+d8rm
+jaPk9q01k52pjJAKYW0f+5+r15LamBecnjXtJ07LCl6cMA1Cj4L0mQUSefyFi666GC3TmhzHwhnj
+SV64nTApS0gBsc6c18fUBsMcUj5nCNclIzfxwnARd/30yg22r09nUY2gtQTwk/W6VCpAH+7yZkH1
+TLNGa+UmMnPsnBjlAJ6l9VPsa4uJM2DIQKtZXWq4DkhSAYKF6joIP7nKMDswHzAHBgUrDgMCGgQU
+wTM1Z+CJZG9xAcf1zAVGl4ggYyYEFGBFyJ8VBwijS2zy1qwN1WYGtcWoAgIH0A==
+";
+
+        public static X509Certificate2 GetX509Certificate2()
+        {
+            byte[] data = Convert.FromBase64String(Data);
+            return new X509Certificate2(data);
+        }
+    }
+}

src/WireMock.Net/Logging/IWireMockLogger.cs

@@ -0,0 +1,47 @@
+using JetBrains.Annotations;
+
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// IWireMockLogger interface
+    /// </summary>
+    [PublicAPI]
+    public interface IWireMockLogger
+    {
+        /// <summary>
+        /// Writes the message at the Debug level using the specified parameters. 
+        /// </summary>
+        /// <param name="formatString">The format string.</param>
+        /// <param name="args">The arguments.</param>
+        [PublicAPI]
+        [StringFormatMethod("formatString")]
+        void Debug([NotNull] string formatString, [NotNull] params object[] args);
+
+        /// <summary>
+        /// Writes the message at the Info level using the specified parameters. 
+        /// </summary>
+        /// <param name="formatString">The format string.</param>
+        /// <param name="args">The arguments.</param>
+        [PublicAPI]
+        [StringFormatMethod("formatString")]
+        void Info([NotNull] string formatString, [NotNull] params object[] args);
+
+        /// <summary>
+        /// Writes the message at the Warning level using the specified parameters. 
+        /// </summary>
+        /// <param name="formatString">The format string.</param>
+        /// <param name="args">The arguments.</param>
+        [PublicAPI]
+        [StringFormatMethod("formatString")]
+        void Warn([NotNull] string formatString, [NotNull] params object[] args);
+
+        /// <summary>
+        /// Writes the message at the Error level using the specified parameters. 
+        /// </summary>
+        /// <param name="formatString">The format string.</param>
+        /// <param name="args">The arguments.</param>
+        [PublicAPI]
+        [StringFormatMethod("formatString")]
+        void Error([NotNull] string formatString, [NotNull] params object[] args);
+    }
+}

src/WireMock.Net/Logging/WireMockConsoleLogger.cs

@@ -0,0 +1,42 @@
+using System;
+
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// WireMockConsoleLogger which logs to Console
+    /// </summary>
+    /// <seealso cref="IWireMockLogger" />
+    public class WireMockConsoleLogger : IWireMockLogger
+    {
+        /// <see cref="IWireMockLogger.Debug"/>
+        public void Debug(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Debug", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Info"/>
+        public void Info(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Info", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Warn"/>
+        public void Warn(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Warn", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Error"/>
+        public void Error(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Error", formatString, args));
+        }
+
+        private static string Format(string level, string formatString, params object[] args)
+        {
+            string message = string.Format(formatString, args);
+
+            return $"{DateTime.UtcNow} [{level}] : {message}";
+        }
+    }
+}

src/WireMock.Net/Logging/WireMockNullLogger.cs

@@ -0,0 +1,29 @@
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// WireMockNullLogger which does not log.
+    /// </summary>
+    /// <seealso cref="IWireMockLogger" />
+    public class WireMockNullLogger : IWireMockLogger
+    {
+        /// <see cref="IWireMockLogger.Debug"/>
+        public void Debug(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Info"/>
+        public void Info(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Warn"/>
+        public void Warn(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Error"/>
+        public void Error(string formatString, params object[] args)
+        {
+        }
+    }
+}

src/WireMock.Net/Mapping.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using WireMock.Matchers.Request;
+using WireMock.ResponseProviders;
 
 namespace WireMock
 {
@@ -20,6 +21,11 @@ namespace WireMock
         /// </summary>
         public string Title { get; }
 
+        /// <summary>
+        /// The full filename path for this mapping (only defined for static mappings).
+        /// </summary>
+        public string Path { get; set; }
+
         /// <summary>
         /// Gets the priority.
         /// </summary>
@@ -63,17 +69,19 @@ namespace WireMock
         /// Initializes a new instance of the <see cref="Mapping"/> class.
         /// </summary>
         /// <param name="guid">The unique identifier.</param>
-        /// <param name="title">The unique title (can be null_.</param>
+        /// <param name="title">The unique title (can be null).</param>
+        /// <param name="path">The full file path from this mapping title (can be null).</param>
         /// <param name="requestMatcher">The request matcher.</param>
         /// <param name="provider">The provider.</param>
         /// <param name="priority">The priority for this mapping.</param>
         /// <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, 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] object executionConditionState, [CanBeNull] object nextState)
         {
             Guid = guid;
             Title = title;
+            Path = path;
             RequestMatcher = requestMatcher;
             Provider = provider;
             Priority = priority;

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -7,8 +7,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// ExactMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class ExactMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class ExactMatcher : IStringMatcher
     {
         private readonly string[] _values;
 
@@ -23,29 +23,19 @@ namespace WireMock.Matchers
             _values = values;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             return MatchScores.ToScore(_values.Select(value => value.Equals(input)));
         }
 
-        /// <summary>
-        /// Gets the value.
-        /// </summary>
-        /// <returns>Patterns</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _values;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "ExactMatcher";

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -0,0 +1,46 @@
+using System.Linq;
+using JetBrains.Annotations;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// ExactMatcher
+    /// </summary>
+    /// <seealso cref="IObjectMatcher" />
+    public class ExactObjectMatcher : IObjectMatcher
+    {
+        private readonly object _object;
+        private readonly byte[] _bytes;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] object value)
+        {
+            _object = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] byte[] value)
+        {
+            _bytes = value;
+        }
+
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            bool equals = _object != null ? Equals(_object, input) : _bytes.SequenceEqual((byte[])input);
+            return MatchScores.ToScore(equals);
+        }
+
+        /// <inheritdoc cref="IMatcher.GetName"/>
+        public string GetName()
+        {
+            return "ExactObjectMatcher";
+        }
+    }
+}

src/WireMock.Net/Matchers/IMatcher.cs

@@ -5,19 +5,6 @@
     /// </summary>
     public interface IMatcher
     {
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(string input);
-
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
-        string[] GetPatterns();
-
         /// <summary>
         /// Gets the name.
         /// </summary>

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -0,0 +1,15 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IObjectMatcher
+    /// </summary>
+    public interface IObjectMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(object input);
+    }
+}

src/WireMock.Net/Matchers/IStringMatcher.cs

@@ -0,0 +1,21 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IStringMatcher
+    /// </summary>
+    public interface IStringMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(string input);
+
+        /// <summary>
+        /// Gets the patterns.
+        /// </summary>
+        /// <returns>Patterns</returns>
+        string[] GetPatterns();
+    }
+}

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -10,8 +10,9 @@ namespace WireMock.Matchers
     /// JSONPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
-    public class JsonPathMatcher : IMatcher
+    public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
+        // private readonly object _jsonPattern;
         private readonly string[] _patterns;
 
         /// <summary>
@@ -25,15 +26,20 @@ namespace WireMock.Matchers
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        //public JsonPathMatcher([NotNull] object jsonPattern)
+        //{
+        //    Check.NotNull(jsonPattern, nameof(jsonPattern));
+
+        //    _jsonPattern = jsonPattern;
+        //}
+
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -47,19 +53,33 @@ namespace WireMock.Matchers
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            if (input == null)
+            {
+                return MatchScores.Mismatch;
+            }
+
+            try
+            {
+                var o = input as JObject ?? JObject.FromObject(input);
+
+                return MatchScores.ToScore(_patterns.Select(p => o.SelectToken(p) != null));
+            }
+            catch (Exception)
+            {
+                return MatchScores.Mismatch;
+            }
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "JsonPathMatcher";

src/WireMock.Net/Matchers/RegexMatcher.cs

@@ -9,8 +9,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// Regular Expression Matcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class RegexMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class RegexMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
         private readonly Regex[] _expressions;
@@ -37,20 +37,20 @@ namespace WireMock.Matchers
 
             RegexOptions options = RegexOptions.Compiled;
             if (ignoreCase)
+            {
                 options |= RegexOptions.IgnoreCase;
+            }
 
             _expressions = patterns.Select(p => new Regex(p, options)).ToArray();
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -62,21 +62,13 @@ namespace WireMock.Matchers
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public virtual string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>
-        /// Name
-        /// </returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public virtual string GetName()
         {
             return "RegexMatcher";

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

@@ -9,21 +9,21 @@ namespace WireMock.Matchers.Request
     /// </summary>
     public class RequestMessageBodyMatcher : IRequestMatcher
     {
-        /// <summary>
-        /// The body as byte[].
-        /// </summary>
-        private readonly byte[] _bodyData;
-
         /// <summary>
         /// The body function
         /// </summary>
         public Func<string, bool> Func { get; }
 
         /// <summary>
-        /// The body data function
+        /// The body data function for byte[]
         /// </summary>
         public Func<byte[], bool> DataFunc { get; }
 
+        /// <summary>
+        /// The body data function for json
+        /// </summary>
+        public Func<object, bool> JsonFunc { get; }
+
         /// <summary>
         /// The matcher.
         /// </summary>
@@ -32,9 +32,7 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="body">
-        /// The body Regex pattern.
-        /// </param>
+        /// <param name="body">The body.</param>
         public RequestMessageBodyMatcher([NotNull] string body) : this(new SimMetricsMatcher(body))
         {
         }
@@ -42,21 +40,23 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="body">
-        /// The body Regex pattern.
-        /// </param>
-        public RequestMessageBodyMatcher([NotNull] byte[] body)
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher([NotNull] byte[] body) : this(new ExactObjectMatcher(body))
         {
-            Check.NotNull(body, nameof(body));
-            _bodyData = body;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="func">
-        /// The body func.
-        /// </param>
+        /// <param name="body">The body.</param>
+        public RequestMessageBodyMatcher([NotNull] object body) : this(new ExactObjectMatcher(body))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="func">The function.</param>
         public RequestMessageBodyMatcher([NotNull] Func<string, bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -66,9 +66,7 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="func">
-        /// The body func.
-        /// </param>
+        /// <param name="func">The function.</param>
         public RequestMessageBodyMatcher([NotNull] Func<byte[], bool> func)
         {
             Check.NotNull(func, nameof(func));
@@ -78,23 +76,24 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="matcher">
-        /// The body matcher.
-        /// </param>
+        /// <param name="func">The function.</param>
+        public RequestMessageBodyMatcher([NotNull] Func<object, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+            JsonFunc = func;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+        /// </summary>
+        /// <param name="matcher">The matcher.</param>
         public RequestMessageBodyMatcher([NotNull] IMatcher matcher)
         {
             Check.NotNull(matcher, nameof(matcher));
             Matcher = matcher;
         }
 
-        /// <summary>
-        /// Determines whether the specified RequestMessage is match.
-        /// </summary>
-        /// <param name="requestMessage">The RequestMessage.</param>
-        /// <param name="requestMatchResult">The RequestMatchResult.</param>
-        /// <returns>
-        /// A value between 0.0 - 1.0 of the similarity.
-        /// </returns>
+        /// <see cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
             double score = IsMatch(requestMessage);
@@ -103,17 +102,43 @@ namespace WireMock.Matchers.Request
 
         private double IsMatch(RequestMessage requestMessage)
         {
-            if (Matcher != null)
-                return Matcher.IsMatch(requestMessage.Body);
+            if (requestMessage.Body != null)
+            {
+                var stringMatcher = Matcher as IStringMatcher;
+                if (stringMatcher != null)
+                {
+                    return stringMatcher.IsMatch(requestMessage.Body);
+                }
+            }
 
-            if (_bodyData != null)
-                return MatchScores.ToScore(requestMessage.BodyAsBytes == _bodyData);
+            var objectMatcher = Matcher as IObjectMatcher;
+            if (objectMatcher != null)
+            {
+                if (requestMessage.BodyAsJson != null)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyAsJson);
+                }
+
+                if (requestMessage.BodyAsBytes != null)
+                {
+                    return objectMatcher.IsMatch(requestMessage.BodyAsBytes);
+                }
+            }
 
             if (Func != null)
+            {
                 return MatchScores.ToScore(requestMessage.Body != null && Func(requestMessage.Body));
+            }
 
-            if (DataFunc != null && requestMessage.BodyAsBytes != null)
+            if (DataFunc != null)
+            {
                 return MatchScores.ToScore(requestMessage.BodyAsBytes != null && DataFunc(requestMessage.BodyAsBytes));
+            }
+
+            if (JsonFunc != null)
+            {
+                return MatchScores.ToScore(requestMessage.BodyAsJson != null && JsonFunc(requestMessage.BodyAsJson));
+            }
 
             return MatchScores.Mismatch;
         }

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

@@ -14,7 +14,7 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// The matchers.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The ClientIP functions.
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
         /// </summary>
         /// <param name="clientIPs">The clientIPs.</param>
-        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IMatcher>().ToArray())
+        public RequestMessageClientIPMatcher([NotNull] params string[] clientIPs) : this(clientIPs.Select(ip => new WildcardMatcher(ip)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageClientIPMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessageClientIPMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
@@ -59,10 +59,14 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(matcher => matcher.IsMatch(requestMessage.ClientIP));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.ClientIP != null && Funcs.Any(func => func(requestMessage.ClientIP)));
+            }
 
             return MatchScores.Mismatch;
         }

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

@@ -24,7 +24,7 @@ namespace WireMock.Matchers.Request
         /// <value>
         /// The matchers.
         /// </value>
-        public IMatcher[] Matchers { get; }
+        public IStringMatcher[] Matchers { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageCookieMatcher"/> class.
@@ -38,7 +38,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(pattern, nameof(pattern));
 
             Name = name;
-            Matchers = new IMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -46,7 +46,7 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageCookieMatcher([NotNull] string name, [NotNull] params IMatcher[] matchers)
+        public RequestMessageCookieMatcher([NotNull] string name, [NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(matchers, nameof(matchers));
@@ -83,16 +83,24 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (requestMessage.Cookies == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Cookies)));
+            }
 
             if (Matchers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (!requestMessage.Cookies.ContainsKey(Name))
+            {
                 return MatchScores.Mismatch;
+            }
 
             string value = requestMessage.Cookies[Name];
             return Matchers.Max(m => m.IsMatch(value));

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

@@ -26,7 +26,7 @@ namespace WireMock.Matchers.Request
         /// <value>
         /// The matchers.
         /// </value>
-        public IMatcher[] Matchers { get; }
+        public IStringMatcher[] Matchers { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageHeaderMatcher"/> class.
@@ -40,7 +40,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(pattern, nameof(pattern));
 
             Name = name;
-            Matchers = new IMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
+            Matchers = new IStringMatcher[] { new WildcardMatcher(pattern, ignoreCase) };
         }
 
         /// <summary>
@@ -55,7 +55,7 @@ namespace WireMock.Matchers.Request
             Check.NotNull(patterns, nameof(patterns));
 
             Name = name;
-            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IMatcher>().ToArray();
+            Matchers = patterns.Select(pattern => new WildcardMatcher(pattern, ignoreCase)).Cast<IStringMatcher>().ToArray();
         }
 
         /// <summary>
@@ -63,7 +63,7 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] params IMatcher[] matchers)
+        public RequestMessageHeaderMatcher([NotNull] string name, [NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
             Check.NotNull(matchers, nameof(matchers));
@@ -93,16 +93,24 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (requestMessage.Headers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(Funcs.Any(f => f(requestMessage.Headers.ToDictionary(entry => entry.Key, entry => entry.Value.ToArray()))));
+            }
 
             if (Matchers == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             if (!requestMessage.Headers.ContainsKey(Name))
+            {
                 return MatchScores.Mismatch;
+            }
 
             WireMockList<string> list = requestMessage.Headers[Name];
             return Matchers.Max(m => list.Max(value => m.IsMatch(value))); // TODO : is this correct ?

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

@@ -14,7 +14,7 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// The matcher.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The path functions
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
         /// </summary>
         /// <param name="paths">The paths.</param>
-        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IMatcher>().ToArray())
+        public RequestMessagePathMatcher([NotNull] params string[] paths) : this(paths.Select(path => new WildcardMatcher(path)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessagePathMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessagePathMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessagePathMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
@@ -59,10 +59,14 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(m => m.IsMatch(requestMessage.Path));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.Path != null && Funcs.Any(func => func(requestMessage.Path)));
+            }
 
             return MatchScores.Mismatch;
         }

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

@@ -14,7 +14,7 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// The matchers.
         /// </summary>
-        public IReadOnlyList<IMatcher> Matchers { get; }
+        public IReadOnlyList<IStringMatcher> Matchers { get; }
 
         /// <summary>
         /// The url functions.
@@ -25,7 +25,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
         /// </summary>
         /// <param name="urls">The urls.</param>
-        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IMatcher>().ToArray())
+        public RequestMessageUrlMatcher([NotNull] params string[] urls) : this(urls.Select(url => new WildcardMatcher(url)).Cast<IStringMatcher>().ToArray())
         {
         }
 
@@ -33,7 +33,7 @@ namespace WireMock.Matchers.Request
         /// Initializes a new instance of the <see cref="RequestMessageUrlMatcher"/> class.
         /// </summary>
         /// <param name="matchers">The matchers.</param>
-        public RequestMessageUrlMatcher([NotNull] params IMatcher[] matchers)
+        public RequestMessageUrlMatcher([NotNull] params IStringMatcher[] matchers)
         {
             Check.NotNull(matchers, nameof(matchers));
             Matchers = matchers;
@@ -59,10 +59,14 @@ namespace WireMock.Matchers.Request
         private double IsMatch(RequestMessage requestMessage)
         {
             if (Matchers != null)
+            {
                 return Matchers.Max(matcher => matcher.IsMatch(requestMessage.Url));
+            }
 
             if (Funcs != null)
+            {
                 return MatchScores.ToScore(requestMessage.Url != null && Funcs.Any(func => func(requestMessage.Url)));
+            }
 
             return MatchScores.Mismatch;
         }

src/WireMock.Net/Matchers/SimMetricsMatcher.cs

@@ -10,8 +10,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// SimMetricsMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class SimMetricsMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class SimMetricsMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
         private readonly SimMetricType _simMetricType;
@@ -32,17 +32,13 @@ namespace WireMock.Matchers
         /// <param name="simMetricType">The SimMetric Type</param>
         public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein)
         {
-            Check.NotEmpty(patterns, nameof(patterns));
+            Check.NotNullOrEmpty(patterns, nameof(patterns));
 
             _patterns = patterns;
             _simMetricType = simMetricType;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             IStringMetric m = GetStringMetricType();
@@ -93,19 +89,13 @@ namespace WireMock.Matchers
             }
         }
 
-        /// <summary>
-        /// Gets the pattern.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return $"SimMetricsMatcher.{_simMetricType}";

src/WireMock.Net/Matchers/WildcardMatcher.cs

@@ -7,7 +7,7 @@ namespace WireMock.Matchers
     /// <summary>
     /// WildcardMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
+    /// <seealso cref="RegexMatcher" />
     public class WildcardMatcher : RegexMatcher
     {
         private readonly string[] _patterns;
@@ -31,21 +31,13 @@ namespace WireMock.Matchers
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Gets the pattern.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public override string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>
-        /// Name
-        /// </returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public override string GetName()
         {
             return "WildcardMatcher";

src/WireMock.Net/Matchers/XPathMatcher.cs

@@ -12,8 +12,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// XPath2Matcher
     /// </summary>
-    /// <seealso cref="WireMock.Matchers.IMatcher" />
-    public class XPathMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class XPathMatcher : IStringMatcher
     {
         private readonly string[] _patterns;
 
@@ -28,15 +28,13 @@ namespace WireMock.Matchers
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -53,19 +51,13 @@ namespace WireMock.Matchers
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "XPathMatcher";

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -1,11 +1,14 @@
 #if NETSTANDARD
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using WireMock.Http;
+using WireMock.HttpsCertificate;
 using WireMock.Validation;
 
 namespace WireMock.Owin
@@ -14,7 +17,7 @@ namespace WireMock.Owin
     {
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly WireMockMiddlewareOptions _options;
-        private readonly string[] _uriPrefixes;
+        private readonly string[] _urls;
 
         private IWebHost _host;
 
@@ -27,7 +30,7 @@ namespace WireMock.Owin
         public AspNetCoreSelfHost([NotNull] WireMockMiddlewareOptions options, [NotNull] params string[] uriPrefixes)
         {
             Check.NotNull(options, nameof(options));
-            Check.NotEmpty(uriPrefixes, nameof(uriPrefixes));
+            Check.NotNullOrEmpty(uriPrefixes, nameof(uriPrefixes));
 
             foreach (string uriPrefix in uriPrefixes)
             {
@@ -38,7 +41,7 @@ namespace WireMock.Owin
             }
 
             _options = options;
-            _uriPrefixes = uriPrefixes;
+            _urls = uriPrefixes;
         }
 
         public Task StartAsync()
@@ -46,26 +49,59 @@ namespace WireMock.Owin
             _host = new WebHostBuilder()
                 .Configure(appBuilder =>
                 {
-                    appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
+                    appBuilder.UseMiddleware<GlobalExceptionMiddleware>(_options);
+
                     _options.PreWireMockMiddlewareInit?.Invoke(appBuilder);
+
                     appBuilder.UseMiddleware<WireMockMiddleware>(_options);
+
                     _options.PostWireMockMiddlewareInit?.Invoke(appBuilder);
                 })
-                .UseKestrel()
-                .UseUrls(_uriPrefixes)
+                .UseKestrel(options =>
+                {
+#if NETSTANDARD1_3
+                    if (_urls.Any(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        options.UseHttps(PublicCertificateHelper.GetX509Certificate2());
+                    }
+#else
+                    // https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel?tabs=aspnetcore2x
+                    foreach (string url in _urls.Where(u => u.StartsWith("http://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
+                        options.Listen(System.Net.IPAddress.Loopback, port);
+                    }
+
+                    foreach (string url in _urls.Where(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
+                        options.Listen(System.Net.IPAddress.Loopback, port, listenOptions =>
+                        {
+                            listenOptions.UseHttps(PublicCertificateHelper.GetX509Certificate2());
+                        });
+                    }
+#endif
+                })
+#if NETSTANDARD1_3
+                .UseUrls(_urls)
+#endif
                 .Build();
 
+            IsStarted = true;
+
 #if NETSTANDARD1_3
-            System.Console.WriteLine("WireMock.Net server using netstandard1.3");
+            Console.WriteLine("WireMock.Net server using netstandard1.3");
             return Task.Run(() =>
             {
                 _host.Run(_cts.Token);
-                IsStarted = true;
             }, _cts.Token);
 #else
             System.Console.WriteLine("WireMock.Net server using netstandard2.0");
-            IsStarted = true;
-            return _host.RunAsync(_cts.Token);
+
+            return Task.Run(() =>
+            {
+                _host.Run();
+            }, _cts.Token);
 #endif
         }
 

src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs

@@ -15,12 +15,18 @@ namespace WireMock.Owin
     internal class GlobalExceptionMiddleware
 #endif
     {
+        private readonly WireMockMiddlewareOptions _options;
+
 #if !NETSTANDARD
-        public GlobalExceptionMiddleware(OwinMiddleware next) : base(next) { }
+        public GlobalExceptionMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
+        {
+            _options = options;
+        }
 #else
-        public GlobalExceptionMiddleware(RequestDelegate next)
+        public GlobalExceptionMiddleware(RequestDelegate next, WireMockMiddlewareOptions options)
         {
             Next = next;
+            _options = options;
         }
 #endif
 
@@ -42,6 +48,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);
             }
         }

src/WireMock.Net/Owin/OwinRequestMapper.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+// using System.IO;
 using System.Linq;
-using System.Text;
+// using System.Text;
 using System.Threading.Tasks;
+using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -16,7 +17,7 @@ namespace WireMock.Owin
     /// <summary>
     /// OwinRequestMapper
     /// </summary>
-    public class OwinRequestMapper
+    internal class OwinRequestMapper
     {
         /// <summary>
         /// MapAsync IOwinRequest to RequestMessage
@@ -43,20 +44,6 @@ namespace WireMock.Owin
 #endif
             string method = request.Method;
 
-            string bodyAsString = null;
-            byte[] body = null;
-            Encoding bodyEncoding = null;
-            if (ParseBody(method) && request.Body != null)
-            {
-                using (var streamReader = new StreamReader(request.Body))
-                {
-                    bodyAsString = await streamReader.ReadToEndAsync();
-                    bodyEncoding = streamReader.CurrentEncoding;
-                }
-
-                body = bodyEncoding.GetBytes(bodyAsString);
-            }
-
             Dictionary<string, string[]> headers = null;
             if (request.Headers.Any())
             {
@@ -77,10 +64,16 @@ namespace WireMock.Owin
                 }
             }
 
-            return new RequestMessage(url, method, clientIP, body, bodyAsString, bodyEncoding, headers, cookies) { DateTime = DateTime.Now };
+            BodyData body = null;
+            if (request.Body != null && ShouldParseBody(method))
+            {
+                body = await BodyParser.Parse(request.Body, request.ContentType);
+            }
+
+            return new RequestMessage(url, method, clientIP, body, headers, cookies) { DateTime = DateTime.Now };
         }
 
-        private bool ParseBody(string method)
+        private bool ShouldParseBody(string method)
         {
             /*
                 HEAD - No defined body semantics.

src/WireMock.Net/Owin/OwinResponseMapper.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using WireMock.Util;
 #if !NETSTANDARD
 using Microsoft.Owin;
@@ -65,7 +66,7 @@ namespace WireMock.Owin
                 }
             }
 
-            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null)
+            if (responseMessage.Body == null && responseMessage.BodyAsBytes == null && responseMessage.BodyAsFile == null && responseMessage.BodyAsJson == null)
             {
                 return;
             }
@@ -84,11 +85,20 @@ namespace WireMock.Owin
                 return;
             }
 
-            Encoding encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
-            using (var writer = new StreamWriter(response.Body, encoding))
+            if (responseMessage.BodyAsJson != null)
+            {
+                string jsonBody = JsonConvert.SerializeObject(responseMessage.BodyAsJson, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
+                using (var writer = new StreamWriter(response.Body, responseMessage.BodyEncoding ?? _utf8NoBom))
+                {
+                    await writer.WriteAsync(jsonBody);
+                }
+
+                return;
+            }
+
+            using (var writer = new StreamWriter(response.Body, responseMessage.BodyEncoding ?? _utf8NoBom))
             {
                 await writer.WriteAsync(responseMessage.Body);
-                // TODO : response.ContentLength = responseMessage.Body.Length;
             }
         }
     }

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -19,7 +19,7 @@ namespace WireMock.Owin
         public OwinSelfHost([NotNull] WireMockMiddlewareOptions options, [NotNull] params string[] uriPrefixes)
         {
             Check.NotNull(options, nameof(options));
-            Check.NotEmpty(uriPrefixes, nameof(uriPrefixes));
+            Check.NotNullOrEmpty(uriPrefixes, nameof(uriPrefixes));
 
             foreach (string uriPrefix in uriPrefixes)
             {
@@ -61,7 +61,7 @@ namespace WireMock.Owin
 
             Action<IAppBuilder> startup = app =>
             {
-                app.Use<GlobalExceptionMiddleware>();
+                app.Use<GlobalExceptionMiddleware>(_options);
                 _options.PreWireMockMiddlewareInit?.Invoke(app);
                 app.Use<WireMockMiddleware>(_options);
                 _options.PostWireMockMiddlewareInit?.Invoke(app);

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using WireMock.Matchers;
 using WireMock.Util;
 using Newtonsoft.Json;
+using WireMock.Http;
 #if !NETSTANDARD
 using Microsoft.Owin;
 #else
@@ -52,7 +53,7 @@ namespace WireMock.Owin
             RequestMatchResult requestMatchResult = null;
             try
             {
-                foreach (var mapping in _options.Mappings.Where(m => m?.Scenario != null))
+                foreach (var mapping in _options.Mappings.Values.Where(m => m?.Scenario != null))
                 {
                     // Set start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
@@ -61,7 +62,7 @@ namespace WireMock.Owin
                     }
                 }
 
-                var mappings = _options.Mappings
+                var mappings = _options.Mappings.Values
                     .Select(m => new
                     {
                         Mapping = m,
@@ -95,6 +96,7 @@ namespace WireMock.Owin
                 if (targetMapping == null)
                 {
                     logRequest = true;
+                    _options.Logger.Warn("HttpStatusCode set to 404 : No matching mapping found");
                     response = new ResponseMessage { StatusCode = 404, Body = "No matching mapping found" };
                     return;
                 }
@@ -103,9 +105,10 @@ namespace WireMock.Owin
 
                 if (targetMapping.IsAdminInterface && _options.AuthorizationMatcher != null)
                 {
-                    bool present = request.Headers.TryGetValue("Authorization", out WireMockList<string> authorization);
+                    bool present = request.Headers.TryGetValue(HttpKnownHeaderNames.Authorization, out WireMockList<string> authorization);
                     if (!present || _options.AuthorizationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
                     {
+                        _options.Logger.Error("HttpStatusCode set to 401");
                         response = new ResponseMessage { StatusCode = 401 };
                         return;
                     }
@@ -125,6 +128,7 @@ namespace WireMock.Owin
             }
             catch (Exception ex)
             {
+                _options.Logger.Error("HttpStatusCode set to 500");
                 response = new ResponseMessage { StatusCode = 500, Body = JsonConvert.SerializeObject(ex) };
             }
             finally

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -15,13 +15,15 @@ namespace WireMock.Owin
 {
     internal class WireMockMiddlewareOptions
     {
+        public IWireMockLogger Logger { get; set; }
+
         public TimeSpan? RequestProcessingDelay { get; set; }
 
-        public IMatcher AuthorizationMatcher { get; set; }
+        public IStringMatcher AuthorizationMatcher { get; set; }
 
         public bool AllowPartialMapping { get; set; }
 
-        public IList<Mapping> Mappings { get; set; } = new List<Mapping>();
+        public IDictionary<Guid, Mapping> Mappings { get; } = new ConcurrentDictionary<Guid, Mapping>();
 
         public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurentObservableCollection<LogEntry>();
 

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -10,38 +10,52 @@ namespace WireMock.RequestBuilders
     public interface IBodyRequestBuilder
     {
         /// <summary>
-        /// The with body.
+        /// WithBody: IMatcher
         /// </summary>
         /// <param name="matcher">The matcher.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] IMatcher matcher);
 
         /// <summary>
-        /// The with body.
+        /// WithBody: Body as string
         /// </summary>
         /// <param name="body">The body.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody(string body);
 
         /// <summary>
-        /// The with body byte[].
+        /// WithBody: Body as byte[]
         /// </summary>
-        /// <param name="body">The body as byte[].</param>
+        /// <param name="body">The body.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody(byte[] body);
 
         /// <summary>
-        /// The with body string func.
+        /// WithBody: Body as object
         /// </summary>
-        /// <param name="body">The body string function.</param>
+        /// <param name="body">The body.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> body);
+        IRequestBuilder WithBody(object body);
 
         /// <summary>
-        /// The with body byte[] func.
+        ///WithBody: func (string)
         /// </summary>
-        /// <param name="body">The body byte[] function.</param>
+        /// <param name="func">The function.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> body);
+        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+
+        /// <summary>
+        ///WithBody: func (byte[])
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
+
+        /// <summary>
+        ///WithBody: func (object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
     }
 }

src/WireMock.Net/RequestBuilders/IClientIPRequestBuilder.cs

@@ -14,7 +14,7 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithClientIP([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithClientIP([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with ClientIP.

src/WireMock.Net/RequestBuilders/IHeadersAndCookiesRequestBuilder.cs

@@ -35,7 +35,7 @@ namespace WireMock.RequestBuilders
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithHeader([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with header.
@@ -59,7 +59,7 @@ namespace WireMock.RequestBuilders
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithCookie([NotNull] string name, [NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with cookie.

src/WireMock.Net/RequestBuilders/IUrlAndPathRequestBuilder.cs

@@ -14,7 +14,7 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithPath([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithPath([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with path.
@@ -35,7 +35,7 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithUrl([NotNull] params IMatcher[] matchers);
+        IRequestBuilder WithUrl([NotNull] params IStringMatcher[] matchers);
 
         /// <summary>
         /// The with url.

src/WireMock.Net/RequestBuilders/Request.cs

@@ -59,9 +59,9 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithClientIP(params IMatcher[] matchers)
+        public IRequestBuilder WithClientIP(params IStringMatcher[] matchers)
         {
-            Check.NotEmpty(matchers, nameof(matchers));
+            Check.NotNullOrEmpty(matchers, nameof(matchers));
 
             _requestMatchers.Add(new RequestMessageClientIPMatcher(matchers));
             return this;
@@ -74,7 +74,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithClientIP(params string[] clientIPs)
         {
-            Check.NotEmpty(clientIPs, nameof(clientIPs));
+            Check.NotNullOrEmpty(clientIPs, nameof(clientIPs));
 
             _requestMatchers.Add(new RequestMessageClientIPMatcher(clientIPs));
             return this;
@@ -87,7 +87,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithClientIP(params Func<string, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessageClientIPMatcher(funcs));
             return this;
@@ -98,9 +98,9 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithPath(params IMatcher[] matchers)
+        public IRequestBuilder WithPath(params IStringMatcher[] matchers)
         {
-            Check.NotEmpty(matchers, nameof(matchers));
+            Check.NotNullOrEmpty(matchers, nameof(matchers));
 
             _requestMatchers.Add(new RequestMessagePathMatcher(matchers));
             return this;
@@ -113,7 +113,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithPath(params string[] paths)
         {
-            Check.NotEmpty(paths, nameof(paths));
+            Check.NotNullOrEmpty(paths, nameof(paths));
 
             _requestMatchers.Add(new RequestMessagePathMatcher(paths));
             return this;
@@ -126,7 +126,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithPath(params Func<string, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessagePathMatcher(funcs));
             return this;
@@ -137,9 +137,9 @@ namespace WireMock.RequestBuilders
         /// </summary>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithUrl(params IMatcher[] matchers)
+        public IRequestBuilder WithUrl(params IStringMatcher[] matchers)
         {
-            Check.NotEmpty(matchers, nameof(matchers));
+            Check.NotNullOrEmpty(matchers, nameof(matchers));
 
             _requestMatchers.Add(new RequestMessageUrlMatcher(matchers));
             return this;
@@ -152,7 +152,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithUrl(params string[] urls)
         {
-            Check.NotEmpty(urls, nameof(urls));
+            Check.NotNullOrEmpty(urls, nameof(urls));
 
             _requestMatchers.Add(new RequestMessageUrlMatcher(urls));
             return this;
@@ -165,7 +165,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithUrl(params Func<string, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessageUrlMatcher(funcs));
             return this;
@@ -228,73 +228,34 @@ namespace WireMock.RequestBuilders
         /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb"/>
         public IRequestBuilder UsingVerb(params string[] verbs)
         {
-            Check.NotEmpty(verbs, nameof(verbs));
+            Check.NotNullOrEmpty(verbs, nameof(verbs));
 
             _requestMatchers.Add(new RequestMessageMethodMatcher(verbs));
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="body">
-        /// The body.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string)"/>
         public IRequestBuilder WithBody(string body)
         {
             _requestMatchers.Add(new RequestMessageBodyMatcher(body));
             return this;
         }
 
-        /// <summary>
-        /// The with body byte[].
-        /// </summary>
-        /// <param name="body">
-        /// The body as byte[].
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[])"/>
         public IRequestBuilder WithBody(byte[] body)
         {
             _requestMatchers.Add(new RequestMessageBodyMatcher(body));
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="func">
-        /// The body function.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithBody(Func<string, bool> func)
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object)"/>
+        public IRequestBuilder WithBody(object body)
         {
-            Check.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            _requestMatchers.Add(new RequestMessageBodyMatcher(body));
             return this;
         }
 
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="func">
-        /// The body function.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithBody(Func<byte[], bool> func)
-        {
-            Check.NotNull(func, nameof(func));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
-            return this;
-        }
-
-        /// <summary>
-        /// The with body.
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder" />.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher)"/>
         public IRequestBuilder WithBody(IMatcher matcher)
         {
             Check.NotNull(matcher, nameof(matcher));
@@ -303,16 +264,34 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with parameters.
-        /// </summary>
-        /// <param name="key">
-        /// The key.
-        /// </param>
-        /// <param name="values">
-        /// The values.
-        /// </param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{string, bool})"/>
+        public IRequestBuilder WithBody(Func<string, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{byte[], bool})"/>
+        public IRequestBuilder WithBody(Func<byte[], bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(Func{object, bool})"/>
+        public IRequestBuilder WithBody(Func<object, bool> func)
+        {
+            Check.NotNull(func, nameof(func));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(func));
+            return this;
+        }
+
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, string[])"/>
         public IRequestBuilder WithParam(string key, params string[] values)
         {
             Check.NotNull(key, nameof(key));
@@ -321,14 +300,10 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <summary>
-        /// The with parameters.
-        /// </summary>
-        /// <param name="funcs">The funcs.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
         public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessageParamMatcher(funcs));
             return this;
@@ -360,10 +335,10 @@ namespace WireMock.RequestBuilders
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithHeader(string name, params IMatcher[] matchers)
+        public IRequestBuilder WithHeader(string name, params IStringMatcher[] matchers)
         {
             Check.NotNull(name, nameof(name));
-            Check.NotEmpty(matchers, nameof(matchers));
+            Check.NotNullOrEmpty(matchers, nameof(matchers));
 
             _requestMatchers.Add(new RequestMessageHeaderMatcher(name, matchers));
             return this;
@@ -376,7 +351,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithHeader(params Func<IDictionary<string, string[]>, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessageHeaderMatcher(funcs));
             return this;
@@ -401,9 +376,9 @@ namespace WireMock.RequestBuilders
         /// <param name="name">The name.</param>
         /// <param name="matchers">The matchers.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        public IRequestBuilder WithCookie(string name, params IMatcher[] matchers)
+        public IRequestBuilder WithCookie(string name, params IStringMatcher[] matchers)
         {
-            Check.NotEmpty(matchers, nameof(matchers));
+            Check.NotNullOrEmpty(matchers, nameof(matchers));
 
             _requestMatchers.Add(new RequestMessageCookieMatcher(name, matchers));
             return this;
@@ -416,7 +391,7 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         public IRequestBuilder WithCookie(params Func<IDictionary<string, string>, bool>[] funcs)
         {
-            Check.NotEmpty(funcs, nameof(funcs));
+            Check.NotNullOrEmpty(funcs, nameof(funcs));
 
             _requestMatchers.Add(new RequestMessageCookieMatcher(funcs));
             return this;

src/WireMock.Net/RequestMessage.cs

@@ -60,15 +60,20 @@ namespace WireMock
         public string RawQuery { get; }
 
         /// <summary>
-        /// Gets the bodyAsBytes.
-        /// </summary>
-        public byte[] BodyAsBytes { get; }
-
-        /// <summary>
-        /// Gets the body.
+        /// The body as string.
         /// </summary>
         public string Body { get; }
 
+        /// <summary>
+        /// The body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
+        /// </summary>
+        public byte[] BodyAsBytes { get; set; }
+
         /// <summary>
         /// Gets the Host
         /// </summary>
@@ -90,10 +95,45 @@ namespace WireMock
         public string Origin { get; }
 
         /// <summary>
-        /// Gets the body encoding.
+        /// The body encoding.
         /// </summary>
         public Encoding BodyEncoding { get; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequestMessage"/> class.
+        /// </summary>
+        /// <param name="url">The original url.</param>
+        /// <param name="method">The HTTP method.</param>
+        /// <param name="clientIP">The client IP Address.</param>
+        /// <param name="body">The body.</param>
+        /// <param name="headers">The headers.</param>
+        /// <param name="cookies">The cookies.</param>
+        public RequestMessage([NotNull] Uri url, [NotNull] string method, [NotNull] string clientIP, [CanBeNull] BodyData body, [CanBeNull] IDictionary<string, string[]> headers = null, [CanBeNull] IDictionary<string, string> cookies = null)
+        {
+            Check.NotNull(url, nameof(url));
+            Check.NotNull(method, nameof(method));
+            Check.NotNull(clientIP, nameof(clientIP));
+
+            Url = url.ToString();
+            Protocol = url.Scheme;
+            Host = url.Host;
+            Port = url.Port;
+            Origin = $"{url.Scheme}://{url.Host}:{url.Port}";
+            Path = WebUtility.UrlDecode(url.AbsolutePath);
+            Method = method.ToLower();
+            ClientIP = clientIP;
+
+            Body = body?.BodyAsString;
+            BodyEncoding = body?.Encoding;
+            BodyAsJson = body?.BodyAsJson;
+            BodyAsBytes = body?.BodyAsBytes;
+
+            Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+            Cookies = cookies;
+            RawQuery = WebUtility.UrlDecode(url.Query);
+            Query = ParseQuery(RawQuery);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessage"/> class.
         /// </summary>

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -18,6 +18,17 @@ namespace WireMock.ResponseBuilders
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
         IResponseBuilder WithBody([NotNull] string body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
 
+
+        /// <summary>
+        /// WithBody : Create a ... response based on a callback function.
+        /// </summary>
+        /// <param name="bodyFactory">The delegate to build the body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] Func<RequestMessage,string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
+
         /// <summary>
         /// WithBody : Create a ... response based on a bytearray.
         /// </summary>

src/WireMock.Net/ResponseBuilders/ICallbackResponseBuilder.cs

@@ -0,0 +1,19 @@
+using System;
+using JetBrains.Annotations;
+using WireMock.ResponseProviders;
+
+namespace WireMock.ResponseBuilders
+{
+    /// <summary>
+    /// The CallbackResponseBuilder interface.
+    /// </summary>
+    public interface ICallbackResponseBuilder : IResponseProvider
+    {
+        /// <summary>
+        /// The callback builder
+        /// </summary>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        [PublicAPI]
+        IResponseBuilder WithCallback([NotNull] Func<RequestMessage, ResponseMessage> callbackHandler);
+    }
+}

src/WireMock.Net/ResponseBuilders/IDelayResponseBuilder.cs

@@ -5,7 +5,7 @@ namespace WireMock.ResponseBuilders
     /// <summary>
     /// The DelayResponseBuilder interface.
     /// </summary>
-    public interface IDelayResponseBuilder : IResponseProvider
+    public interface IDelayResponseBuilder : ICallbackResponseBuilder
     {
         /// <summary>
         /// The with delay.

src/WireMock.Net/ResponseBuilders/IProxyResponseBuilder.cs

@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using WireMock.Settings;
 
 namespace WireMock.ResponseBuilders
 {
@@ -8,11 +9,18 @@ namespace WireMock.ResponseBuilders
     public interface IProxyResponseBuilder : IStatusCodeResponseBuilder
     {
         /// <summary>
-        /// With Proxy URL using X509Certificate2.
+        /// WithProxy URL using Client X509Certificate2.
         /// </summary>
         /// <param name="proxyUrl">The proxy url.</param>
         /// <param name="clientX509Certificate2ThumbprintOrSubjectName">The X509Certificate2 file to use for client authentication.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
         IResponseBuilder WithProxy([NotNull] string proxyUrl, [CanBeNull] string clientX509Certificate2ThumbprintOrSubjectName = null);
+
+        /// <summary>
+        /// WithProxy using IProxyAndRecordSettings.
+        /// </summary>
+        /// <param name="settings">The IProxyAndRecordSettings.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithProxy([NotNull] IProxyAndRecordSettings settings);
     }
 }

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -7,8 +7,8 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using WireMock.Http;
+using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Util;
 using WireMock.Validation;
@@ -43,16 +43,18 @@ namespace WireMock.ResponseBuilders
         /// <summary>
         /// The client X509Certificate2 Thumbprint or SubjectName to use.
         /// </summary>
-        public string X509Certificate2ThumbprintOrSubjectName { get; private set; }
+        public string ClientX509Certificate2ThumbprintOrSubjectName { get; private set; }
 
         /// <summary>
         /// Gets the response message.
         /// </summary>
-        /// <value>
-        /// The response message.
-        /// </value>
         public ResponseMessage ResponseMessage { get; }
 
+        /// <summary>
+        /// A delegate to execute to generate the response
+        /// </summary>
+        public Func<RequestMessage, ResponseMessage> Callback { get; private set; }
+
         /// <summary>
         /// Creates this instance.
         /// </summary>
@@ -165,6 +167,13 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
+        /// <inheritdoc cref="IBodyResponseBuilder.WithBody(Func{RequestMessage, string}, string, Encoding)"/>
+        public IResponseBuilder WithBody(Func<RequestMessage, string> bodyFactory, string destination = BodyDestinationFormat.SameAsSource,
+            Encoding encoding = null)
+        {
+            return WithCallback(req => new ResponseMessage {Body = bodyFactory(req)});
+        }
+
         /// <inheritdoc cref="IBodyResponseBuilder.WithBody(byte[], string, Encoding)"/>
         public IResponseBuilder WithBody(byte[] body, string destination, Encoding encoding = null)
         {
@@ -246,16 +255,9 @@ namespace WireMock.ResponseBuilders
         {
             Check.NotNull(body, nameof(body));
 
-            string jsonBody = JsonConvert.SerializeObject(body, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
-
-            if (encoding != null && !encoding.Equals(Encoding.UTF8))
-            {
-                jsonBody = encoding.GetString(Encoding.UTF8.GetBytes(jsonBody));
-                ResponseMessage.BodyEncoding = encoding;
-            }
-
             ResponseMessage.BodyDestination = null;
-            ResponseMessage.Body = jsonBody;
+            ResponseMessage.BodyAsJson = body;
+            ResponseMessage.BodyEncoding = encoding;
 
             return this;
         }
@@ -296,22 +298,35 @@ namespace WireMock.ResponseBuilders
             return WithDelay(TimeSpan.FromMilliseconds(milliseconds));
         }
 
-        /// <summary>
-        /// With Proxy URL.
-        /// </summary>
-        /// <param name="proxyUrl">The proxy url.</param>
-        /// <param name="clientX509Certificate2ThumbprintOrSubjectName">The X509Certificate2 file to use for client authentication.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(string, string)"/>
         public IResponseBuilder WithProxy(string proxyUrl, string clientX509Certificate2ThumbprintOrSubjectName = null)
         {
-            Check.NotEmpty(proxyUrl, nameof(proxyUrl));
+            Check.NotNullOrEmpty(proxyUrl, nameof(proxyUrl));
 
             ProxyUrl = proxyUrl;
-            X509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName;
+            ClientX509Certificate2ThumbprintOrSubjectName = clientX509Certificate2ThumbprintOrSubjectName;
             _httpClientForProxy = HttpClientHelper.CreateHttpClient(clientX509Certificate2ThumbprintOrSubjectName);
             return this;
         }
 
+        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(IProxyAndRecordSettings)"/>
+        public IResponseBuilder WithProxy(IProxyAndRecordSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+
+            return WithProxy(settings.Url, settings.ClientX509Certificate2ThumbprintOrSubjectName);
+        }
+
+        /// <inheritdoc cref="ICallbackResponseBuilder.WithCallback"/>
+        public IResponseBuilder WithCallback(Func<RequestMessage, ResponseMessage> callbackHandler)
+        {
+            Check.NotNull(callbackHandler, nameof(callbackHandler));
+
+            Callback = callbackHandler;
+
+            return this;
+        }
+
         /// <summary>
         /// The provide response.
         /// </summary>
@@ -340,6 +355,11 @@ namespace WireMock.ResponseBuilders
                 return ResponseMessageTransformer.Transform(requestMessage, ResponseMessage);
             }
 
+            if (Callback != null)
+            {
+                return Callback(requestMessage);
+            }
+
             return ResponseMessage;
         }
     }

src/WireMock.Net/ResponseMessage.cs

@@ -37,6 +37,11 @@ namespace WireMock
         /// </summary>
         public string Body { get; set; }
 
+        /// <summary>
+        /// Gets or sets the body as a json object.
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
         /// <summary>
         /// Gets or sets the body as bytes.
         /// </summary>
@@ -74,7 +79,7 @@ namespace WireMock
         /// <param name="values">The values.</param>
         public void AddHeader(string name, params string[] values)
         {
-            Check.NotEmpty(values, nameof(values));
+            Check.NotNullOrEmpty(values, nameof(values));
 
             var newHeaderValues = Headers.TryGetValue(name, out WireMockList<string> existingValues)
                 ? values.Union(existingValues).ToArray()

src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Validation;
+
+namespace WireMock.ResponseProviders
+{
+    internal class DynamicAsyncResponseProvider : IResponseProvider
+    {
+        private readonly Func<RequestMessage, Task<ResponseMessage>> _responseMessageFunc;
+
+        public DynamicAsyncResponseProvider([NotNull] Func<RequestMessage, Task<ResponseMessage>> responseMessageFunc)
+        {
+            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
+
+            _responseMessageFunc = responseMessageFunc;
+        }
+
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
+        {
+            return _responseMessageFunc(requestMessage);
+        }
+    }
+}

src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Validation;
+
+namespace WireMock.ResponseProviders
+{
+    internal class DynamicResponseProvider : IResponseProvider
+    {
+        private readonly Func<RequestMessage, ResponseMessage> _responseMessageFunc;
+
+        public DynamicResponseProvider([NotNull] Func<RequestMessage, ResponseMessage> responseMessageFunc)
+        {
+            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
+
+            _responseMessageFunc = responseMessageFunc;
+        }
+
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
+        {
+            return Task.FromResult(_responseMessageFunc(requestMessage));
+        }
+    }
+}

src/WireMock.Net/ResponseProviders/IResponseProvider.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 
-namespace WireMock
+namespace WireMock.ResponseProviders
 {
     /// <summary>
     /// The Response Provider interface.

src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Settings;
+using WireMock.Validation;
+
+namespace WireMock.ResponseProviders
+{
+    internal class ProxyAsyncResponseProvider : IResponseProvider
+    {
+        private readonly Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly IProxyAndRecordSettings _settings;
+
+        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] IProxyAndRecordSettings settings)
+        {
+            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
+            Check.NotNull(settings, nameof(settings));
+
+            _responseMessageFunc = responseMessageFunc;
+            _settings = settings;
+        }
+
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
+        {
+            return _responseMessageFunc(requestMessage, _settings);
+        }
+    }
+}

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -97,6 +97,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.StatusCode = null;
                 mappingModel.Response.Headers = null;
                 mappingModel.Response.BodyDestination = null;
+                mappingModel.Response.BodyAsJson = null;
                 mappingModel.Response.Body = null;
                 mappingModel.Response.BodyAsBytes = null;
                 mappingModel.Response.BodyAsFile = null;
@@ -110,6 +111,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
                 mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
                 mappingModel.Response.Headers = Map(response.ResponseMessage.Headers);
+                mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyAsJson;
                 mappingModel.Response.Body = response.ResponseMessage.Body;
                 mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyAsBytes;
                 mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyAsFile;
@@ -150,7 +152,9 @@ namespace WireMock.Serialization
         private static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
         {
             if (matchers == null || !matchers.Any())
+            {
                 return null;
+            }
 
             return matchers.Select(Map).Where(x => x != null).ToArray();
         }
@@ -158,9 +162,12 @@ namespace WireMock.Serialization
         private static MatcherModel Map([CanBeNull] IMatcher matcher)
         {
             if (matcher == null)
+            {
                 return null;
+            }
 
-            var patterns = matcher.GetPatterns();
+            IStringMatcher stringMatcher = matcher as IStringMatcher;
+            string[] patterns = stringMatcher != null ? stringMatcher.GetPatterns() : new string[0];
 
             return new MatcherModel
             {
@@ -186,7 +193,9 @@ namespace WireMock.Serialization
         public static IMatcher Map([CanBeNull] MatcherModel matcher)
         {
             if (matcher == null)
+            {
                 return null;
+            }
 
             var parts = matcher.Name.Split('.');
             string matcherName = parts[0];

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

@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Admin.Settings;
@@ -16,6 +17,7 @@ using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
+using WireMock.ResponseProviders;
 using WireMock.Serialization;
 using WireMock.Settings;
 using WireMock.Util;
@@ -43,46 +45,7 @@ namespace WireMock.Server
             NullValueHandling = NullValueHandling.Ignore,
         };
 
-        /// <summary>
-        /// Reads the static mappings from a folder.
-        /// </summary>
-        /// <param name="folder">The optional folder. If not defined, use \__admin\mappings\</param>
-        [PublicAPI]
-        public void ReadStaticMappings([CanBeNull] string folder = null)
-        {
-            if (folder == null)
-                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
-
-            if (!Directory.Exists(folder))
-                return;
-
-            foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
-            {
-                ReadStaticMapping(filename);
-            }
-        }
-
-        /// <summary>
-        /// Reads the static mapping.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        [PublicAPI]
-        public void ReadStaticMapping([NotNull] string filename)
-        {
-            Check.NotNull(filename, nameof(filename));
-
-            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(filename);
-
-            if (Guid.TryParse(filenameWithoutExtension, out var guidFromFilename))
-            {
-                DeserializeAndAddMapping(File.ReadAllText(filename), guidFromFilename);
-            }
-            else
-            {
-                DeserializeAndAddMapping(File.ReadAllText(filename));
-            }
-        }
-
+        #region InitAdmin
         private void InitAdmin()
         {
             // __admin/settings
@@ -129,13 +92,110 @@ namespace WireMock.Server
             // __admin/scenarios/reset
             Given(Request.Create().WithPath(AdminScenarios + "/reset").UsingPost()).RespondWith(new DynamicResponseProvider(ScenariosReset));
         }
+        #endregion
+
+        #region StaticMappings
+        /// <summary>
+        /// Reads the static mappings from a folder.
+        /// </summary>
+        /// <param name="folder">The optional folder. If not defined, use \__admin\mappings\</param>
+        [PublicAPI]
+        public void ReadStaticMappings([CanBeNull] string folder = null)
+        {
+            if (folder == null)
+            {
+                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
+            }
+
+            if (!Directory.Exists(folder))
+            {
+                return;
+            }
+
+            foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
+            {
+                _logger.Info("Reading Static MappingFile : '{0}'", filename);
+                ReadStaticMappingAndAddOrUpdate(filename);
+            }
+        }
+
+        /// <summary>
+        /// Watches the static mappings for changes.
+        /// </summary>
+        /// <param name="folder">The optional folder. If not defined, use \__admin\mappings\</param>
+        [PublicAPI]
+        public void WatchStaticMappings([CanBeNull] string folder = null)
+        {
+            if (folder == null)
+            {
+                folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
+            }
+
+            if (!Directory.Exists(folder))
+            {
+                return;
+            }
+
+            _logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder);
+
+            var watcher = new EnhancedFileSystemWatcher(folder, "*.json", 1000);
+            watcher.Created += (sender, args) =>
+            {
+                _logger.Info("New MappingFile created : '{0}'", args.FullPath);
+                ReadStaticMappingAndAddOrUpdate(args.FullPath);
+            };
+            watcher.Changed += (sender, args) =>
+            {
+                _logger.Info("New MappingFile updated : '{0}'", args.FullPath);
+                ReadStaticMappingAndAddOrUpdate(args.FullPath);
+            };
+            watcher.Deleted += (sender, args) =>
+            {
+                _logger.Info("New MappingFile deleted : '{0}'", args.FullPath);
+                string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath);
+
+                if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
+                {
+                    DeleteMapping(guidFromFilename);
+                }
+                else
+                {
+                    DeleteMapping(args.FullPath);
+                }
+            };
+
+            watcher.EnableRaisingEvents = true;
+        }
+
+        /// <summary>
+        /// Reads a static mapping file and adds or updates the mapping.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        [PublicAPI]
+        public void ReadStaticMappingAndAddOrUpdate([NotNull] string path)
+        {
+            Check.NotNull(path, nameof(path));
+
+            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
+
+            MappingModel mappingModel = JsonConvert.DeserializeObject<MappingModel>(FileHelper.ReadAllText(path));
+            if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
+            {
+                DeserializeAndAddOrUpdateMapping(mappingModel, guidFromFilename, path);
+            }
+            else
+            {
+                DeserializeAndAddOrUpdateMapping(mappingModel, null, path);
+            }
+        }
+        #endregion
 
         #region Proxy and Record
         private HttpClient _httpClientForProxy;
 
         private void InitProxyAndRecord(IProxyAndRecordSettings settings)
         {
-            _httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.X509Certificate2ThumbprintOrSubjectName);
+            _httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.ClientX509Certificate2ThumbprintOrSubjectName);
             Given(Request.Create().WithPath("/*").UsingAnyVerb()).RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
         }
 
@@ -149,8 +209,8 @@ namespace WireMock.Server
 
             if (settings.SaveMapping)
             {
-                var mapping = ToMapping(requestMessage, responseMessage);
-                _options.Mappings.Add(mapping);
+                var mapping = ToMapping(requestMessage, responseMessage, settings.BlackListedHeaders ?? new string[] { });
+                _options.Mappings.Add(mapping.Guid, mapping);
 
                 if (settings.SaveMappingToFile)
                 {
@@ -161,16 +221,23 @@ namespace WireMock.Server
             return responseMessage;
         }
 
-        private Mapping ToMapping(RequestMessage requestMessage, ResponseMessage responseMessage)
+        private Mapping ToMapping(RequestMessage requestMessage, ResponseMessage responseMessage, string[] blacklistedHeaders)
         {
             var request = Request.Create();
             request.WithPath(requestMessage.Path);
             request.UsingVerb(requestMessage.Method);
 
             requestMessage.Query.Loop((key, value) => request.WithParam(key, value.ToArray()));
-            requestMessage.Headers.Loop((key, value) => request.WithHeader(key, value.ToArray()));
             requestMessage.Cookies.Loop((key, value) => request.WithCookie(key, value));
 
+            requestMessage.Headers.Loop((key, value) =>
+            {
+                if (!blacklistedHeaders.Any(b => string.Equals(key, b, StringComparison.OrdinalIgnoreCase)))
+                {
+                    request.WithHeader(key, value.ToArray());
+                }
+            });
+
             if (requestMessage.Body != null)
             {
                 request.WithBody(new ExactMatcher(requestMessage.Body));
@@ -178,7 +245,7 @@ namespace WireMock.Server
 
             var response = Response.Create(responseMessage);
 
-            return new Mapping(Guid.NewGuid(), string.Empty, request, response, 0, null, null, null);
+            return new Mapping(Guid.NewGuid(), string.Empty, null, request, response, 0, null, null, null);
         }
         #endregion
 
@@ -198,7 +265,7 @@ namespace WireMock.Server
 
         private ResponseMessage SettingsUpdate(RequestMessage requestMessage)
         {
-            var settings = JsonConvert.DeserializeObject<SettingsModel>(requestMessage.Body);
+            var settings = requestMessage.Body != null ? JsonConvert.DeserializeObject<SettingsModel>(requestMessage.Body) : ((JObject)requestMessage.BodyAsJson).ToObject<SettingsModel>();
 
             if (settings.AllowPartialMapping != null)
                 _options.AllowPartialMapping = settings.AllowPartialMapping.Value;
@@ -221,7 +288,10 @@ namespace WireMock.Server
             var mapping = Mappings.FirstOrDefault(m => !m.IsAdminInterface && m.Guid == guid);
 
             if (mapping == null)
+            {
+                _logger.Warn("HttpStatusCode set to 404 : Mapping not found");
                 return new ResponseMessage { StatusCode = 404, Body = "Mapping not found" };
+            }
 
             var model = MappingConverter.ToMappingModel(mapping);
 
@@ -231,23 +301,9 @@ namespace WireMock.Server
         private ResponseMessage MappingPut(RequestMessage requestMessage)
         {
             Guid guid = Guid.Parse(requestMessage.Path.TrimStart(AdminMappings.ToCharArray()));
-            var mappingModel = JsonConvert.DeserializeObject<MappingModel>(requestMessage.Body);
 
-            if (mappingModel.Request == null)
-                return new ResponseMessage { StatusCode = 400, Body = "Request missing" };
-
-            if (mappingModel.Response == null)
-                return new ResponseMessage { StatusCode = 400, Body = "Response missing" };
-
-            var requestBuilder = InitRequestBuilder(mappingModel.Request);
-            var responseBuilder = InitResponseBuilder(mappingModel.Response);
-
-            IRespondWithAProvider respondProvider = Given(requestBuilder).WithGuid(guid);
-
-            if (!string.IsNullOrEmpty(mappingModel.Title))
-                respondProvider = respondProvider.WithTitle(mappingModel.Title);
-
-            respondProvider.RespondWith(responseBuilder);
+            MappingModel mappingModel = requestMessage.Body != null ? JsonConvert.DeserializeObject<MappingModel>(requestMessage.Body) : ((JObject)requestMessage.BodyAsJson).ToObject<MappingModel>();
+            DeserializeAndAddOrUpdateMapping(mappingModel, guid);
 
             return new ResponseMessage { Body = "Mapping added or updated" };
         }
@@ -257,7 +313,9 @@ namespace WireMock.Server
             Guid guid = Guid.Parse(requestMessage.Path.Substring(AdminMappings.Length + 1));
 
             if (DeleteMapping(guid))
+            {
                 return new ResponseMessage { Body = "Mapping removed" };
+            }
 
             return new ResponseMessage { Body = "Mapping not found" };
         }
@@ -278,13 +336,17 @@ namespace WireMock.Server
         {
             string folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
             if (!Directory.Exists(folder))
+            {
                 Directory.CreateDirectory(folder);
+            }
 
             var model = MappingConverter.ToMappingModel(mapping);
-            string json = JsonConvert.SerializeObject(model, _settings);
             string filename = !string.IsNullOrEmpty(mapping.Title) ? SanitizeFileName(mapping.Title) : mapping.Guid.ToString();
 
-            File.WriteAllText(Path.Combine(folder, filename + ".json"), json);
+            string filePath = Path.Combine(folder, filename + ".json");
+            _logger.Info("Saving Mapping to file {0}", filePath);
+
+            File.WriteAllText(filePath, JsonConvert.SerializeObject(model, _settings));
         }
 
         private static string SanitizeFileName(string name, char replaceChar = '_')
@@ -308,24 +370,25 @@ namespace WireMock.Server
         {
             try
             {
-                DeserializeAndAddMapping(requestMessage.Body);
+                MappingModel mappingModel = requestMessage.Body != null ? JsonConvert.DeserializeObject<MappingModel>(requestMessage.Body) : ((JObject)requestMessage.BodyAsJson).ToObject<MappingModel>();
+                DeserializeAndAddOrUpdateMapping(mappingModel);
             }
             catch (ArgumentException a)
             {
+                _logger.Error("HttpStatusCode set to 400 {0}", a);
                 return new ResponseMessage { StatusCode = 400, Body = a.Message };
             }
             catch (Exception e)
             {
+                _logger.Error("HttpStatusCode set to 500 {0}", e);
                 return new ResponseMessage { StatusCode = 500, Body = e.ToString() };
             }
 
             return new ResponseMessage { StatusCode = 201, Body = "Mapping added" };
         }
 
-        private void DeserializeAndAddMapping(string json, Guid? guid = null)
+        private void DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
         {
-            var mappingModel = JsonConvert.DeserializeObject<MappingModel>(json);
-
             Check.NotNull(mappingModel, nameof(mappingModel));
             Check.NotNull(mappingModel.Request, nameof(mappingModel.Request));
             Check.NotNull(mappingModel.Response, nameof(mappingModel.Response));
@@ -344,11 +407,20 @@ namespace WireMock.Server
                 respondProvider = respondProvider.WithGuid(mappingModel.Guid.Value);
             }
 
+            if (path != null)
+            {
+                respondProvider = respondProvider.WithPath(path);
+            }
+
             if (!string.IsNullOrEmpty(mappingModel.Title))
+            {
                 respondProvider = respondProvider.WithTitle(mappingModel.Title);
+            }
 
             if (mappingModel.Priority != null)
+            {
                 respondProvider = respondProvider.AtPriority(mappingModel.Priority.Value);
+            }
 
             if (mappingModel.Scenario != null)
             {
@@ -377,7 +449,10 @@ namespace WireMock.Server
             var entry = LogEntries.FirstOrDefault(r => !r.RequestMessage.Path.StartsWith("/__admin/") && r.Guid == guid);
 
             if (entry == null)
+            {
+                _logger.Warn("HttpStatusCode set to 404 : Request not found");
                 return new ResponseMessage { StatusCode = 404, Body = "Request not found" };
+            }
 
             var model = ToLogEntryModel(entry);
 
@@ -419,6 +494,8 @@ namespace WireMock.Server
                     Query = logEntry.RequestMessage.Query,
                     Method = logEntry.RequestMessage.Method,
                     Body = logEntry.RequestMessage.Body,
+                    BodyAsJson = logEntry.RequestMessage.BodyAsJson,
+                    BodyAsBytes = logEntry.RequestMessage.BodyAsBytes,
                     Headers = logEntry.RequestMessage.Headers,
                     Cookies = logEntry.RequestMessage.Cookies,
                     BodyEncoding = logEntry.RequestMessage.BodyEncoding != null ? new EncodingModel
@@ -433,6 +510,7 @@ namespace WireMock.Server
                     StatusCode = logEntry.ResponseMessage.StatusCode,
                     BodyDestination = logEntry.ResponseMessage.BodyDestination,
                     Body = logEntry.ResponseMessage.Body,
+                    BodyAsJson = logEntry.ResponseMessage.BodyAsJson,
                     BodyAsBytes = logEntry.ResponseMessage.BodyAsBytes,
                     BodyOriginal = logEntry.ResponseMessage.BodyOriginal,
                     BodyAsFile = logEntry.ResponseMessage.BodyAsFile,
@@ -473,7 +551,7 @@ namespace WireMock.Server
         #region Requests/find
         private ResponseMessage RequestsFind(RequestMessage requestMessage)
         {
-            var requestModel = JsonConvert.DeserializeObject<RequestModel>(requestMessage.Body);
+            var requestModel = requestMessage.Body != null ? JsonConvert.DeserializeObject<RequestModel>(requestMessage.Body) : ((JObject)requestMessage.BodyAsJson).ToObject<RequestModel>();
 
             var request = (Request)InitRequestBuilder(requestModel);
 
@@ -529,7 +607,7 @@ namespace WireMock.Server
                     var clientIPModel = JsonUtils.ParseJTokenToObject<ClientIPModel>(requestModel.ClientIP);
                     if (clientIPModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithPath(clientIPModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -546,7 +624,7 @@ namespace WireMock.Server
                     var pathModel = JsonUtils.ParseJTokenToObject<PathModel>(requestModel.Path);
                     if (pathModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -563,7 +641,7 @@ namespace WireMock.Server
                     var urlModel = JsonUtils.ParseJTokenToObject<UrlModel>(requestModel.Url);
                     if (urlModel?.Matchers != null)
                     {
-                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).ToArray());
+                        requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                     }
                 }
             }
@@ -577,7 +655,7 @@ namespace WireMock.Server
             {
                 foreach (var headerModel in requestModel.Headers.Where(h => h.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    requestBuilder = requestBuilder.WithHeader(headerModel.Name, headerModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -585,7 +663,7 @@ namespace WireMock.Server
             {
                 foreach (var cookieModel in requestModel.Cookies.Where(c => c.Matchers != null))
                 {
-                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MappingConverter.Map).ToArray());
+                    requestBuilder = requestBuilder.WithCookie(cookieModel.Name, cookieModel.Matchers.Select(MappingConverter.Map).Cast<IStringMatcher>().ToArray());
                 }
             }
 
@@ -681,7 +759,7 @@ namespace WireMock.Server
             {
                 Body = JsonConvert.SerializeObject(result, _settings),
                 StatusCode = 200,
-                Headers = new Dictionary<string, WireMockList<string>> { { "Content-Type", new WireMockList<string>("application/json") } }
+                Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>("application/json") } }
             };
         }
 

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

@@ -14,7 +14,7 @@ namespace WireMock.Server
     public partial class FluentMockServer
     {
         /// <summary>
-        /// Log entries notification handler
+        /// Occurs when [log entries changed].
         /// </summary>
         [PublicAPI]
         public event NotifyCollectionChangedEventHandler LogEntriesChanged
@@ -66,7 +66,7 @@ namespace WireMock.Server
         }
 
         /// <summary>
-        /// Deletes the mapping.
+        /// Deletes a LogEntry.
         /// </summary>
         /// <param name="guid">The unique identifier.</param>
         [PublicAPI]
@@ -83,4 +83,4 @@ namespace WireMock.Server
             return false;
         }
     }
-}
+}

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,18 +1,20 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Newtonsoft.Json;
 using WireMock.Http;
+using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.Settings;
 using WireMock.Validation;
 using WireMock.Owin;
+using WireMock.ResponseProviders;
 
 namespace WireMock.Server
 {
@@ -21,6 +23,7 @@ namespace WireMock.Server
     /// </summary>
     public partial class FluentMockServer : IDisposable
     {
+        private readonly IWireMockLogger _logger;
         private const int ServerStartDelay = 100;
         private readonly IOwinSelfHost _httpServer;
         private readonly WireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
@@ -47,7 +50,7 @@ namespace WireMock.Server
         /// Gets the mappings.
         /// </summary>
         [PublicAPI]
-        public IEnumerable<Mapping> Mappings => new ReadOnlyCollection<Mapping>(_options.Mappings);
+        public IEnumerable<Mapping> Mappings => _options.Mappings.Values.ToArray();
 
         /// <summary>
         /// Gets the scenarios.
@@ -93,7 +96,7 @@ namespace WireMock.Server
         [PublicAPI]
         public static FluentMockServer Start(params string[] urls)
         {
-            Check.NotEmpty(urls, nameof(urls));
+            Check.NotNullOrEmpty(urls, nameof(urls));
 
             return new FluentMockServer(new FluentMockServerSettings
             {
@@ -126,7 +129,7 @@ namespace WireMock.Server
         [PublicAPI]
         public static FluentMockServer StartWithAdminInterface(params string[] urls)
         {
-            Check.NotEmpty(urls, nameof(urls));
+            Check.NotNullOrEmpty(urls, nameof(urls));
 
             return new FluentMockServer(new FluentMockServerSettings
             {
@@ -143,7 +146,7 @@ namespace WireMock.Server
         [PublicAPI]
         public static FluentMockServer StartWithAdminInterfaceAndReadStaticMappings(params string[] urls)
         {
-            Check.NotEmpty(urls, nameof(urls));
+            Check.NotNullOrEmpty(urls, nameof(urls));
 
             return new FluentMockServer(new FluentMockServerSettings
             {
@@ -155,9 +158,14 @@ namespace WireMock.Server
 
         private FluentMockServer(IFluentMockServerSettings settings)
         {
+            settings.Logger = settings.Logger ?? new WireMockConsoleLogger();
+            _logger = settings.Logger;
+
+            _logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
+
             if (settings.Urls != null)
             {
-                Urls = settings.Urls;
+                Urls = settings.Urls.Select(u => u.EndsWith("/") ? u : $"{u}/").ToArray();
             }
             else
             {
@@ -167,14 +175,13 @@ namespace WireMock.Server
 
             _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
             _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
+            _options.Logger = _logger;
 
 #if NETSTANDARD
             _httpServer = new AspNetCoreSelfHost(_options, Urls);
 #else
             _httpServer = new OwinSelfHost(_options, Urls);
 #endif
-            IsStarted = _httpServer.IsStarted;
-
             Ports = _httpServer.Ports;
 
             _httpServer.StartAsync();
@@ -182,6 +189,8 @@ namespace WireMock.Server
             // Fix for 'Bug: Server not listening after Start() returns (on macOS)'
             Task.Delay(ServerStartDelay).Wait();
 
+            IsStarted = _httpServer.IsStarted;
+
             if (settings.AllowPartialMapping == true)
             {
                 AllowPartialMapping();
@@ -202,6 +211,11 @@ namespace WireMock.Server
                 ReadStaticMappings();
             }
 
+            if (settings.WatchStaticMappings == true)
+            {
+                WatchStaticMappings();
+            }
+
             if (settings.ProxyAndRecordSettings != null)
             {
                 InitProxyAndRecord(settings.ProxyAndRecordSettings);
@@ -263,7 +277,10 @@ namespace WireMock.Server
         [PublicAPI]
         public void ResetMappings()
         {
-            _options.Mappings = _options.Mappings.Where(m => m.IsAdminInterface).ToList();
+            foreach (var nonAdmin in _options.Mappings.Where(m => !m.Value.IsAdminInterface))
+            {
+                _options.Mappings.Remove(nonAdmin);
+            }
         }
 
         /// <summary>
@@ -274,16 +291,21 @@ namespace WireMock.Server
         public bool DeleteMapping(Guid guid)
         {
             // Check a mapping exists with the same GUID, if so, remove it.
-            var existingMapping = _options.Mappings.FirstOrDefault(m => m.Guid == guid);
-            if (existingMapping != null)
+            if (_options.Mappings.ContainsKey(guid))
             {
-                _options.Mappings.Remove(existingMapping);
-                return true;
+                return _options.Mappings.Remove(guid);
             }
 
             return false;
         }
 
+        private bool DeleteMapping(string path)
+        {
+            // Check a mapping exists with the same path, if so, remove it.
+            var mapping = _options.Mappings.FirstOrDefault(entry => string.Equals(entry.Value.Path, path, StringComparison.OrdinalIgnoreCase));
+            return DeleteMapping(mapping.Key);
+        }
+
         /// <summary>
         /// The add request processing delay.
         /// </summary>
@@ -298,9 +320,10 @@ namespace WireMock.Server
         /// Allows the partial mapping.
         /// </summary>
         [PublicAPI]
-        public void AllowPartialMapping()
+        public void AllowPartialMapping(bool allow = true)
         {
-            _options.AllowPartialMapping = true;
+            _logger.Info("AllowPartialMapping is set to {0}", allow);
+            _options.AllowPartialMapping = allow;
         }
 
         /// <summary>
@@ -371,14 +394,13 @@ namespace WireMock.Server
         private void RegisterMapping(Mapping mapping)
         {
             // Check a mapping exists with the same Guid, if so, replace it.
-            var existingMapping = _options.Mappings.FirstOrDefault(m => m.Guid == mapping.Guid);
-            if (existingMapping != null)
+            if (_options.Mappings.ContainsKey(mapping.Guid))
             {
-                _options.Mappings[_options.Mappings.IndexOf(existingMapping)] = mapping;
+                _options.Mappings[mapping.Guid] = mapping;
             }
             else
             {
-                _options.Mappings.Add(mapping);
+                _options.Mappings.Add(mapping.Guid, mapping);
             }
         }
     }

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -1,4 +1,5 @@
 using System;
+using WireMock.ResponseProviders;
 
 namespace WireMock.Server
 {
@@ -21,6 +22,13 @@ namespace WireMock.Server
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
         IRespondWithAProvider WithTitle(string title);
 
+        /// <summary>
+        /// Define the full filepath for this mapping.
+        /// </summary>
+        /// <param name="path">The full filepath.</param>
+        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        IRespondWithAProvider WithPath(string path);
+
         /// <summary>
         /// Define a unique identifier for this mapping.
         /// </summary>

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -1,5 +1,6 @@
 using System;
 using WireMock.Matchers.Request;
+using WireMock.ResponseProviders;
 
 namespace WireMock.Server
 {
@@ -11,18 +12,11 @@ namespace WireMock.Server
         private int _priority;
         private Guid? _guid;
         private string _title;
+        private string _path;
         private object _executionConditionState;
         private object _nextState;
         private string _scenario;
-
-        /// <summary>
-        /// The _registration callback.
-        /// </summary>
         private readonly RegistrationCallback _registrationCallback;
-
-        /// <summary>
-        /// The _request matcher.
-        /// </summary>
         private readonly IRequestMatcher _requestMatcher;
 
         /// <summary>
@@ -39,30 +33,20 @@ namespace WireMock.Server
         /// <summary>
         /// The respond with.
         /// </summary>
-        /// <param name="provider">
-        /// The provider.
-        /// </param>
+        /// <param name="provider">The provider.</param>
         public void RespondWith(IResponseProvider provider)
         {
             var mappingGuid = _guid ?? Guid.NewGuid();
-            _registrationCallback(new Mapping(mappingGuid, _title, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState));
+            _registrationCallback(new Mapping(mappingGuid, _title, _path, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState));
         }
 
-        /// <summary>
-        /// Define a unique identifier for this mapping.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        /// <see cref="IRespondWithAProvider.WithGuid(string)"/>
         public IRespondWithAProvider WithGuid(string guid)
         {
             return WithGuid(Guid.Parse(guid));
         }
 
-        /// <summary>
-        /// Define a unique identifier for this mapping.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        /// <see cref="IRespondWithAProvider.WithGuid(Guid)"/>
         public IRespondWithAProvider WithGuid(Guid guid)
         {
             _guid = guid;
@@ -70,11 +54,7 @@ namespace WireMock.Server
             return this;
         }
 
-        /// <summary>
-        /// Define a unique identifier for this mapping.
-        /// </summary>
-        /// <param name="title">The unique identifier.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        /// <see cref="IRespondWithAProvider.WithTitle"/>
         public IRespondWithAProvider WithTitle(string title)
         {
             _title = title;
@@ -82,11 +62,15 @@ namespace WireMock.Server
             return this;
         }
 
-        /// <summary>
-        /// Define the priority for this mapping.
-        /// </summary>
-        /// <param name="priority">The priority.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+        /// <see cref="IRespondWithAProvider.WithPath"/>
+        public IRespondWithAProvider WithPath(string path)
+        {
+            _path = path;
+
+            return this;
+        }
+
+        /// <see cref="IRespondWithAProvider.AtPriority"/>
         public IRespondWithAProvider AtPriority(int priority)
         {
             _priority = priority;
@@ -94,6 +78,7 @@ namespace WireMock.Server
             return this;
         }
 
+        /// <see cref="IRespondWithAProvider.InScenario(string)"/>
         public IRespondWithAProvider InScenario(string scenario)
         {
             _scenario = scenario;
@@ -101,6 +86,7 @@ namespace WireMock.Server
             return this;
         }
 
+        /// <see cref="IRespondWithAProvider.WhenStateIs"/>
         public IRespondWithAProvider WhenStateIs(object state)
         {
             if (string.IsNullOrEmpty(_scenario))
@@ -118,6 +104,7 @@ namespace WireMock.Server
             return this;
         }
 
+        /// <see cref="IRespondWithAProvider.WillSetStateTo"/>
         public IRespondWithAProvider WillSetStateTo(object state)
         {
             if (string.IsNullOrEmpty(_scenario))

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,5 +1,7 @@
 using System;
 using JetBrains.Annotations;
+using Newtonsoft.Json;
+using WireMock.Logging;
 
 namespace WireMock.Settings
 {
@@ -25,6 +27,10 @@ namespace WireMock.Settings
         [PublicAPI]
         public bool? ReadStaticMappings { get; set; }
 
+        /// <inheritdoc cref="IFluentMockServerSettings.WatchStaticMappings"/>
+        [PublicAPI]
+        public bool? WatchStaticMappings { get; set; }
+
         /// <inheritdoc cref="IFluentMockServerSettings.ProxyAndRecordSettings"/>
         [PublicAPI]
         public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
@@ -59,10 +65,17 @@ namespace WireMock.Settings
 
         /// <inheritdoc cref="IFluentMockServerSettings.PreWireMockMiddlewareInit"/>
         [PublicAPI]
+        [JsonIgnore]
         public Action<object> PreWireMockMiddlewareInit { get; set; }
 
         /// <inheritdoc cref="IFluentMockServerSettings.PostWireMockMiddlewareInit"/>
         [PublicAPI]
+        [JsonIgnore]
         public Action<object> PostWireMockMiddlewareInit { get; set; }
+
+        /// <inheritdoc cref="IFluentMockServerSettings.Logger"/>
+        [PublicAPI]
+        [JsonIgnore]
+        public IWireMockLogger Logger { get; set; } = new WireMockNullLogger();
     }
 }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -1,4 +1,6 @@
 using System;
+using JetBrains.Annotations;
+using WireMock.Logging;
 
 namespace WireMock.Settings
 {
@@ -10,72 +12,98 @@ namespace WireMock.Settings
         /// <summary>
         /// Gets or sets the port.
         /// </summary>
+        [PublicAPI]
         int? Port { get; set; }
 
         /// <summary>
         /// Gets or sets the use SSL.
         /// </summary>
         // ReSharper disable once InconsistentNaming
+        [PublicAPI]
         bool? UseSSL { get; set; }
 
         /// <summary>
         /// Gets or sets wether to start admin interface.
         /// </summary>
+        [PublicAPI]
         bool? StartAdminInterface { get; set; }
 
         /// <summary>
         /// Gets or sets if the static mappings should be read at startup.
         /// </summary>
+        [PublicAPI]
         bool? ReadStaticMappings { get; set; }
 
+        /// <summary>
+        /// Watch the static mapping files + folder for changes when running.
+        /// </summary>
+        [PublicAPI]
+        bool? WatchStaticMappings { get; set; }
+
         /// <summary>
         /// Gets or sets if the proxy and record settings.
         /// </summary>
+        [PublicAPI]
         IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
 
         /// <summary>
         /// Gets or sets the urls.
         /// </summary>
+        [PublicAPI]
         string[] Urls { get; set; }
 
         /// <summary>
         /// StartTimeout
         /// </summary>
+        [PublicAPI]
         int StartTimeout { get; set; }
 
         /// <summary>
         /// Allow Partial Mapping (default set to false).
         /// </summary>
+        [PublicAPI]
         bool? AllowPartialMapping { get; set; }
 
         /// <summary>
         /// The username needed for __admin access.
         /// </summary>
+        [PublicAPI]
         string AdminUsername { get; set; }
 
         /// <summary>
         /// The password needed for __admin access.
         /// </summary>
+        [PublicAPI]
         string AdminPassword { get; set; }
 
         /// <summary>
         /// The RequestLog expiration in hours (optional).
         /// </summary>
+        [PublicAPI]
         int? RequestLogExpirationDuration { get; set; }
 
         /// <summary>
         /// The MaxRequestLog count (optional).
         /// </summary>
+        [PublicAPI]
         int? MaxRequestLogCount { get; set; }
 
         /// <summary>
         /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
         /// </summary>
+        [PublicAPI]
         Action<object> PreWireMockMiddlewareInit { get; set; }
 
         /// <summary>
         /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
         /// </summary>
+        [PublicAPI]
         Action<object> PostWireMockMiddlewareInit { get; set; }
+
+        /// <summary>
+        /// The IWireMockLogger which logs Debug, Info, Warning or Error
+        /// </summary>
+        [PublicAPI]
+        IWireMockLogger Logger { get; set; }
     }
 }

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -1,7 +1,7 @@
 namespace WireMock.Settings
 {
     /// <summary>
-    /// IRecordAndSaveSettings
+    /// IProxyAndRecordSettings
     /// </summary>
     public interface IProxyAndRecordSettings
     {
@@ -21,8 +21,14 @@
         bool SaveMappingToFile { get; set; }
 
         /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use. Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+        /// The clientCertificate thumbprint or subject name fragment to use.
+        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
         /// </summary>
-        string X509Certificate2ThumbprintOrSubjectName { get; set; }
+        string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <summary>
+        /// Defines a list from headers which will excluded from the saved mappings.
+        /// </summary>
+        string[] BlackListedHeaders { get; set; }
     }
 }

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -3,7 +3,7 @@
 namespace WireMock.Settings
 {
     /// <summary>
-    /// RecordAndSaveSettings
+    /// ProxyAndRecordSettings
     /// </summary>
     public class ProxyAndRecordSettings : IProxyAndRecordSettings
     {
@@ -19,8 +19,12 @@ namespace WireMock.Settings
         [PublicAPI]
         public bool SaveMappingToFile { get; set; } = true;
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.X509Certificate2ThumbprintOrSubjectName"/>
+        /// <inheritdoc cref="IProxyAndRecordSettings.ClientX509Certificate2ThumbprintOrSubjectName"/>
         [PublicAPI]
-        public string X509Certificate2ThumbprintOrSubjectName { get; set; }
+        public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+        /// <inheritdoc cref="IProxyAndRecordSettings.BlackListedHeaders"/>
+        [PublicAPI]
+        public string[] BlackListedHeaders { get; set; }
     }
 }

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using HandlebarsDotNet;
+using Newtonsoft.Json;
 using WireMock.Util;
 
 namespace WireMock.Transformers
@@ -9,13 +10,31 @@ namespace WireMock.Transformers
     {
         public static ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original)
         {
-            var responseMessage = new ResponseMessage { StatusCode = original.StatusCode, BodyOriginal = original.Body };
+            bool bodyIsJson = original.BodyAsJson != null;
+            var responseMessage = new ResponseMessage { StatusCode = original.StatusCode };
+
+            if (!bodyIsJson)
+            {
+                responseMessage.BodyOriginal = original.Body;
+            }
 
             var template = new { request = requestMessage };
 
             // Body
-            var templateBody = Handlebars.Compile(original.Body);
-            responseMessage.Body = templateBody(template);
+            string body = bodyIsJson ? JsonConvert.SerializeObject(original.BodyAsJson) : original.Body;
+            if (body != null)
+            {
+                var templateBody = Handlebars.Compile(body);
+
+                if (!bodyIsJson)
+                {
+                    responseMessage.Body = templateBody(template);
+                }
+                else
+                {
+                    responseMessage.BodyAsJson = JsonConvert.DeserializeObject(templateBody(template));
+                }
+            }
 
             // Headers
             var newHeaders = new Dictionary<string, WireMockList<string>>();

src/WireMock.Net/Util/BodyData.cs

@@ -0,0 +1,30 @@
+using System.Text;
+
+namespace WireMock.Util
+{
+    /// <summary>
+    /// BodyData
+    /// </summary>
+    public class BodyData
+    {
+        /// <summary>
+        /// The body encoding.
+        /// </summary>
+        public Encoding Encoding { get; set; }
+
+        /// <summary>
+        /// The body as string.
+        /// </summary>
+        public string BodyAsString { get; set; }
+
+        /// <summary>
+        /// The body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
+        /// </summary>
+        public byte[] BodyAsBytes { get; set; }
+    }
+}

src/WireMock.Net/Util/BodyParser.cs

@@ -0,0 +1,81 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+
+namespace WireMock.Util
+{
+    internal static class BodyParser
+    {
+        private static readonly string[] TextContentTypes =
+        {
+            "text/",
+            "application/javascript", "application/typescript",
+            "application/xml", "application/xhtml+xml",
+            "application/x-www-form-urlencoded"
+        };
+
+        private static async Task<Tuple<string, Encoding>> ReadStringAsync(Stream stream)
+        {
+            using (var streamReader = new StreamReader(stream))
+            {
+                string content = await streamReader.ReadToEndAsync();
+
+                return new Tuple<string, Encoding>(content, streamReader.CurrentEncoding);
+            }
+        }
+
+        private static async Task<byte[]> ReadBytesAsync(Stream stream)
+        {
+            using (var memoryStream = new MemoryStream())
+            {
+                await stream.CopyToAsync(memoryStream);
+                return memoryStream.ToArray();
+            }
+        }
+
+        public static async Task<BodyData> Parse([NotNull] Stream stream, [CanBeNull] string contentTypeHeaderValue)
+        {
+            var data = new BodyData();
+
+            if (contentTypeHeaderValue != null && TextContentTypes.Any(t => contentTypeHeaderValue.StartsWith(t, StringComparison.OrdinalIgnoreCase)))
+            {
+                try
+                {
+                    var stringData = await ReadStringAsync(stream);
+                    data.BodyAsString = stringData.Item1;
+                    data.Encoding = stringData.Item2;
+                }
+                catch
+                {
+                    // Reading as string failed, just get the ByteArray.
+                    data.BodyAsBytes = await ReadBytesAsync(stream);
+                }
+            }
+            else if (contentTypeHeaderValue != null && contentTypeHeaderValue.StartsWith("application/json", StringComparison.OrdinalIgnoreCase))
+            {
+                var stringData = await ReadStringAsync(stream);
+                data.Encoding = stringData.Item2;
+
+                try
+                {
+                    data.BodyAsJson = JsonConvert.DeserializeObject(stringData.Item1, new JsonSerializerSettings { Formatting = Formatting.Indented });
+                }
+                catch
+                {
+                    // JsonConvert failed, just set the Body as string.
+                    data.BodyAsString = stringData.Item1;
+                }
+            }
+            else
+            {
+                data.BodyAsBytes = await ReadBytesAsync(stream);
+            }
+
+            return data;
+        }
+    }
+}