Merge branch 'master' into webapp

CHANGELOG.md

@@ -1,54 +1,3 @@
-# 1.0.25.0 (23 July 2019)
-- [#304](https://github.com/WireMock-Net/WireMock.Net/pull/304) - Support WithBody with multiple matchers [feature] contributed by [StefH](https://github.com/StefH)
-- [#303](https://github.com/WireMock-Net/WireMock.Net/issues/303) - Question: WithBody can't be used with multiple matching rules? [question]
-
-# 1.0.24.0 (22 July 2019)
-- [#302](https://github.com/WireMock-Net/WireMock.Net/pull/302) - Fixed bug 301 by not setting BodyAsFile to null after first use [bug] contributed by [rwwilden](https://github.com/rwwilden)
-- [#299](https://github.com/WireMock-Net/WireMock.Net/issues/299) - Get Mappings models instead of just IMapping interface [feature, question]
-- [#300](https://github.com/WireMock-Net/WireMock.Net/issues/300) - Integration with Azure Function [question]
-- [#301](https://github.com/WireMock-Net/WireMock.Net/issues/301) - Error thrown when calling mocked endpoint second time when using file-based response body [bug]
-
-# 1.0.23.0 (16 July 2019)
-- [#298](https://github.com/WireMock-Net/WireMock.Net/pull/298) - MappingModels [feature] contributed by [StefH](https://github.com/StefH)
-
-# 1.0.22.0 (15 July 2019)
-- [#297](https://github.com/WireMock-Net/WireMock.Net/pull/297) - FixNullRef (#295) contributed by [StefH](https://github.com/StefH)
-- [#178](https://github.com/WireMock-Net/WireMock.Net/issues/178) - Bug: Path matching fails when the URL contains encoded parts [bug, question]
-- [#295](https://github.com/WireMock-Net/WireMock.Net/issues/295) - NullRef in 1.0.21 [bug]
-- [#296](https://github.com/WireMock-Net/WireMock.Net/issues/296) - url param - how to accept either of multiple values [question]
-
-# 1.0.21.0 (03 July 2019)
-- [#286](https://github.com/WireMock-Net/WireMock.Net/pull/286) - Handlebars Extension [feature] contributed by [StefH](https://github.com/StefH)
-- [#293](https://github.com/WireMock-Net/WireMock.Net/pull/293) - workaround for AppContext.BaseDirectory being null on some platforms contributed by [eli-darkly](https://github.com/eli-darkly)
-- [#294](https://github.com/WireMock-Net/WireMock.Net/pull/294) - don't strip request body if we don't recognize the request method contributed by [eli-darkly](https://github.com/eli-darkly)
-- [#275](https://github.com/WireMock-Net/WireMock.Net/issues/275) - Server not starting up with 1.0.15 code [invalid, question]
-- [#280](https://github.com/WireMock-Net/WireMock.Net/issues/280) - Static Mapping Not work [question]
-- [#285](https://github.com/WireMock-Net/WireMock.Net/issues/285) - Need ability to add custom ResponseMessageTransformers [feature, question]
-- [#288](https://github.com/WireMock-Net/WireMock.Net/issues/288) - Allow setting root folder in LocalFileSystemHandler [feature, question]
-- [#289](https://github.com/WireMock-Net/WireMock.Net/issues/289) - Bug:  When WatchStaticMappings=true throws exceptions on updating the mapping files [bug]
-- [#290](https://github.com/WireMock-Net/WireMock.Net/issues/290) - Request body is dropped if verb is REPORT [bug]
-- [#291](https://github.com/WireMock-Net/WireMock.Net/issues/291) - Define multiple scenarios for the same url path and switch to it at run-time? [question]
-- [#292](https://github.com/WireMock-Net/WireMock.Net/issues/292) - Can't start server in Xamarin Android [bug]
-
-# 1.0.20.0 (17 June 2019)
-- [#284](https://github.com/WireMock-Net/WireMock.Net/pull/284) - Add SaveToFile in the mapping [feature] contributed by [StefH](https://github.com/StefH)
-
-# 1.0.19.0 (15 June 2019)
-- [#279](https://github.com/WireMock-Net/WireMock.Net/issues/279) - How to simulate disconnect? [question]
-- [#283](https://github.com/WireMock-Net/WireMock.Net/issues/283) - Support equal-sign in query [bug]
-
-# 1.0.18.0 (10 June 2019)
-- [#282](https://github.com/WireMock-Net/WireMock.Net/pull/282) - WireMock.Net.Standalone : Add --WireMockLogger commandline argument [feature] contributed by [StefH](https://github.com/StefH)
-
-# 1.0.17.0 (05 June 2019)
-- [#278](https://github.com/WireMock-Net/WireMock.Net/pull/278) - Add support for HandleBars File (to read a file) [feature] contributed by [StefH](https://github.com/StefH)
-- [#276](https://github.com/WireMock-Net/WireMock.Net/issues/276) - No server response in Postman and Receive Failure in Fiddler [invalid]
-
-# 1.0.16.0 (16 May 2019)
-- [#274](https://github.com/WireMock-Net/WireMock.Net/pull/274) - Sign Assembly [feature] contributed by [StefH](https://github.com/StefH)
-- [#160](https://github.com/WireMock-Net/WireMock.Net/issues/160) - Feature: Sign 'WireMock.Net' [feature]
-- [#267](https://github.com/WireMock-Net/WireMock.Net/issues/267) - Assembly does not have strong name
-
 # 1.0.15.0 (04 May 2019)
 - [#271](https://github.com/WireMock-Net/WireMock.Net/pull/271) - Support Dynamic response files using Handlebars templating [bug, feature] contributed by [StefH](https://github.com/StefH)
 - [#272](https://github.com/WireMock-Net/WireMock.Net/pull/272) - Add unit test for JsonPath and BodyAsFile mapping contributed by [denstorti](https://github.com/denstorti)

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.25</VersionPrefix>
+    <VersionPrefix>1.0.15</VersionPrefix>
   </PropertyGroup>
 
   <Choose>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.25.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.15.0

README.md

@@ -3,14 +3,12 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 
 ## Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
-* Library can be used in unit tests and integration tests
-* Runs as a standalone process, as windows service, as Azure/IIS or as docker
+* Runs in unit tests, as a standalone process, as windows service, as Azure or IIS or as docker
 * Configurable via a fluent DotNet API, JSON files and JSON over HTTP
 * Record/playback of stubs (proxying)
 * Per-request conditional proxying
 * Stateful behaviour simulation
 * Response templating / transformation using Handlebars and extensions
-* Can be used locally or in CI/CD scenarios.
 
 ## Info
 | | |

WireMock.Net Solution.sln

@@ -62,6 +62,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp2", "examples\WireMock.Net.Console.NETCoreApp2\WireMock.Net.Console.NETCoreApp2.csproj", "{83645809-9E01-4E81-8733-BA9497554ABF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.WebApp", "src\WireMock.Net.WebApp\WireMock.Net.WebApp.csproj", "{D4782470-6CC1-4454-9D17-409F6CC286CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -136,6 +138,10 @@ Global
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4782470-6CC1-4454-9D17-409F6CC286CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4782470-6CC1-4454-9D17-409F6CC286CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4782470-6CC1-4454-9D17-409F6CC286CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4782470-6CC1-4454-9D17-409F6CC286CE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -158,6 +164,7 @@ Global
 		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{D4782470-6CC1-4454-9D17-409F6CC286CE} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

azure-pipelines.yml

@@ -38,9 +38,6 @@ steps:
     %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner end /d:sonar.login="$(SONAR_TOKEN)"
   displayName: End SonarScanner
 
-- task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19
-  displayName: 'WhiteSource Bolt'
-
 # Upload coverage to codecov.io
 - script: |
     %USERPROFILE%\.nuget\packages\codecov\1.1.0\tools\codecov.exe -f "./test/WireMock.Net.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)

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

@@ -50,12 +50,6 @@ namespace WireMock.Net.ConsoleApplication
             return File.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
         }
 
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public string ReadResponseBodyAsString(string path)
-        {
-            return File.ReadAllText(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
-
         /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
         public bool FileExists(string path)
         {

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

@@ -33,8 +33,7 @@ namespace WireMock.Net.ConsoleApplication
                 PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
                 Logger = new WireMockConsoleLogger(),
 
-                // Uncomment below if you want to use the CustomFileSystemFileHandler
-                // FileSystemHandler = new CustomFileSystemFileHandler()
+                FileSystemHandler = new CustomFileSystemFileHandler()
             });
             System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
 
@@ -94,13 +93,6 @@ namespace WireMock.Net.ConsoleApplication
                 )
                 .RespondWith(Response.Create().WithBody("XPathMatcher!"));
 
-            server
-                .Given(Request.Create()
-                    .WithPath("/xpaths").UsingPost()
-                    .WithBody(new[] { new XPathMatcher("/todo-list[count(todo-item) = 3]"), new XPathMatcher("/todo-list[count(todo-item) = 4]") })
-                )
-                .RespondWith(Response.Create().WithBody("xpaths!"));
-
             server
                 .Given(Request
                     .Create()
@@ -446,17 +438,6 @@ namespace WireMock.Net.ConsoleApplication
                     .WithBody("<xml>ok</xml>")
                 );
 
-            server.Given(Request.Create()
-                    .WithPath("/services/query/")
-                    .WithParam("q", "SELECT Id from User where username='user@gmail.com'")
-                    .UsingGet())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBodyAsJson(new { Id = "5bdf076c-5654-4b3e-842c-7caf1fabf8c9" }));
-
-            System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
-
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();

examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "WireMock.Net.StandAlone.NETCoreApp": {
       "commandName": "Project",
-      "commandLineArgs": "--Urls http://*:9091 --WireMockLogger WireMockConsoleLogger"
+      "commandLineArgs": "--Urls http://*:9091"
     }
   }
 }

src/WireMock.Net.StandAlone/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+[assembly: InternalsVisibleTo("WireMock.Net.Tests")]
 
 // Needed for Moq in the UnitTest project
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -50,7 +50,7 @@ namespace WireMock.Net.StandAlone
                 AdminUsername = parser.GetStringValue("AdminUsername"),
                 AdminPassword = parser.GetStringValue("AdminPassword"),
                 MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
-                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration")
+                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
             };
 
             if (logger != null)
@@ -58,11 +58,6 @@ namespace WireMock.Net.StandAlone
                 settings.Logger = logger;
             }
 
-            if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger")
-            {
-                settings.Logger = new WireMockConsoleLogger();
-            }
-
             if (parser.Contains("Port"))
             {
                 settings.Port = parser.GetIntValue("Port");
@@ -87,7 +82,9 @@ namespace WireMock.Net.StandAlone
 
             settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 
-            return Start(settings);
+            FluentMockServer server = Start(settings);
+
+            return server;
         }
     }
 }

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

@@ -25,10 +25,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
   
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

src/WireMock.Net.WebApp/App.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+
+namespace WireMock.Net.WebApp
+{
+    public class App
+    {
+        private readonly IWireMockService _service;
+        private readonly ILogger _logger;
+        
+        public App(IWireMockService service, ILogger logger)
+        {
+            _service = service;
+            _logger = logger;
+        }
+
+        public void Run()
+        {
+            _logger.LogInformation("WireMock.Net WebApp running");
+            _service.Run();
+        }
+    }
+}

src/WireMock.Net.WebApp/IWireMockService.cs

@@ -0,0 +1,7 @@
+namespace WireMock.Net.WebApp
+{
+    public interface IWireMockService
+    {
+        void Run();
+    }
+}

src/WireMock.Net.WebApp/Program.cs

@@ -0,0 +1,52 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using WireMock.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Create service collection
+            var serviceCollection = new ServiceCollection();
+            ConfigureServices(serviceCollection);
+
+            // Create service provider
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+
+            // Run app
+            serviceProvider.GetService<App>().Run();
+        }
+
+        private static void ConfigureServices(IServiceCollection services)
+        {
+            // Build configuration
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(AppContext.BaseDirectory)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddEnvironmentVariables() // <-- this is needed to to override settings via the Azure Portal App Settings
+                .Build();
+
+            services.AddLogging(loggingBuilder =>
+            {
+                loggingBuilder.AddConfiguration(configuration.GetSection("Logging"));
+                loggingBuilder.AddConsole();
+            });
+
+            // Add access to IFluentMockServerSettings
+            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
+            services.AddSingleton<IFluentMockServerSettings>(settings);
+
+            // Add services
+            services.AddTransient<IWireMockLogger, WireMockLogger>();
+            services.AddTransient<IWireMockService, WireMockService>();
+
+            // Add app
+            services.AddTransient<App>();
+        }
+    }
+}

src/WireMock.Net.WebApp/Properties/launchSettings.json

@@ -0,0 +1,38 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iis": {
+      "applicationUrl": "http://localhost//wiremock",
+      "sslPort": 0
+    },
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56513/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "WireMock.Net.WebApp": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:56514/"
+    },
+    "IIS": {
+      "commandName": "IIS",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "development"
+      }
+    }
+  }
+}

src/WireMock.Net.WebApp/WireMock.Net.WebApp.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>

src/WireMock.Net.WebApp/WireMockLogger.cs

@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+
+namespace WireMock.Net.WebApp
+{
+    public class WireMockLogger : IWireMockLogger
+    {
+        private readonly ILogger<WireMockService> _logger;
+
+        public WireMockLogger(ILogger<WireMockService> logger)
+        {
+            _logger = logger;
+        }
+
+        public void Debug(string formatString, params object[] args)
+        {
+            _logger.LogDebug(formatString, args);
+        }
+
+        public void Info(string formatString, params object[] args)
+        {
+            _logger.LogInformation(formatString, args);
+        }
+
+        public void Warn(string formatString, params object[] args)
+        {
+            _logger.LogWarning(formatString, args);
+        }
+
+        public void Error(string formatString, params object[] args)
+        {
+            _logger.LogError(formatString, args);
+        }
+
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+        {
+            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+            _logger.LogDebug("Admin[{0}] {1}", isAdminRequest, message);
+        }
+    }
+}

src/WireMock.Net.WebApp/WireMockService.cs

@@ -0,0 +1,39 @@
+using Newtonsoft.Json;
+using System.Threading;
+using WireMock.Logging;
+using WireMock.Net.StandAlone;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApp
+{
+    public class WireMockService : IWireMockService
+    {
+        private static int sleepTime = 30000;
+
+        private readonly IWireMockLogger _logger;
+        private readonly IFluentMockServerSettings _settings;
+
+        public WireMockService(IWireMockLogger logger, IFluentMockServerSettings settings)
+        {
+            _logger = logger;
+            _settings = settings;
+
+            _settings.Logger = logger;
+        }
+
+        public void Run()
+        {
+            _logger.Info("WireMock.Net server starting");
+
+            StandAloneApp.Start(_settings);
+
+            _logger.Info($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+
+            while (true)
+            {
+                _logger.Info("WireMock.Net server running");
+                Thread.Sleep(sleepTime);
+            }
+        }
+    }
+}

src/WireMock.Net.WebApp/appsettings.Development.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}

src/WireMock.Net.WebApp/appsettings.json

@@ -0,0 +1,21 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    }
+  },
+  "AllowedHosts": "*",
+  "FluentMockServerSettings": {
+    "AdminUsername": "a",
+    "AdminPassword": "b",
+    "StartAdminInterface": true
+  }
+}

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

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

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

@@ -39,18 +39,13 @@ namespace WireMock.Admin.Mappings
         public string SetStateTo { get; set; }
 
         /// <summary>
-        /// The request model.
+        /// The request.
         /// </summary>
         public RequestModel Request { get; set; }
 
         /// <summary>
-        /// The response model.
+        /// The response.
         /// </summary>
         public ResponseModel Response { get; set; }
-
-        /// <summary>
-        /// Saves this mapping as a static mapping file.
-        /// </summary>
-        public bool? SaveToFile { get; set; }
     }
 }

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

@@ -58,9 +58,9 @@ namespace WireMock.Admin.Mappings
         public EncodingModel BodyEncoding { get; set; }
 
         /// <summary>
-        /// Use Handlebars transformer.
+        /// Gets or sets a value indicating whether [use transformer].
         /// </summary>
-        public bool? UseTransformer { get; set; }
+        public bool UseTransformer { get; set; }
 
         /// <summary>
         /// Gets or sets the headers.

src/WireMock.Net/Handlers/IFileSystemHandler.cs

@@ -49,19 +49,12 @@ namespace WireMock.Handlers
         void WriteMappingFile([NotNull] string path, [NotNull] string text);
 
         /// <summary>
-        /// Read a response body file as byte[].
+        /// Read a response body file as text.
         /// </summary>
         /// <param name="path">The path or filename from the file to read.</param>
         /// <returns>The file content as bytes.</returns>
         byte[] ReadResponseBodyAsFile([NotNull] string path);
 
-        /// <summary>
-        /// Read a response body file as text.
-        /// </summary>
-        /// <param name="path">The path or filename from the file to read.</param>
-        /// <returns>The file content as text.</returns>
-        string ReadResponseBodyAsString([NotNull] string path);
-
         /// <summary>
         /// Delete a file.
         /// </summary>

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -11,24 +11,6 @@ namespace WireMock.Handlers
     {
         private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
 
-        private readonly string _rootFolder;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        public LocalFileSystemHandler() : this(Directory.GetCurrentDirectory())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LocalFileSystemHandler"/> class.
-        /// </summary>
-        /// <param name="rootFolder">The root folder.</param>
-        public LocalFileSystemHandler(string rootFolder)
-        {
-            _rootFolder = rootFolder;
-        }
-
         /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
         public bool FolderExists(string path)
         {
@@ -56,7 +38,7 @@ namespace WireMock.Handlers
         /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
         public string GetMappingFolder()
         {
-            return Path.Combine(_rootFolder, AdminMappingsFolder);
+            return Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
@@ -86,16 +68,6 @@ namespace WireMock.Handlers
             return File.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
         }
 
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
-        public string ReadResponseBodyAsString(string path)
-        {
-            Check.NotNullOrEmpty(path, nameof(path));
-
-            // In case the path is a filename, the path will be adjusted to the MappingFolder.
-            // Else the path will just be as-is.
-            return File.ReadAllText(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
-
         /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
         public bool FileExists(string filename)
         {

src/WireMock.Net/IMapping.cs

@@ -1,9 +1,8 @@
-using JetBrains.Annotations;
-using System;
+using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using WireMock.Matchers.Request;
 using WireMock.ResponseProviders;
-using WireMock.Settings;
 
 namespace WireMock
 {
@@ -61,11 +60,6 @@ namespace WireMock
         /// </summary>
         IResponseProvider Provider { get; }
 
-        /// <summary>
-        /// The FluentMockServerSettings.
-        /// </summary>
-        IFluentMockServerSettings Settings { get; }
-
         /// <summary>
         /// Is State started ?
         /// </summary>

src/WireMock.Net/Mapping.cs

@@ -1,9 +1,8 @@
-using JetBrains.Annotations;
-using System;
+using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using WireMock.Matchers.Request;
 using WireMock.ResponseProviders;
-using WireMock.Settings;
 
 namespace WireMock
 {
@@ -39,9 +38,6 @@ namespace WireMock
         /// <inheritdoc cref="IMapping.Provider" />
         public IResponseProvider Provider { get; }
 
-        /// <inheritdoc cref="IMapping.Settings" />
-        public IFluentMockServerSettings Settings { get; }
-
         /// <inheritdoc cref="IMapping.IsStartState" />
         public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
 
@@ -54,21 +50,17 @@ namespace WireMock
         /// <param name="guid">The unique identifier.</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="settings">The FluentMockServerSettings.</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, [CanBeNull] string path,
-            [NotNull] IFluentMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
-            int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
+        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
         {
             Guid = guid;
             Title = title;
             Path = path;
-            Settings = settings;
             RequestMatcher = requestMatcher;
             Provider = provider;
             Priority = priority;
@@ -80,7 +72,7 @@ namespace WireMock
         /// <inheritdoc cref="IMapping.ResponseToAsync" />
         public async Task<ResponseMessage> ResponseToAsync(RequestMessage requestMessage)
         {
-            return await Provider.ProvideResponseAsync(requestMessage, Settings);
+            return await Provider.ProvideResponseAsync(requestMessage);
         }
 
         /// <inheritdoc cref="IMapping.GetRequestMatchResult" />

src/WireMock.Net/MappingRegistrationCallback.cs

@@ -4,6 +4,5 @@
     /// The registration callback.
     /// </summary>
     /// <param name="mapping">The mapping.</param>
-    /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-    public delegate void RegistrationCallback(IMapping mapping, bool saveToFile = false);
+    public delegate void RegistrationCallback(IMapping mapping);
 }

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -10,14 +10,8 @@ namespace WireMock.Matchers
     /// <seealso cref="IObjectMatcher" />
     public class ExactObjectMatcher : IObjectMatcher
     {
-        /// <summary>
-        /// Gets the value as object.
-        /// </summary>
         public object ValueAsObject { get; }
 
-        /// <summary>
-        /// Gets the value as byte[].
-        /// </summary>
         public byte[] ValueAsBytes { get; }
 
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>

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

@@ -1,6 +1,5 @@
-using JetBrains.Annotations;
 using System;
-using System.Linq;
+using JetBrains.Annotations;
 using WireMock.Util;
 using WireMock.Validation;
 
@@ -27,16 +26,16 @@ namespace WireMock.Matchers.Request
         public Func<object, bool> JsonFunc { get; }
 
         /// <summary>
-        /// The matchers.
+        /// The matcher.
         /// </summary>
-        public IMatcher[] Matchers { get; }
+        public IMatcher Matcher { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new[] { new WildcardMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] string body) : this(new WildcardMatcher(matchBehaviour, body))
         {
         }
 
@@ -45,7 +44,7 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] body) : this(new ExactObjectMatcher(matchBehaviour, body))
         {
         }
 
@@ -54,7 +53,7 @@ namespace WireMock.Matchers.Request
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="body">The body.</param>
-        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new[] { new ExactObjectMatcher(matchBehaviour, body) }.Cast<IMatcher>().ToArray())
+        public RequestMessageBodyMatcher(MatchBehaviour matchBehaviour, [NotNull] object body) : this(new ExactObjectMatcher(matchBehaviour, body))
         {
         }
 
@@ -91,24 +90,25 @@ namespace WireMock.Matchers.Request
         /// <summary>
         /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
         /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        public RequestMessageBodyMatcher([NotNull] params IMatcher[] matchers)
+        /// <param name="matcher">The matcher.</param>
+        public RequestMessageBodyMatcher([NotNull] IMatcher matcher)
         {
-            Check.NotNull(matchers, nameof(matchers));
-            Matchers = matchers;
+            Check.NotNull(matcher, nameof(matcher));
+
+            Matcher = matcher;
         }
 
         /// <see cref="IRequestMatcher.GetMatchingScore"/>
         public double GetMatchingScore(RequestMessage requestMessage, RequestMatchResult requestMatchResult)
         {
-            double score = CalculateMatchScore(requestMessage);
+            double score = IsMatch(requestMessage);
             return requestMatchResult.AddScore(GetType(), score);
         }
 
-        private double CalculateMatchScore(RequestMessage requestMessage, IMatcher matcher)
+        private double IsMatch(RequestMessage requestMessage)
         {
             // Check if the matcher is a IObjectMatcher
-            if (matcher is IObjectMatcher objectMatcher)
+            if (Matcher is IObjectMatcher objectMatcher)
             {
                 // If the body is a JSON object, try to match.
                 if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
@@ -124,7 +124,7 @@ namespace WireMock.Matchers.Request
             }
 
             // Check if the matcher is a IStringMatcher
-            if (matcher is IStringMatcher stringMatcher)
+            if (Matcher is IStringMatcher stringMatcher)
             {
                 // If the body is a Json or a String, use the BodyAsString to match on.
                 if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json || requestMessage?.BodyData?.DetectedBodyType == BodyType.String)
@@ -133,16 +133,6 @@ namespace WireMock.Matchers.Request
                 }
             }
 
-            return MatchScores.Mismatch;
-        }
-
-        private double CalculateMatchScore(RequestMessage requestMessage)
-        {
-            if (Matchers != null && Matchers.Any())
-            {
-                return Matchers.Max(matcher => CalculateMatchScore(requestMessage, matcher));
-            }
-
             if (Func != null)
             {
                 return MatchScores.ToScore(requestMessage?.BodyData?.DetectedBodyType == BodyType.String && Func(requestMessage.BodyData.BodyAsString));

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -56,18 +56,7 @@ namespace WireMock.Owin
 
         public Task StartAsync()
         {
-            var builder = new WebHostBuilder();
-
-            // Workaround for https://github.com/WireMock-Net/WireMock.Net/issues/292
-            // On some platforms, AppContext.BaseDirectory is null, which causes WebHostBuilder to fail if ContentRoot is not
-            // specified (even though we don't actually use that base path mechanism, since we have our own way of configuring
-            // a filesystem handler).
-            if (string.IsNullOrEmpty(AppContext.BaseDirectory))
-            {
-                builder.UseContentRoot(System.IO.Directory.GetCurrentDirectory());
-            }
-
-            _host = builder
+            _host = new WebHostBuilder()
                 .ConfigureServices(services =>
                 {
                     services.AddSingleton(_options.FileSystemHandler);

src/WireMock.Net/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("WireMock.Net.StandAlone, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
-[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+[assembly: InternalsVisibleTo("WireMock.Net.StandAlone")]
+[assembly: InternalsVisibleTo("WireMock.Net.Tests")]
 
 // Needed for Moq in the UnitTest project
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,5 +1,5 @@
-using JetBrains.Annotations;
-using System;
+using System;
+using JetBrains.Annotations;
 using WireMock.Matchers;
 
 namespace WireMock.RequestBuilders
@@ -16,13 +16,6 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder WithBody([NotNull] IMatcher matcher);
 
-        /// <summary>
-        /// WithBody: IMatcher[]
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
-
         /// <summary>
         /// WithBody: Body as string
         /// </summary>

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

@@ -63,7 +63,6 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(string, MatchBehaviour, IStringMatcher[])"/>
         public IRequestBuilder WithParam(string key, MatchBehaviour matchBehaviour, params IStringMatcher[] matchers)
         {
             return WithParam(key, matchBehaviour, false, matchers);
@@ -78,7 +77,7 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{string}}, bool}[])"/>
+        /// <inheritdoc cref="IParamsRequestBuilder.WithParam(Func{IDictionary{string, WireMockList{T}}, bool}[])"/>
         public IRequestBuilder WithParam(params Func<IDictionary<string, WireMockList<string>>, bool>[] funcs)
         {
             Check.NotNullOrEmpty(funcs, nameof(funcs));

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

@@ -1,73 +0,0 @@
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-using WireMock.Validation;
-
-namespace WireMock.RequestBuilders
-{
-    public partial class Request
-    {
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
-        public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
-        public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
-        public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-        {
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
-            return this;
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher[])"/>
-        public IRequestBuilder WithBody(IMatcher matcher)
-        {
-            return WithBody(new[] { matcher });
-        }
-
-        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher[])"/>
-        public IRequestBuilder WithBody(IMatcher[] matchers)
-        {
-            Check.NotNull(matchers, nameof(matchers));
-
-            _requestMatchers.Add(new RequestMessageBodyMatcher(matchers));
-            return this;
-        }
-
-        /// <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;
-        }
-    }
-}

src/WireMock.Net/RequestBuilders/Request.cs

@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock.RequestBuilders
@@ -233,6 +234,63 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(string, MatchBehaviour)"/>
+        public IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+        {
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(byte[], MatchBehaviour)"/>
+        public IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+        {
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(object, MatchBehaviour)"/>
+        public IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+        {
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, body));
+            return this;
+        }
+
+        /// <inheritdoc cref="IBodyRequestBuilder.WithBody(IMatcher)"/>
+        public IRequestBuilder WithBody(IMatcher matcher)
+        {
+            Check.NotNull(matcher, nameof(matcher));
+
+            _requestMatchers.Add(new RequestMessageBodyMatcher(matcher));
+            return this;
+        }
+
+        /// <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="IHeadersAndCookiesRequestBuilder.WithHeader(string, string, MatchBehaviour)"/>
         public IRequestBuilder WithHeader(string name, string pattern, MatchBehaviour matchBehaviour)
         {

src/WireMock.Net/RequestMessage.cs

@@ -171,7 +171,40 @@ namespace WireMock
             Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
             Cookies = cookies;
             RawQuery = WebUtility.UrlDecode(urlDetails.Url.Query);
-            Query = QueryStringParser.Parse(RawQuery);
+            Query = ParseQuery(RawQuery);
+        }
+
+        private static IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
+        {
+            if (string.IsNullOrEmpty(queryString))
+            {
+                return null;
+            }
+
+            if (queryString.StartsWith("?"))
+            {
+                queryString = queryString.Substring(1);
+            }
+
+            return queryString.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
+                .Aggregate(new Dictionary<string, WireMockList<string>>(),
+                (dict, term) =>
+                {
+                    string[] parts = term.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+                    string key = parts[0];
+                    if (!dict.ContainsKey(key))
+                    {
+                        dict.Add(key, new WireMockList<string>());
+                    }
+
+                    if (parts.Length == 2)
+                    {
+                        string[] values = parts[1].Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+                        dict[key].AddRange(values);
+                    }
+
+                    return dict;
+                });
         }
 
         /// <summary>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -7,8 +7,8 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using WireMock.Handlers;
 using WireMock.Http;
-using WireMock.ResponseProviders;
 using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Util;
@@ -21,6 +21,7 @@ namespace WireMock.ResponseBuilders
     /// </summary>
     public class Response : IResponseBuilder
     {
+        private readonly IFileSystemHandler _fileSystemHandler = new LocalFileSystemHandler();
         private HttpClient _httpClientForProxy;
 
         /// <summary>
@@ -220,17 +221,18 @@ namespace WireMock.ResponseBuilders
 
             ResponseMessage.BodyData = new BodyData
             {
-                BodyAsFileIsCached = cache,
-                BodyAsFile = filename
+                BodyAsFileIsCached = cache
             };
 
             if (cache && !UseTransformer)
             {
                 ResponseMessage.BodyData.DetectedBodyType = BodyType.Bytes;
+                ResponseMessage.BodyData.BodyAsBytes = _fileSystemHandler.ReadResponseBodyAsFile(filename);
             }
             else
             {
                 ResponseMessage.BodyData.DetectedBodyType = BodyType.File;
+                ResponseMessage.BodyData.BodyAsFile = filename;
             }
 
             return this;
@@ -371,8 +373,12 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IFluentMockServerSettings)"/>
-        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        /// <summary>
+        /// The provide response.
+        /// </summary>
+        /// <param name="requestMessage">The request.</param>
+        /// <returns>The <see cref="ResponseMessage"/>.</returns>
+        public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
         {
             Check.NotNull(requestMessage, nameof(requestMessage));
 
@@ -411,16 +417,10 @@ namespace WireMock.ResponseBuilders
 
             if (UseTransformer)
             {
-                var factory = new HandlebarsContextFactory(settings.FileSystemHandler, settings.HandlebarsRegistrationCallback);
-                var responseMessageTransformer = new ResponseMessageTransformer(factory);
-                return responseMessageTransformer.Transform(requestMessage, ResponseMessage);
-            }
-
-            if (!UseTransformer && ResponseMessage.BodyData?.BodyAsFileIsCached == true)
-            {
-                ResponseMessage.BodyData.BodyAsBytes = settings.FileSystemHandler.ReadResponseBodyAsFile(ResponseMessage.BodyData.BodyAsFile);
+                return ResponseMessageTransformer.Transform(requestMessage, ResponseMessage);
             }
 
+            // Just return normal defined ResponseMessage
             return ResponseMessage;
         }
     }

src/WireMock.Net/ResponseMessageBuilder.cs

@@ -27,11 +27,7 @@ namespace WireMock
                 response.BodyData = new BodyData
                 {
                     DetectedBodyType = BodyType.Json,
-                    BodyAsJson = new StatusModel
-                    {
-                        Guid = guid,
-                        Status = message
-                    }
+                    BodyAsJson = new StatusModel { Status = message, Guid = guid }
                 };
             }
 

src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using WireMock.Settings;
+using JetBrains.Annotations;
+using WireMock.Validation;
 
 namespace WireMock.ResponseProviders
 {
@@ -8,12 +9,14 @@ namespace WireMock.ResponseProviders
     {
         private readonly Func<RequestMessage, Task<ResponseMessage>> _responseMessageFunc;
 
-        public DynamicAsyncResponseProvider(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, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
         {
             return _responseMessageFunc(requestMessage);
         }

src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using WireMock.Settings;
+using JetBrains.Annotations;
+using WireMock.Validation;
 
 namespace WireMock.ResponseProviders
 {
@@ -8,12 +9,14 @@ namespace WireMock.ResponseProviders
     {
         private readonly Func<RequestMessage, ResponseMessage> _responseMessageFunc;
 
-        public DynamicResponseProvider(Func<RequestMessage, ResponseMessage> responseMessageFunc)
+        public DynamicResponseProvider([NotNull] Func<RequestMessage, ResponseMessage> responseMessageFunc)
         {
+            Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
+
             _responseMessageFunc = responseMessageFunc;
         }
 
-        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
         {
             return Task.FromResult(_responseMessageFunc(requestMessage));
         }

src/WireMock.Net/ResponseProviders/IResponseProvider.cs

@@ -1,6 +1,5 @@
-using JetBrains.Annotations;
-using System.Threading.Tasks;
-using WireMock.Settings;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
 
 namespace WireMock.ResponseProviders
 {
@@ -13,8 +12,7 @@ namespace WireMock.ResponseProviders
         /// The provide response.
         /// </summary>
         /// <param name="requestMessage">The request.</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
         /// <returns>The <see cref="ResponseMessage"/>.</returns>
-        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IFluentMockServerSettings settings);
+        Task<ResponseMessage> ProvideResponseAsync([NotNull] RequestMessage requestMessage);
     }
 }

src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs

@@ -1,21 +1,26 @@
 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, IFluentMockServerSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly IFluentMockServerSettings _settings;
+        private readonly Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly IProxyAndRecordSettings _settings;
 
-        public ProxyAsyncResponseProvider(Func<RequestMessage, IFluentMockServerSettings, Task<ResponseMessage>> responseMessageFunc, IFluentMockServerSettings 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, IFluentMockServerSettings settings)
+        public Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage)
         {
             return _responseMessageFunc(requestMessage, _settings);
         }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -21,14 +21,14 @@ namespace WireMock.Serialization
             var headerMatchers = request.GetRequestMessageMatchers<RequestMessageHeaderMatcher>();
             var cookieMatchers = request.GetRequestMessageMatchers<RequestMessageCookieMatcher>();
             var paramsMatchers = request.GetRequestMessageMatchers<RequestMessageParamMatcher>();
-            var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
             var bodyMatcher = request.GetRequestMessageMatcher<RequestMessageBodyMatcher>();
+            var methodMatcher = request.GetRequestMessageMatcher<RequestMessageMethodMatcher>();
 
             var mappingModel = new MappingModel
             {
                 Guid = mapping.Guid,
                 Title = mapping.Title,
-                Priority = mapping.Priority != 0 ? mapping.Priority : (int?)null,
+                Priority = mapping.Priority,
                 Scenario = mapping.Scenario,
                 WhenStateIs = mapping.ExecutionConditionState,
                 SetStateTo = mapping.NextState,
@@ -66,9 +66,14 @@ namespace WireMock.Serialization
                     Params = paramsMatchers != null && paramsMatchers.Any() ? paramsMatchers.Select(pm => new ParamModel
                     {
                         Name = pm.Key,
-                        IgnoreCase = pm.IgnoreCase == true ? true : (bool?)null,
+                        IgnoreCase = pm.IgnoreCase,
                         Matchers = MatcherMapper.Map(pm.Matchers)
-                    }).ToList() : null
+                    }).ToList() : null,
+
+                    Body = methodMatcher?.Methods != null && methodMatcher.Methods.Any(m => m == "get") ? null : new BodyModel
+                    {
+                        Matcher = bodyMatcher != null ? MatcherMapper.Map(bodyMatcher.Matcher) : null
+                    }
                 },
                 Response = new ResponseModel
                 {
@@ -76,20 +81,6 @@ namespace WireMock.Serialization
                 }
             };
 
-            if (methodMatcher?.Methods != null && methodMatcher.Methods.All(m => m != "get") && bodyMatcher?.Matchers != null)
-            {
-                mappingModel.Request.Body = new BodyModel();
-
-                if (bodyMatcher.Matchers.Length == 1)
-                {
-                    mappingModel.Request.Body.Matcher = MatcherMapper.Map(bodyMatcher.Matchers[0]);
-                }
-                else if (bodyMatcher.Matchers.Length > 1)
-                {
-                    mappingModel.Request.Body.Matchers = MatcherMapper.Map(bodyMatcher.Matchers);
-                }
-            }
-
             if (!string.IsNullOrEmpty(response.ProxyUrl))
             {
                 mappingModel.Response.StatusCode = null;
@@ -101,7 +92,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.BodyAsBytes = null;
                 mappingModel.Response.BodyAsFile = null;
                 mappingModel.Response.BodyAsFileIsCached = null;
-                mappingModel.Response.UseTransformer = null;
+                mappingModel.Response.UseTransformer = false;
                 mappingModel.Response.BodyEncoding = null;
                 mappingModel.Response.ProxyUrl = response.ProxyUrl;
             }
@@ -110,10 +101,7 @@ namespace WireMock.Serialization
                 mappingModel.Response.BodyDestination = response.ResponseMessage.BodyDestination;
                 mappingModel.Response.StatusCode = response.ResponseMessage.StatusCode;
                 mappingModel.Response.Headers = Map(response.ResponseMessage.Headers);
-                if (response.UseTransformer)
-                {
-                    mappingModel.Response.UseTransformer = response.UseTransformer;
-                }
+                mappingModel.Response.UseTransformer = response.UseTransformer;
 
                 if (response.ResponseMessage.BodyData != null)
                 {
@@ -125,10 +113,7 @@ namespace WireMock.Serialization
 
                         case BodyType.Json:
                             mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
-                            if (response.ResponseMessage.BodyData.BodyAsJsonIndented == true)
-                            {
-                                mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
-                            }
+                            mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
                             break;
 
                         case BodyType.Bytes:

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -10,11 +10,6 @@ namespace WireMock.Serialization
 {
     internal static class MatcherMapper
     {
-        public static IMatcher[] Map([CanBeNull] IEnumerable<MatcherModel> matchers)
-        {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
-        }
-
         public static IMatcher Map([CanBeNull] MatcherModel matcher)
         {
             if (matcher == null)
@@ -75,7 +70,7 @@ namespace WireMock.Serialization
 
         public static MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
         {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
+            return matchers?.Select(Map).Where(x => x != null).ToArray();
         }
 
         public static MatcherModel Map([CanBeNull] IMatcher matcher)

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

@@ -43,7 +43,7 @@ namespace WireMock.Server
         private readonly RegexMatcher _adminMappingsGuidPathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/mappings\/([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
         private readonly RegexMatcher _adminRequestsGuidPathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/requests\/([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
 
-        private readonly JsonSerializerSettings _jsonSerializerSettings = new JsonSerializerSettings
+        private readonly JsonSerializerSettings _settings = new JsonSerializerSettings
         {
             Formatting = Formatting.Indented,
             NullValueHandling = NullValueHandling.Ignore
@@ -131,18 +131,18 @@ namespace WireMock.Server
         {
             if (folder == null)
             {
-                folder = _settings.FileSystemHandler.GetMappingFolder();
+                folder = _fileSystemHandler.GetMappingFolder();
             }
 
-            if (!_settings.FileSystemHandler.FolderExists(folder))
+            if (!_fileSystemHandler.FolderExists(folder))
             {
-                _settings.Logger.Info("The Static Mapping folder '{0}' does not exist, reading Static MappingFiles will be skipped.", folder);
+                _logger.Info("The Static Mapping folder '{0}' does not exist, reading Static MappingFiles will be skipped.", folder);
                 return;
             }
 
-            foreach (string filename in _settings.FileSystemHandler.EnumerateFiles(folder).OrderBy(f => f))
+            foreach (string filename in _fileSystemHandler.EnumerateFiles(folder).OrderBy(f => f))
             {
-                _settings.Logger.Info("Reading Static MappingFile : '{0}'", filename);
+                _logger.Info("Reading Static MappingFile : '{0}'", filename);
 
                 try
                 {
@@ -150,7 +150,7 @@ namespace WireMock.Server
                 }
                 catch
                 {
-                    _settings.Logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
+                    _logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
                 }
             }
         }
@@ -164,36 +164,30 @@ namespace WireMock.Server
         {
             if (folder == null)
             {
-                folder = _settings.FileSystemHandler.GetMappingFolder();
+                folder = _fileSystemHandler.GetMappingFolder();
             }
 
-            if (!_settings.FileSystemHandler.FolderExists(folder))
+            if (!_fileSystemHandler.FolderExists(folder))
             {
                 return;
             }
 
-            _settings.Logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder);
+            _logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder);
 
             var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs);
             watcher.Created += (sender, args) =>
             {
-                _settings.Logger.Info("MappingFile created : '{0}', reading file.", args.FullPath);
-                if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
-                {
-                    _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
-                }
+                _logger.Info("New MappingFile created : '{0}'", args.FullPath);
+                ReadStaticMappingAndAddOrUpdate(args.FullPath);
             };
             watcher.Changed += (sender, args) =>
             {
-                _settings.Logger.Info("MappingFile updated : '{0}', reading file.", args.FullPath);
-                if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
-                {
-                    _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
-                }
+                _logger.Info("New MappingFile updated : '{0}'", args.FullPath);
+                ReadStaticMappingAndAddOrUpdate(args.FullPath);
             };
             watcher.Deleted += (sender, args) =>
             {
-                _settings.Logger.Info("MappingFile deleted : '{0}'", args.FullPath);
+                _logger.Info("New MappingFile deleted : '{0}'", args.FullPath);
                 string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath);
 
                 if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
@@ -214,31 +208,24 @@ namespace WireMock.Server
         /// </summary>
         /// <param name="path">The path.</param>
         [PublicAPI]
-        public bool ReadStaticMappingAndAddOrUpdate([NotNull] string path)
+        public void ReadStaticMappingAndAddOrUpdate([NotNull] string path)
         {
             Check.NotNull(path, nameof(path));
 
             string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
 
-            if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
+            var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(_fileSystemHandler.ReadMappingFile(path)));
+            foreach (var mappingModel in mappingModels)
             {
-                var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(value));
-                foreach (var mappingModel in mappingModels)
+                if (mappingModels.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
                 {
-                    if (mappingModels.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
-                    {
-                        DeserializeAndAddOrUpdateMapping(mappingModel, guidFromFilename, path);
-                    }
-                    else
-                    {
-                        DeserializeAndAddOrUpdateMapping(mappingModel, null, path);
-                    }
+                    DeserializeAndAddOrUpdateMapping(mappingModel, guidFromFilename, path);
+                }
+                else
+                {
+                    DeserializeAndAddOrUpdateMapping(mappingModel, null, path);
                 }
-
-                return true;
             }
-
-            return false;
         }
         #endregion
 
@@ -255,23 +242,23 @@ namespace WireMock.Server
                 respondProvider.AtPriority(ProxyPriority);
             }
 
-            respondProvider.RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
+            respondProvider.RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings.ProxyAndRecordSettings));
         }
 
-        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IFluentMockServerSettings settings)
+        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IProxyAndRecordSettings settings)
         {
             var requestUri = new Uri(requestMessage.Url);
-            var proxyUri = new Uri(settings.ProxyAndRecordSettings.Url);
+            var proxyUri = new Uri(settings.Url);
             var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
 
             var responseMessage = await HttpClientHelper.SendAsync(_httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
 
-            if (settings.ProxyAndRecordSettings.SaveMapping)
+            if (settings.SaveMapping)
             {
-                var mapping = ToMapping(requestMessage, responseMessage, settings.ProxyAndRecordSettings.BlackListedHeaders ?? new string[] { });
+                var mapping = ToMapping(requestMessage, responseMessage, settings.BlackListedHeaders ?? new string[] { });
                 _options.Mappings.TryAdd(mapping.Guid, mapping);
 
-                if (settings.ProxyAndRecordSettings.SaveMappingToFile)
+                if (settings.SaveMappingToFile)
                 {
                     SaveMappingToFile(mapping);
                 }
@@ -315,7 +302,7 @@ namespace WireMock.Server
 
             var response = Response.Create(responseMessage);
 
-            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null);
+            return new Mapping(Guid.NewGuid(), string.Empty, null, request, response, 0, null, null, null);
         }
         #endregion
 
@@ -361,7 +348,7 @@ namespace WireMock.Server
 
             if (mapping == null)
             {
-                _settings.Logger.Warn("HttpStatusCode set to 404 : Mapping not found");
+                _logger.Warn("HttpStatusCode set to 404 : Mapping not found");
                 return ResponseMessageBuilder.Create("Mapping not found", 404);
             }
 
@@ -405,12 +392,12 @@ namespace WireMock.Server
         {
             if (folder == null)
             {
-                folder = _settings.FileSystemHandler.GetMappingFolder();
+                folder = _fileSystemHandler.GetMappingFolder();
             }
 
-            if (!_settings.FileSystemHandler.FolderExists(folder))
+            if (!_fileSystemHandler.FolderExists(folder))
             {
-                _settings.FileSystemHandler.CreateFolder(folder);
+                _fileSystemHandler.CreateFolder(folder);
             }
 
             var model = MappingConverter.ToMappingModel(mapping);
@@ -418,23 +405,26 @@ namespace WireMock.Server
 
             string path = Path.Combine(folder, filename);
 
-            _settings.Logger.Info("Saving Mapping file {0}", filename);
+            _logger.Info("Saving Mapping file {0}", filename);
 
-            _settings.FileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, _jsonSerializerSettings));
+            _fileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, _settings));
         }
 
         private static string SanitizeFileName(string name, char replaceChar = '_')
         {
             return Path.GetInvalidFileNameChars().Aggregate(name, (current, c) => current.Replace(c, replaceChar));
         }
-        private IEnumerable<MappingModel> ToMappingModels()
-        {
-            return Mappings.Where(m => !m.IsAdminInterface).Select(MappingConverter.ToMappingModel);
-        }
 
         private ResponseMessage MappingsGet(RequestMessage requestMessage)
         {
-            return ToJson(ToMappingModels());
+            var result = new List<MappingModel>();
+            foreach (var mapping in Mappings.Where(m => !m.IsAdminInterface))
+            {
+                var model = MappingConverter.ToMappingModel(mapping);
+                result.Add(model);
+            }
+
+            return ToJson(result);
         }
 
         private ResponseMessage MappingsPost(RequestMessage requestMessage)
@@ -457,12 +447,12 @@ namespace WireMock.Server
             }
             catch (ArgumentException a)
             {
-                _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
+                _logger.Error("HttpStatusCode set to 400 {0}", a);
                 return ResponseMessageBuilder.Create(a.Message, 400);
             }
             catch (Exception e)
             {
-                _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
+                _logger.Error("HttpStatusCode set to 500 {0}", e);
                 return ResponseMessageBuilder.Create(e.ToString(), 500);
             }
         }
@@ -481,7 +471,7 @@ namespace WireMock.Server
 
             var responseBuilder = InitResponseBuilder(mappingModel.Response);
 
-            var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);
+            var respondProvider = Given(requestBuilder);
 
             if (guid != null)
             {
@@ -537,7 +527,7 @@ namespace WireMock.Server
 
             if (entry == null)
             {
-                _settings.Logger.Warn("HttpStatusCode set to 404 : Request not found");
+                _logger.Warn("HttpStatusCode set to 404 : Request not found");
                 return ResponseMessageBuilder.Create("Request not found", 404);
             }
 
@@ -680,7 +670,7 @@ namespace WireMock.Server
 
             if (pathOrUrlRequired && !pathOrUrlmatchersValid)
             {
-                _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
+                _logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
                 return null;
             }
 
@@ -716,11 +706,8 @@ namespace WireMock.Server
 
             if (requestModel.Body?.Matcher != null)
             {
-                requestBuilder = requestBuilder.WithBody(MatcherMapper.Map(requestModel.Body.Matcher));
-            }
-            else if (requestModel.Body?.Matchers != null)
-            {
-                requestBuilder = requestBuilder.WithBody(MatcherMapper.Map(requestModel.Body.Matchers));
+                var bodyMatcher = MatcherMapper.Map(requestModel.Body.Matcher);
+                requestBuilder = requestBuilder.WithBody(bodyMatcher);
             }
 
             return requestBuilder;
@@ -735,7 +722,7 @@ namespace WireMock.Server
                 responseBuilder = responseBuilder.WithDelay(responseModel.Delay.Value);
             }
 
-            if (responseModel.UseTransformer == true)
+            if (responseModel.UseTransformer)
             {
                 responseBuilder = responseBuilder.WithTransformer();
             }
@@ -806,7 +793,7 @@ namespace WireMock.Server
                 BodyData = new BodyData
                 {
                     DetectedBodyType = BodyType.String,
-                    BodyAsString = JsonConvert.SerializeObject(result, keepNullValues ? _settingsIncludeNullValues : _jsonSerializerSettings)
+                    BodyAsString = JsonConvert.SerializeObject(result, keepNullValues ? _settingsIncludeNullValues : _settings)
                 },
                 StatusCode = 200,
                 Headers = new Dictionary<string, WireMockList<string>> { { HttpKnownHeaderNames.ContentType, new WireMockList<string>(ContentTypeJson) } }

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

@@ -16,13 +16,13 @@ namespace WireMock.Server
         {
             string filename = GetFileNameFromRequestMessage(requestMessage);
 
-            string mappingFolder = _settings.FileSystemHandler.GetMappingFolder();
-            if (!_settings.FileSystemHandler.FolderExists(mappingFolder))
+            string mappingFolder = _fileSystemHandler.GetMappingFolder();
+            if (!_fileSystemHandler.FolderExists(mappingFolder))
             {
-                _settings.FileSystemHandler.CreateFolder(mappingFolder);
+                _fileSystemHandler.CreateFolder(mappingFolder);
             }
 
-            _settings.FileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
+            _fileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
 
             return ResponseMessageBuilder.Create("File created");
         }
@@ -31,13 +31,13 @@ namespace WireMock.Server
         {
             string filename = GetFileNameFromRequestMessage(requestMessage);
 
-            if (!_settings.FileSystemHandler.FileExists(filename))
+            if (!_fileSystemHandler.FileExists(filename))
             {
-                _settings.Logger.Info("The file '{0}' does not exist, updating file will be skipped.", filename);
+                _logger.Info("The file '{0}' does not exist, updating file will be skipped.", filename);
                 return ResponseMessageBuilder.Create("File is not found", 404);
             }
 
-            _settings.FileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
+            _fileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
 
             return ResponseMessageBuilder.Create("File updated");
         }
@@ -46,13 +46,13 @@ namespace WireMock.Server
         {
             string filename = GetFileNameFromRequestMessage(requestMessage);
 
-            if (!_settings.FileSystemHandler.FileExists(filename))
+            if (!_fileSystemHandler.FileExists(filename))
             {
-                _settings.Logger.Info("The file '{0}' does not exist.", filename);
+                _logger.Info("The file '{0}' does not exist.", filename);
                 return ResponseMessageBuilder.Create("File is not found", 404);
             }
 
-            byte[] bytes = _settings.FileSystemHandler.ReadFile(filename);
+            byte[] bytes = _fileSystemHandler.ReadFile(filename);
             var response = new ResponseMessage
             {
                 StatusCode = 200,
@@ -82,9 +82,9 @@ namespace WireMock.Server
         {
             string filename = GetFileNameFromRequestMessage(requestMessage);
 
-            if (!_settings.FileSystemHandler.FileExists(filename))
+            if (!_fileSystemHandler.FileExists(filename))
             {
-                _settings.Logger.Info("The file '{0}' does not exist.", filename);
+                _logger.Info("The file '{0}' does not exist.", filename);
                 return ResponseMessageBuilder.Create(404);
             }
 
@@ -95,13 +95,13 @@ namespace WireMock.Server
         {
             string filename = GetFileNameFromRequestMessage(requestMessage);
 
-            if (!_settings.FileSystemHandler.FileExists(filename))
+            if (!_fileSystemHandler.FileExists(filename))
             {
-                _settings.Logger.Info("The file '{0}' does not exist.", filename);
+                _logger.Info("The file '{0}' does not exist.", filename);
                 return ResponseMessageBuilder.Create("File is not deleted", 404);
             }
 
-            _settings.FileSystemHandler.DeleteFile(filename);
+            _fileSystemHandler.DeleteFile(filename);
             return ResponseMessageBuilder.Create("File deleted.");
         }
 

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using WireMock.Admin.Mappings;
+using Newtonsoft.Json;
 using WireMock.Exceptions;
 using WireMock.Handlers;
 using WireMock.Logging;
@@ -28,7 +27,8 @@ namespace WireMock.Server
     {
         private const int ServerStartDelayInMs = 100;
 
-        private readonly IFluentMockServerSettings _settings;
+        private readonly IWireMockLogger _logger;
+        private readonly IFileSystemHandler _fileSystemHandler;
         private readonly IOwinSelfHost _httpServer;
         private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
 
@@ -56,12 +56,6 @@ namespace WireMock.Server
         [PublicAPI]
         public IEnumerable<IMapping> Mappings => _options.Mappings.Values.ToArray();
 
-        /// <summary>
-        /// Gets the mappings as MappingModels.
-        /// </summary>
-        [PublicAPI]
-        public IEnumerable<MappingModel> MappingModels => ToMappingModels();
-
         /// <summary>
         /// Gets the scenarios.
         /// </summary>
@@ -98,7 +92,7 @@ namespace WireMock.Server
         /// <param name="settings">The FluentMockServerSettings.</param>
         /// <returns>The <see cref="FluentMockServer"/>.</returns>
         [PublicAPI]
-        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
+        public static FluentMockServer Start(IFluentMockServerSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
 
@@ -191,14 +185,13 @@ namespace WireMock.Server
 
         private FluentMockServer(IFluentMockServerSettings settings)
         {
-            _settings = settings;
+            settings.Logger = settings.Logger ?? new WireMockConsoleLogger();
 
-            // Set default values if not provided
-            _settings.Logger = settings.Logger ?? new WireMockNullLogger();
-            _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
+            _logger = settings.Logger;
+            _fileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
 
-            _settings.Logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
-            _settings.Logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
+            _logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
+            _logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
 
             if (settings.Urls != null)
             {
@@ -210,10 +203,10 @@ namespace WireMock.Server
                 Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
             }
 
-            _options.FileSystemHandler = _settings.FileSystemHandler;
+            _options.FileSystemHandler = settings.FileSystemHandler;
             _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
             _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
-            _options.Logger = _settings.Logger;
+            _options.Logger = _logger;
 
 #if USE_ASPNETCORE
             _httpServer = new AspNetCoreSelfHost(_options, Urls);
@@ -376,7 +369,7 @@ namespace WireMock.Server
         [PublicAPI]
         public void AllowPartialMapping(bool allow = true)
         {
-            _settings.Logger.Info("AllowPartialMapping is set to {0}", allow);
+            _logger.Info("AllowPartialMapping is set to {0}", allow);
             _options.AllowPartialMapping = allow;
         }
 
@@ -437,15 +430,14 @@ namespace WireMock.Server
         /// The given.
         /// </summary>
         /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
         [PublicAPI]
-        public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
+        public IRespondWithAProvider Given(IRequestMatcher requestMatcher)
         {
-            return new RespondWithAProvider(RegisterMapping, requestMatcher, _settings, saveToFile);
+            return new RespondWithAProvider(RegisterMapping, requestMatcher);
         }
 
-        private void RegisterMapping(IMapping mapping, bool saveToFile)
+        private void RegisterMapping(IMapping mapping)
         {
             // Check a mapping exists with the same Guid, if so, replace it.
             if (_options.Mappings.ContainsKey(mapping.Guid))
@@ -456,11 +448,6 @@ namespace WireMock.Server
             {
                 _options.Mappings.TryAdd(mapping.Guid, mapping);
             }
-
-            if (saveToFile)
-            {
-                SaveMappingToFile(mapping);
-            }
         }
     }
 }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -1,7 +1,6 @@
 using System;
 using WireMock.Matchers.Request;
 using WireMock.ResponseProviders;
-using WireMock.Settings;
 
 namespace WireMock.Server
 {
@@ -18,8 +17,6 @@ namespace WireMock.Server
         private string _scenario;
         private readonly RegistrationCallback _registrationCallback;
         private readonly IRequestMatcher _requestMatcher;
-        private readonly IFluentMockServerSettings _settings;
-        private readonly bool _saveToFile;
 
         public Guid Guid { get; private set; } = Guid.NewGuid();
 
@@ -28,14 +25,10 @@ namespace WireMock.Server
         /// </summary>
         /// <param name="registrationCallback">The registration callback.</param>
         /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="settings">The FluentMockServerSettings.</param>
-        /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, IFluentMockServerSettings settings, bool saveToFile = false)
+        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher)
         {
             _registrationCallback = registrationCallback;
             _requestMatcher = requestMatcher;
-            _settings = settings;
-            _saveToFile = saveToFile;
         }
 
         /// <summary>
@@ -44,7 +37,7 @@ namespace WireMock.Server
         /// <param name="provider">The provider.</param>
         public void RespondWith(IResponseProvider provider)
         {
-            _registrationCallback(new Mapping(Guid, _title, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState), _saveToFile);
+            _registrationCallback(new Mapping(Guid, _title, _path, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState));
         }
 
         /// <see cref="IRespondWithAProvider.WithGuid(string)"/>

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,7 +1,6 @@
-using HandlebarsDotNet;
+using System;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using System;
 using WireMock.Handlers;
 using WireMock.Logging;
 
@@ -83,11 +82,6 @@ namespace WireMock.Settings
         /// <inheritdoc cref="IFluentMockServerSettings.FileSystemHandler"/>
         [PublicAPI]
         [JsonIgnore]
-        public IFileSystemHandler FileSystemHandler { get; set; }
-
-        /// <inheritdoc cref="IFluentMockServerSettings.HandlebarsRegistrationCallback"/>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<IHandlebars, IFileSystemHandler> HandlebarsRegistrationCallback { get; set; }
+        public IFileSystemHandler FileSystemHandler { get; set; } = new LocalFileSystemHandler();
     }
 }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -1,6 +1,5 @@
-using HandlebarsDotNet;
+using System;
 using JetBrains.Annotations;
-using System;
 using WireMock.Handlers;
 using WireMock.Logging;
 
@@ -25,7 +24,7 @@ namespace WireMock.Settings
         bool? UseSSL { get; set; }
 
         /// <summary>
-        /// Gets or sets whether to start admin interface.
+        /// Gets or sets wether to start admin interface.
         /// </summary>
         [PublicAPI]
         bool? StartAdminInterface { get; set; }
@@ -113,11 +112,5 @@ namespace WireMock.Settings
         /// </summary>
         [PublicAPI]
         IFileSystemHandler FileSystemHandler { get; set; }
-
-        /// <summary>
-        /// Action which can be used to add additional is Handlebar registrations. [Optional]
-        /// </summary>
-        [PublicAPI]
-        Action<IHandlebars, IFileSystemHandler> HandlebarsRegistrationCallback { get; set; }
     }
 }

src/WireMock.Net/Transformers/HandleBarsFile.cs

@@ -1,41 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using WireMock.Handlers;
-using WireMock.Validation;
-
-namespace WireMock.Transformers
-{
-    internal static class HandleBarsFile
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            handlebarsContext.RegisterHelper("File", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("File", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndReadFileFragment(IHandlebars handlebarsContext, dynamic context, IFileSystemHandler fileSystemHandler, object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string path:
-                    var templateFunc = handlebarsContext.Compile(path);
-                    string transformed = templateFunc(context);
-                    return fileSystemHandler.ReadResponseBodyAsString(transformed);
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars File.");
-        }
-    }
-}

src/WireMock.Net/Transformers/HandleBarsHelpers.cs

@@ -1,11 +1,10 @@
 using HandlebarsDotNet;
-using WireMock.Handlers;
 
 namespace WireMock.Transformers
 {
     internal static class HandlebarsHelpers
     {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
+        public static void Register(IHandlebars handlebarsContext)
         {
             HandleBarsRegex.Register(handlebarsContext);
 
@@ -16,8 +15,6 @@ namespace WireMock.Transformers
             HandleBarsRandom.Register(handlebarsContext);
 
             HandleBarsXeger.Register(handlebarsContext);
-
-            HandleBarsFile.Register(handlebarsContext, fileSystemHandler);
         }
     }
 }

src/WireMock.Net/Transformers/HandlebarsContextFactory.cs

@@ -1,34 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using WireMock.Handlers;
-
-namespace WireMock.Transformers
-{
-    internal class HandlebarsContextFactory : IHandlebarsContextFactory
-    {
-        private static readonly HandlebarsConfiguration HandlebarsConfiguration = new HandlebarsConfiguration
-        {
-            UnresolvedBindingFormatter = "{0}"
-        };
-
-        private readonly IFileSystemHandler _fileSystemHandler;
-        private readonly Action<IHandlebars, IFileSystemHandler> _action;
-
-        public HandlebarsContextFactory(IFileSystemHandler fileSystemHandler, Action<IHandlebars, IFileSystemHandler> action)
-        {
-            _fileSystemHandler = fileSystemHandler;
-            _action = action;
-        }
-
-        public IHandlebars Create()
-        {
-            var handlebarsContext = Handlebars.Create(HandlebarsConfiguration);
-
-            HandlebarsHelpers.Register(handlebarsContext, _fileSystemHandler);
-
-            _action?.Invoke(handlebarsContext, _fileSystemHandler);
-
-            return handlebarsContext;
-        }
-    }
-}

src/WireMock.Net/Transformers/IHandlebarsContextFactory.cs

@@ -1,9 +0,0 @@
-using HandlebarsDotNet;
-
-namespace WireMock.Transformers
-{
-    interface IHandlebarsContextFactory
-    {
-        IHandlebars Create();
-    }
-}

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -1,30 +1,29 @@
 using HandlebarsDotNet;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using WireMock.Util;
-using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal class ResponseMessageTransformer
+    internal static class ResponseMessageTransformer
     {
-        private readonly IHandlebarsContextFactory _factory;
-
-        public ResponseMessageTransformer([NotNull] IHandlebarsContextFactory factory)
+        private static readonly HandlebarsConfiguration HandlebarsConfiguration = new HandlebarsConfiguration
         {
-            Check.NotNull(factory, nameof(factory));
+            UnresolvedBindingFormatter = "{0}"
+        };
 
-            _factory = factory;
+        private static readonly IHandlebars HandlebarsContext = Handlebars.Create(HandlebarsConfiguration);
+
+        static ResponseMessageTransformer()
+        {
+            HandlebarsHelpers.Register(HandlebarsContext);
         }
 
-        public ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original)
+        public static ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original)
         {
-            var handlebarsContext = _factory.Create();
-
             var responseMessage = new ResponseMessage { StatusCode = original.StatusCode };
 
             var template = new { request = requestMessage };
@@ -32,16 +31,16 @@ namespace WireMock.Transformers
             switch (original.BodyData.DetectedBodyType)
             {
                 case BodyType.Json:
-                    TransformBodyAsJson(handlebarsContext, template, original, responseMessage);
+                    TransformBodyAsJson(template, original, responseMessage);
                     break;
 
                 case BodyType.File:
-                    TransformBodyAsFile(handlebarsContext, template, original, responseMessage);
+                    TransformBodyAsFile(template, original, responseMessage);
                     break;
 
                 case BodyType.String:
                     responseMessage.BodyOriginal = original.BodyData.BodyAsString;
-                    TransformBodyAsString(handlebarsContext, template, original, responseMessage);
+                    TransformBodyAsString(template, original, responseMessage);
                     break;
             }
 
@@ -49,9 +48,9 @@ namespace WireMock.Transformers
             var newHeaders = new Dictionary<string, WireMockList<string>>();
             foreach (var header in original.Headers)
             {
-                var templateHeaderKey = handlebarsContext.Compile(header.Key);
+                var templateHeaderKey = HandlebarsContext.Compile(header.Key);
                 var templateHeaderValues = header.Value
-                    .Select(handlebarsContext.Compile)
+                    .Select(HandlebarsContext.Compile)
                     .Select(func => func(template))
                     .ToArray();
 
@@ -63,7 +62,7 @@ namespace WireMock.Transformers
             return responseMessage;
         }
 
-        private static void TransformBodyAsJson(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
+        private static void TransformBodyAsJson(object template, ResponseMessage original, ResponseMessage responseMessage)
         {
             JToken jToken;
             switch (original.BodyData.BodyAsJson)
@@ -81,7 +80,7 @@ namespace WireMock.Transformers
                     break;
             }
 
-            WalkNode(handlebarsContext, jToken, template);
+            WalkNode(jToken, template);
 
             responseMessage.BodyData = new BodyData
             {
@@ -91,14 +90,14 @@ namespace WireMock.Transformers
             };
         }
 
-        private static void WalkNode(IHandlebars handlebarsContext, JToken node, object context)
+        private static void WalkNode(JToken node, object template)
         {
             if (node.Type == JTokenType.Object)
             {
                 // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
                 foreach (JProperty child in node.Children<JProperty>().ToArray())
                 {
-                    WalkNode(handlebarsContext, child.Value, context);
+                    WalkNode(child.Value, template);
                 }
             }
             else if (node.Type == JTokenType.Array)
@@ -106,7 +105,7 @@ namespace WireMock.Transformers
                 // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
                 foreach (JToken child in node.Children().ToArray())
                 {
-                    WalkNode(handlebarsContext, child, context);
+                    WalkNode(child, template);
                 }
             }
             else if (node.Type == JTokenType.String)
@@ -118,8 +117,8 @@ namespace WireMock.Transformers
                     return;
                 }
 
-                var templateForStringValue = handlebarsContext.Compile(stringValue);
-                string transformedString = templateForStringValue(context);
+                var templateForStringValue = HandlebarsContext.Compile(stringValue);
+                string transformedString = templateForStringValue(template);
                 if (!string.Equals(stringValue, transformedString))
                 {
                     ReplaceNodeValue(node, transformedString);
@@ -150,9 +149,9 @@ namespace WireMock.Transformers
             node.Replace(value);
         }
 
-        private static void TransformBodyAsString(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
+        private static void TransformBodyAsString(object template, ResponseMessage original, ResponseMessage responseMessage)
         {
-            var templateBodyAsString = handlebarsContext.Compile(original.BodyData.BodyAsString);
+            var templateBodyAsString = HandlebarsContext.Compile(original.BodyData.BodyAsString);
 
             responseMessage.BodyData = new BodyData
             {
@@ -162,9 +161,9 @@ namespace WireMock.Transformers
             };
         }
 
-        private static void TransformBodyAsFile(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
+        private static void TransformBodyAsFile(object template, ResponseMessage original, ResponseMessage responseMessage)
         {
-            var templateBodyAsFile = handlebarsContext.Compile(original.BodyData.BodyAsFile);
+            var templateBodyAsFile = HandlebarsContext.Compile(original.BodyData.BodyAsFile);
 
             responseMessage.BodyData = new BodyData
             {

src/WireMock.Net/Util/BodyParser.cs

@@ -2,7 +2,6 @@
 using MimeKit;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -28,18 +27,7 @@ namespace WireMock.Util
             CONNECT - No defined body semantics
             PATCH - Body supported.
         */
-        private static readonly IDictionary<string, bool> BodyAllowedForMethods = new Dictionary<string, bool>
-        {
-            { "HEAD", false },
-            { "GET", false },
-            { "PUT", true },
-            { "POST", true },
-            { "DELETE", false },
-            { "TRACE", false },
-            { "OPTIONS", true },
-            { "CONNECT", false },
-            { "PATCH", true }
-        };
+        private static readonly string[] AllowedBodyParseMethods = { "PUT", "POST", "OPTIONS", "PATCH" };
 
         private static readonly IStringMatcher[] MultipartContentTypesMatchers = {
             new WildcardMatcher("multipart/*", true)
@@ -65,19 +53,7 @@ namespace WireMock.Util
 
         public static bool ShouldParseBody([CanBeNull] string method)
         {
-            if (String.IsNullOrEmpty(method))
-            {
-                return false;
-            }
-            if (BodyAllowedForMethods.TryGetValue(method.ToUpper(), out var allowed))
-            {
-                return allowed;
-            }
-            // If we don't have any knowledge of this method, we should assume that a body *may*
-            // be present, so we should parse it if it is. Therefore, if a new method is added to
-            // the HTTP Method Registry, we only really need to add it to BodyAllowedForMethods if
-            // we want to make it clear that a body is *not* allowed.
-            return true;
+            return AllowedBodyParseMethods.Contains(method, StringComparer.OrdinalIgnoreCase);
         }
 
         public static BodyType DetectBodyTypeFromContentType([CanBeNull] string contentTypeValue)

src/WireMock.Net/Util/FileHelper.cs

@@ -1,5 +1,6 @@
-using JetBrains.Annotations;
+using System.IO;
 using System.Threading;
+using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Validation;
 
@@ -10,19 +11,16 @@ namespace WireMock.Util
         private const int NumberOfRetries = 3;
         private const int DelayOnRetry = 500;
 
-        public static bool TryReadMappingFileWithRetryAndDelay([NotNull] IFileSystemHandler handler, [NotNull] string path, out string value)
+        public static string ReadAllTextWithRetryAndDelay([NotNull] IFileSystemHandler handler, [NotNull] string path)
         {
             Check.NotNull(handler, nameof(handler));
             Check.NotNullOrEmpty(path, nameof(path));
 
-            value = null;
-
             for (int i = 1; i <= NumberOfRetries; ++i)
             {
                 try
                 {
-                    value = handler.ReadMappingFile(path);
-                    return true;
+                    return handler.ReadMappingFile(path);
                 }
                 catch
                 {
@@ -30,7 +28,7 @@ namespace WireMock.Util
                 }
             }
 
-            return false;
+            throw new IOException();
         }
     }
 }

src/WireMock.Net/Util/QueryStringParser.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace WireMock.Util
-{
-    /// <summary>
-    /// Based on https://stackoverflow.com/questions/659887/get-url-parameters-from-a-string-in-net
-    /// </summary>
-    internal static class QueryStringParser
-    {
-        public static IDictionary<string, WireMockList<string>> Parse(string queryString)
-        {
-            if (string.IsNullOrEmpty(queryString))
-            {
-                return new Dictionary<string, WireMockList<string>>();
-            }
-
-            string[] JoinParts(string[] parts)
-            {
-                if (parts.Length > 2)
-                {
-                    return new[] { string.Join("=", parts, 1, parts.Length - 1) };
-                }
-
-                if (parts.Length > 1)
-                {
-                    return parts[1].Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries); // support "?key=1,2"
-                }
-
-                return new string[0];
-            }
-
-            return queryString.TrimStart('?')
-                .Split(new[] { '&', ';' }, StringSplitOptions.RemoveEmptyEntries) // Support "?key=value;key=anotherValue" and "?key=value&key=anotherValue"
-                .Select(parameter => parameter.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries))
-                .GroupBy(parts => parts[0], JoinParts)
-                .ToDictionary(grouping => grouping.Key, grouping => new WireMockList<string>(grouping.SelectMany(x => x)));
-        }
-    }
-}

src/WireMock.Net/WireMock.Net.csproj

@@ -25,10 +25,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -62,7 +58,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.8" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.7" />
     <PackageReference Include="JmesPath.Net" Version="1.0.125" />
   </ItemGroup>
 

test/WireMock.Net.Tests/FluentMockServerTests.Admin.cs

@@ -47,14 +47,12 @@ namespace WireMock.Net.Tests
             server.ReadStaticMappings(folder);
 
             Check.That(server.Mappings).HasSize(5);
-            Check.That(server.MappingModels).HasSize(5);
 
             // Act
             server.ResetMappings();
 
             // Assert
             Check.That(server.Mappings).HasSize(0);
-            Check.That(server.MappingModels).HasSize(0);
         }
 
         [Fact]
@@ -377,32 +375,5 @@ namespace WireMock.Net.Tests
             fileMock.Verify(f => f.GetMappingFolder(), Times.Once);
             fileMock.Verify(f => f.FolderExists(It.IsAny<string>()), Times.Once);
         }
-
-        [Fact]
-        public void FluentMockServer_Admin_AddMappingsAndSaveToFile()
-        {
-            // Assign
-            string guid = "791a3f31-6946-aaaa-8e6f-0237c7442222";
-            var staticMappingHandlerMock = new Mock<IFileSystemHandler>();
-            staticMappingHandlerMock.Setup(m => m.GetMappingFolder()).Returns("folder");
-            staticMappingHandlerMock.Setup(m => m.FolderExists(It.IsAny<string>())).Returns(true);
-            staticMappingHandlerMock.Setup(m => m.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()));
-
-            var server = FluentMockServer.Start(new FluentMockServerSettings
-            {
-                FileSystemHandler = staticMappingHandlerMock.Object
-            });
-
-            // Act
-            server
-                .Given(Request.Create().WithPath($"/foo_{Guid.NewGuid()}"), true)
-                .WithGuid(guid)
-                .RespondWith(Response.Create().WithBody("post and save test"));
-
-            // Assert and Verify
-            staticMappingHandlerMock.Verify(m => m.GetMappingFolder(), Times.Once);
-            staticMappingHandlerMock.Verify(m => m.FolderExists("folder"), Times.Once);
-            staticMappingHandlerMock.Verify(m => m.WriteMappingFile(Path.Combine("folder", guid + ".json"), It.IsAny<string>()), Times.Once);
-        }
     }
 }

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -1,7 +1,6 @@
 using NFluent;
 using System;
 using System.Diagnostics;
-using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using WireMock.RequestBuilders;
@@ -173,65 +172,5 @@ namespace WireMock.Net.Tests
             Check.That(response.Headers.Contains("test")).IsTrue();
             Check.That(response.Headers.Contains("Transfer-Encoding")).IsFalse();
         }
-
-        [Theory]
-        [InlineData("DELETE")]
-#if !NET452
-        [InlineData("TRACE")]
-        [InlineData("GET")]
-#endif
-        public async Task FluentMockServer_Should_exclude_body_for_methods_where_body_is_definitely_disallowed(string method)
-        {
-            // Assign
-            string content = "hello";
-            var server = FluentMockServer.Start();
-
-            server
-                .Given(Request.Create().WithBody(b => true))
-                .AtPriority(0)
-                .RespondWith(Response.Create().WithStatusCode(400));
-            server
-                .Given(Request.Create())
-                .AtPriority(1)
-                .RespondWith(Response.Create().WithStatusCode(200));
-
-            // Act
-            var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/");
-            request.Content = new StringContent(content);
-            var response = await new HttpClient().SendAsync(request);
-
-            // Assert
-            Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
-        }
-    
-        [Theory]
-        [InlineData("POST")]
-        [InlineData("PUT")]
-        [InlineData("OPTIONS")]
-        [InlineData("REPORT")]
-        [InlineData("SOME-UNKNOWN-METHOD")] // default behavior for unknown methods is to allow a body (see BodyParser.ShouldParseBody)
-        public async Task FluentMockServer_Should_not_exclude_body_for_supported_methods(string method)
-        {
-            // Assign
-            string content = "hello";
-            var server = FluentMockServer.Start();
-
-            server
-                .Given(Request.Create().WithBody(content))
-                .AtPriority(0)
-                .RespondWith(Response.Create().WithStatusCode(200));
-            server
-                .Given(Request.Create())
-                .AtPriority(1)
-                .RespondWith(Response.Create().WithStatusCode(400));
-
-            // Act
-            var request = new HttpRequestMessage(new HttpMethod(method), "http://localhost:" + server.Ports[0] + "/");
-            request.Content = new StringContent(content);
-            var response = await new HttpClient().SendAsync(request);
-
-            // Assert
-            Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
-        }
     }
 }

test/WireMock.Net.Tests/RequestBuilders/RequestBuilderWithBodyTests.cs

@@ -1,6 +1,5 @@
-using FluentAssertions;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
+using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
@@ -21,24 +20,8 @@ namespace WireMock.Net.Tests.RequestBuilders
 
             // Assert
             var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            matchers.Should().HaveCount(1);
-            ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(matcher);
-        }
-
-        [Fact]
-        public void RequestBuilder_WithBody_IMatchers()
-        {
-            // Assign
-            var matcher1 = new WildcardMatcher("x");
-            var matcher2 = new WildcardMatcher("y");
-
-            // Act
-            var requestBuilder = (Request)Request.Create().WithBody(new[] { matcher1, matcher2 }.Cast<IMatcher>().ToArray());
-
-            // Assert
-            var matchers = requestBuilder.GetPrivateFieldValue<IList<IRequestMatcher>>("_requestMatchers");
-            matchers.Should().HaveCount(1);
-            ((RequestMessageBodyMatcher)matchers[0]).Matchers.Should().Contain(new[] { matcher1, matcher2 });
+            Check.That(matchers.Count).IsEqualTo(1);
+            Check.That(((RequestMessageBodyMatcher) matchers[0]).Matcher).IsEqualTo(matcher);
         }
     }
 }

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

@@ -1,5 +1,4 @@
-using System.Linq;
-using Moq;
+using Moq;
 using NFluent;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -39,39 +38,6 @@ namespace WireMock.Net.Tests.RequestMatchers
             stringMatcherMock.Verify(m => m.IsMatch("b"), Times.Once);
         }
 
-        [Fact]
-        public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsString_IStringMatchers()
-        {
-            // Assign
-            var body = new BodyData
-            {
-                BodyAsString = "b",
-                DetectedBodyType = BodyType.String
-            };
-            var stringMatcherMock1 = new Mock<IStringMatcher>();
-            stringMatcherMock1.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.2d);
-            var stringMatcherMock2 = new Mock<IStringMatcher>();
-            stringMatcherMock2.Setup(m => m.IsMatch(It.IsAny<string>())).Returns(0.8d);
-            var matchers = new[] { stringMatcherMock1.Object, stringMatcherMock2.Object };
-
-            var requestMessage = new RequestMessage(new UrlDetails("http://localhost"), "GET", "127.0.0.1", body);
-
-            var matcher = new RequestMessageBodyMatcher(matchers.Cast<IMatcher>().ToArray());
-
-            // Act
-            var result = new RequestMatchResult();
-            double score = matcher.GetMatchingScore(requestMessage, result);
-
-            // Assert
-            Check.That(score).IsEqualTo(0.8d);
-
-            // Verify
-            stringMatcherMock1.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock1.Verify(m => m.IsMatch("b"), Times.Once);
-            stringMatcherMock2.Verify(m => m.GetPatterns(), Times.Never);
-            stringMatcherMock2.Verify(m => m.IsMatch("b"), Times.Once);
-        }
-
         [Fact]
         public void RequestMessageBodyMatcher_GetMatchingScore_BodyAsBytes_IStringMatcher()
         {

test/WireMock.Net.Tests/ResponseBuilders/ResponseCreateTests.cs

@@ -1,17 +1,13 @@
-using Moq;
+using System.Threading.Tasks;
 using NFluent;
-using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using Xunit;
 
 namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseCreateTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
-
         [Fact]
         public async Task Response_Create_Func()
         {
@@ -22,7 +18,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create(() => responseMessage);
 
             // Act
-            var providedResponse = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var providedResponse = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(providedResponse).Equals(responseMessage);

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs

@@ -1,49 +0,0 @@
-using FluentAssertions;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithBodyFromFileTests
-    {
-        [Fact]
-        public async Task Response_ProvideResponse_WithBodyFromFile()
-        {
-            // Arrange
-            var server = FluentMockServer.Start();
-
-            string path = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings", "MyXmlResponse.xml");
-
-            server
-                .Given(
-                    Request
-                        .Create()
-                        .UsingGet()
-                        .WithPath("/v1/content")
-                )
-                .RespondWith(
-                    Response
-                        .Create()
-                        .WithStatusCode(HttpStatusCode.OK)
-                        .WithHeader("Content-Type", "application/xml")
-                        .WithBodyFromFile(path)
-                );
-
-            // Act
-            var response1 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
-            var response2 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
-            var response3 = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
-
-            // Assert
-            response1.Should().Contain("<hello>world</hello>");
-            response2.Should().Contain("<hello>world</hello>");
-            response3.Should().Contain("<hello>world</hello>");
-        }
-    }
-}

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyTests.cs

@@ -1,20 +1,17 @@
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
+using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
+using Newtonsoft.Json.Linq;
 
 namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithBodyTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -31,7 +28,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);
 
             // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // then
             Check.That(responseMessage.BodyData.BodyAsString).Equals("01");
@@ -53,7 +50,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);
 
             // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // then
             Check.That(responseMessage.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
@@ -75,7 +72,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody("test", null, Encoding.ASCII);
 
             // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // then
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
@@ -97,7 +94,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBodyAsJson(x, Encoding.ASCII);
 
             // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // then
             Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
@@ -119,7 +116,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBodyAsJson(x, true);
 
             // act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // then
             Check.That(responseMessage.BodyData.BodyAsJson).Equals(x);
@@ -135,7 +132,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsBytes).IsNull();
@@ -153,7 +150,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).IsNull();
@@ -171,7 +168,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).IsNull();
@@ -193,7 +190,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBody(req => $"path: {req.Path}");
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("path: /test");
@@ -204,7 +201,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             Check.That(responseMessage.Headers["H1"].ToString()).IsEqualTo("X1");
             Check.That(responseMessage.Headers["H2"].ToString()).IsEqualTo("X2");
         }
-
+        
         [Fact]
         public async Task Response_ProvideResponse_WithJsonBodyAndTransform_Func()
         {
@@ -214,15 +211,15 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var request1 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request1Id}"), "GET", ClientIp);
             var request2 = new RequestMessage(new UrlDetails($"http://localhost/test?id={request2Id}"), "GET", ClientIp);
-
+            
             var response = Response.Create()
                 .WithStatusCode(200)
                 .WithBodyAsJson(JObject.Parse("{ \"id\": \"{{request.query.id}}\" }"))
                 .WithTransformer();
 
             // Act
-            var response1Message = await response.ProvideResponseAsync(request1, _settingsMock.Object);
-            var response2Message = await response.ProvideResponseAsync(request2, _settingsMock.Object);
+            var response1Message = await response.ProvideResponseAsync(request1);
+            var response2Message = await response.ProvideResponseAsync(request2);
 
             // Assert
             Check.That(((JToken)response1Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
@@ -240,13 +237,13 @@ namespace WireMock.Net.Tests.ResponseBuilders
         public async Task Response_ProvideResponse_WithBodyAsFile()
         {
             var fileContents = "testFileContents" + Guid.NewGuid();
-            var bodyDataAsFile = new BodyData { BodyAsFile = fileContents };
+            var bodyDataAsFile = new BodyData {BodyAsFile = fileContents};
 
             var request1 = new RequestMessage(new UrlDetails("http://localhost/__admin/files/filename.txt"), "PUT", ClientIp, bodyDataAsFile);
 
             var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
 
-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settingsMock.Object);
+            var provideResponseAsync = await response.ProvideResponseAsync(request1);
 
             Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
             Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
@@ -262,7 +259,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var response = Response.Create().WithStatusCode(200).WithBody(fileContents);
 
-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settingsMock.Object);
+            var provideResponseAsync = await response.ProvideResponseAsync(request1);
 
             Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
             Check.That(provideResponseAsync.BodyData.BodyAsString).Contains(fileContents);
@@ -278,7 +275,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var response = Response.Create().WithStatusCode(200).WithBody("File deleted.");
 
-            var provideResponseAsync = await response.ProvideResponseAsync(request1, _settingsMock.Object);
+            var provideResponseAsync = await response.ProvideResponseAsync(request1);
 
             Check.That(provideResponseAsync.StatusCode).IsEqualTo(200);
             Check.That(provideResponseAsync.BodyData.BodyAsString).Contains("File deleted.");

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs

@@ -1,9 +1,7 @@
-using Moq;
+using System.Threading.Tasks;
 using NFluent;
-using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -11,8 +9,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithCallbackTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
-
         [Fact]
         public async Task Response_WithCallback()
         {
@@ -21,7 +17,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithCallback(req => new ResponseMessage { BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = req.Path + "Bar" }, StatusCode = 302 });
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("/fooBar");

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsFileTests.cs

@@ -1,100 +0,0 @@
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using System;
-using System.Threading.Tasks;
-using WireMock.Handlers;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsFileTests
-    {
-        private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
-        private readonly Mock<IFluentMockServerSettings> _settingsMock;
-        private const string ClientIp = "::1";
-
-        public ResponseWithHandlebarsFileTests()
-        {
-            _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
-
-            _settingsMock = new Mock<IFluentMockServerSettings>();
-            _settingsMock.SetupGet(s => s.FileSystemHandler).Returns(_filesystemHandlerMock.Object);
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"x.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_File_Replace()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234?id=x"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File \"{{request.query.id}}.json\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Data"].Value<string>()).Equals("abc");
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString("x.json"), Times.Once);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-
-        [Fact]
-        public void Response_ProvideResponseAsync_Handlebars_File_WithMissingArgument_ThrowsArgumentOutOfRangeException()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Data = "{{File}}"
-                })
-                .WithTransformer();
-
-            // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<ArgumentOutOfRangeException>();
-
-            // Verify
-            _filesystemHandlerMock.Verify(fs => fs.ReadResponseBodyAsString(It.IsAny<string>()), Times.Never);
-            _filesystemHandlerMock.VerifyNoOtherCalls();
-        }
-    }
-}

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs

@@ -1,11 +1,9 @@
-using Moq;
+using System;
+using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NFluent;
-using System;
-using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -13,7 +11,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsJsonPathTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -63,7 +60,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -89,7 +86,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -143,7 +140,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
@@ -196,7 +193,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
@@ -249,7 +246,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -302,7 +299,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -331,7 +328,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<ArgumentNullException>();
+            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request)).Throws<ArgumentNullException>();
         }
     }
 }

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsLinqTests.cs

@@ -1,11 +1,9 @@
-using Moq;
+using System;
+using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NFluent;
-using System;
-using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -13,13 +11,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsLinqTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
-
         [Fact]
         public async Task Response_ProvideResponse_Handlebars_Linq1_String0()
         {
             // Assign
-            var body = new BodyData();
+            var body = new BodyData { };
 
             var request = new RequestMessage(new UrlDetails("http://localhost:1234/pathtest"), "POST", "::1", body);
 
@@ -29,7 +25,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -59,7 +55,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -89,7 +85,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -119,7 +115,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -144,14 +140,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<NotSupportedException>();
+            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request)).Throws<NotSupportedException>();
         }
 
         [Fact]
         public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentNullException()
         {
             // Assign
-            var body = new BodyData();
+            var body = new BodyData { };
 
             var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
 
@@ -160,14 +156,14 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<ArgumentNullException>();
+            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request)).Throws<ArgumentNullException>();
         }
 
         [Fact]
         public void Response_ProvideResponse_Handlebars_Linq1_Throws_ArgumentException()
         {
             // Assign
-            var body = new BodyData();
+            var body = new BodyData { };
 
             var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", "::1", body);
 
@@ -176,7 +172,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<ArgumentException>();
+            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request)).Throws<ArgumentException>();
         }
 
         [Fact]
@@ -200,7 +196,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -228,7 +224,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs

@@ -1,18 +1,16 @@
-using Moq;
-using Newtonsoft.Json.Linq;
-using NFluent;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using Xunit;
 
 namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsRandomTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -32,7 +30,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -55,7 +53,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -77,7 +75,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -101,7 +99,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -123,7 +121,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRegexTests.cs

@@ -1,10 +1,8 @@
-using Moq;
-using NFluent;
-using System;
+using System;
 using System.Threading.Tasks;
+using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -12,7 +10,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsRegexTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -28,7 +25,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("abc");
@@ -47,7 +44,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("");
@@ -66,7 +63,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("d");
@@ -85,7 +82,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("5000-https");
@@ -104,7 +101,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("");
@@ -123,7 +120,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("x");
@@ -142,7 +139,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act and Assert
-            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settingsMock.Object)).Throws<NotSupportedException>();
+            Check.ThatAsyncCode(() => response.ProvideResponseAsync(request)).Throws<NotSupportedException>();
         }
     }
 }

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsTests.cs

@@ -2,12 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using Moq;
 using Newtonsoft.Json;
 using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 #if NET452
@@ -20,7 +18,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -41,7 +38,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
@@ -63,7 +60,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
@@ -81,7 +78,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("http://localhost/a/b http://localhost/wiremock/a/b /a/b /wiremock/a/b");
@@ -99,7 +96,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("a wiremock");
@@ -121,7 +118,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
@@ -141,7 +138,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
@@ -163,7 +160,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
@@ -188,7 +185,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
@@ -212,7 +209,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
@@ -229,7 +226,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\test.xml"); // why use a \\ here ?
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -256,7 +253,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.json");

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsXegerTests.cs

@@ -1,17 +1,14 @@
-using Moq;
+using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NFluent;
-using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using Xunit;
 
 namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHandlebarsXegerTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Fact]
@@ -29,7 +26,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
@@ -52,7 +49,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHeadersTests.cs

@@ -1,10 +1,8 @@
-using Moq;
-using NFluent;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -12,7 +10,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithHeadersTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private const string ClientIp = "::1";
 
         [Theory]
@@ -26,7 +23,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue);
 
             // Act
-            var response = await builder.ProvideResponseAsync(requestMock, _settingsMock.Object);
+            var response = await builder.ProvideResponseAsync(requestMock);
 
             // Assert
             Check.That(response.Headers[headerName].ToString()).Equals(headerValue);
@@ -42,7 +39,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues);
 
             // Act
-            var response = await builder.ProvideResponseAsync(requestMock, _settingsMock.Object);
+            var response = await builder.ProvideResponseAsync(requestMock);
 
             // Assert
             Check.That(response.Headers[headerName].ToArray()).Equals(headerValues);
@@ -57,7 +54,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeaders(headers);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
@@ -72,7 +69,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeaders(headers);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.Headers["h"]).ContainsExactly("x");
@@ -87,7 +84,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeaders(headers);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.Headers["h"]).ContainsExactly("x");

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyTests.cs

@@ -1,13 +1,11 @@
-using Moq;
-using NFluent;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using NFluent;
 using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
-using WireMock.Settings;
 using WireMock.Util;
 using Xunit;
 
@@ -15,7 +13,6 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithProxyTests : IDisposable
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
         private readonly FluentMockServer _server;
         private readonly Guid _guid;
 
@@ -33,11 +30,11 @@ namespace WireMock.Net.Tests.ResponseBuilders
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
-            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "POST", "::1", new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = new { a = 1 } }, headers);
+            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "POST", "::1", new BodyData { DetectedBodyType = BodyType.Json,  BodyAsJson = new { a = 1 } }, headers);
             var response = Response.Create().WithProxy(_server.Urls[0]);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settingsMock.Object);
+            var responseMessage = await response.ProvideResponseAsync(request);
 
             // Assert
             Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("{\"p\":42}");

test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs

@@ -1,51 +1,27 @@
-using FluentAssertions;
-using Moq;
-using System;
+using System;
+using NFluent;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Serialization;
-using WireMock.Settings;
 using Xunit;
 
 namespace WireMock.Net.Tests.Serialization
 {
     public class MappingConverterTests
     {
-        private readonly Mock<IFluentMockServerSettings> _settingsMock = new Mock<IFluentMockServerSettings>();
-
         [Fact]
-        public void ToMappingModel()
+        public void MappingConverter_ToMappingModel()
         {
             // Assign
             var request = Request.Create();
             var response = Response.Create();
-            var mapping = new Mapping(Guid.NewGuid(), "", null, _settingsMock.Object, request, response, 0, null, null, null);
+            var mapping = new Mapping(Guid.NewGuid(), "", null, request, response, 0, null, null, null);
 
             // Act
             var model = MappingConverter.ToMappingModel(mapping);
 
             // Assert
-            model.Should().NotBeNull();
-            model.Priority.Should().BeNull();
-            model.Response.BodyAsJsonIndented.Should().BeNull();
-            model.Response.UseTransformer.Should().BeNull();
-        }
-
-        [Fact]
-        public void ToMappingModel_WithPriority_ReturnsPriority()
-        {
-            // Assign
-            var request = Request.Create();
-            var response = Response.Create().WithBodyAsJson(new { x = "x" }).WithTransformer();
-            var mapping = new Mapping(Guid.NewGuid(), "", null, _settingsMock.Object, request, response, 42, null, null, null);
-
-            // Act
-            var model = MappingConverter.ToMappingModel(mapping);
-
-            // Assert
-            model.Should().NotBeNull();
-            model.Priority.Should().Be(42);
-            model.Response.UseTransformer.Should().BeTrue();
+            Check.That(model).IsNotNull();
         }
     }
 }

test/WireMock.Net.Tests/TestUtils.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 
 namespace WireMock.Net.Tests
 {
@@ -11,53 +10,5 @@ namespace WireMock.Net.Tests
 
             return (T)field.GetValue(obj);
         }
-
-        /// <summary>
-        /// Set a _private_ Field Value on a given Object
-        /// </summary>
-        /// <typeparam name="T">Type of the Property</typeparam>
-        /// <param name="obj">Object from where the Property Value is returned</param>
-        /// <param name="propertyName">Property name as string.</param>
-        /// <param name="value">the value to set</param>
-        public static void SetPrivateFieldValue<T>(this object obj, string propertyName, T value)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
-
-            Type t = obj.GetType();
-            FieldInfo fi = null;
-            while (fi == null && t != null)
-            {
-                fi = t.GetField(propertyName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-                t = t.BaseType;
-            }
-
-            if (fi == null)
-            {
-                throw new ArgumentOutOfRangeException(nameof(propertyName), $"Field {propertyName} was not found in Type {obj.GetType().FullName}");
-            }
-
-            fi.SetValue(obj, value);
-        }
-
-        /// <summary>
-        /// Sets a _private_ Property Value from a given Object.
-        /// </summary>
-        /// <typeparam name="T">Type of the Property</typeparam>
-        /// <param name="obj">Object from where the Property Value is set</param>
-        /// <param name="propertyName">Property name as string.</param>
-        /// <param name="value">Value to set.</param>
-        public static void SetPrivatePropertyValue<T>(this object obj, string propertyName, T value)
-        {
-            Type t = obj.GetType();
-            if (t.GetProperty(propertyName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance) == null)
-            {
-                throw new ArgumentOutOfRangeException(nameof(propertyName), $"Property {propertyName} was not found in Type {obj.GetType().FullName}");
-            }
-
-            t.InvokeMember(propertyName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.SetProperty | BindingFlags.Instance, null, obj, new object[] { value });
-        }
     }
 }

test/WireMock.Net.Tests/Transformers/HandlebarsContextFactoryTests.cs

@@ -1,52 +0,0 @@
-using FluentAssertions;
-using HandlebarsDotNet;
-using Moq;
-using System;
-using WireMock.Handlers;
-using WireMock.Transformers;
-using Xunit;
-
-namespace WireMock.Net.Tests.Transformers
-{
-    public class HandlebarsContextFactoryTests
-    {
-        private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-
-        [Fact]
-        public void Create_WithNullAction_DoesNotInvokeAction()
-        {
-            // Arrange
-            var sut = new HandlebarsContextFactory(_fileSystemHandlerMock.Object, null);
-
-            // Act
-            var result = sut.Create();
-
-            // Assert
-            result.Should().NotBeNull();
-        }
-
-        [Fact]
-        public void Create_WithAction_InvokesAction()
-        {
-            // Arrange
-            int num = 0;
-            Action<IHandlebars, IFileSystemHandler> action = (ctx, fs) =>
-            {
-                ctx.Should().NotBeNull();
-                fs.Should().NotBeNull();
-
-                num++;
-            };
-            var sut = new HandlebarsContextFactory(_fileSystemHandlerMock.Object, action);
-
-            // Act
-            var result = sut.Create();
-
-            // Assert
-            result.Should().NotBeNull();
-
-            // Verify
-            num.Should().Be(1);
-        }
-    }
-}

test/WireMock.Net.Tests/Util/BodyParserTests.cs

@@ -125,28 +125,5 @@ Content-Type: text/html
             Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
             Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
         }
-
-        [Theory]
-        [InlineData("HEAD", false)]
-        [InlineData("GET", false)]
-        [InlineData("PUT", true)]
-        [InlineData("POST", true)]
-        [InlineData("DELETE", false)]
-        [InlineData("TRACE", false)]
-        [InlineData("OPTIONS", true)]
-        [InlineData("CONNECT", false)]
-        [InlineData("PATCH", true)]
-        public void BodyParser_ShouldParseBody_ExpectedResultForKnownMethods(string method, bool resultShouldBe)
-        {
-            Check.That(BodyParser.ShouldParseBody(method)).Equals(resultShouldBe);
-        }
-
-        [Theory]
-        [InlineData("REPORT")]
-        [InlineData("SOME-UNKNOWN-METHOD")]
-        public void BodyParser_ShouldParseBody_DefaultIsTrueForUnknownMethods(string method)
-        {
-            Check.That(BodyParser.ShouldParseBody(method)).IsTrue();
-        }
     }
 }

test/WireMock.Net.Tests/Util/FileHelperTests.cs

@@ -1,6 +1,7 @@
-using FluentAssertions;
+using System;
+using System.IO;
 using Moq;
-using System;
+using NFluent;
 using WireMock.Handlers;
 using WireMock.Util;
 using Xunit;
@@ -10,36 +11,31 @@ namespace WireMock.Net.Tests.Util
     public class FileHelperTests
     {
         [Fact]
-        public void TryReadMappingFileWithRetryAndDelay_WithIFileSystemHandlerOk_ReturnsTrue()
+        public void FileHelper_ReadAllTextWithRetryAndDelay()
         {
             // Assign
             var staticMappingHandlerMock = new Mock<IFileSystemHandler>();
             staticMappingHandlerMock.Setup(m => m.ReadMappingFile(It.IsAny<string>())).Returns("text");
 
             // Act
-            bool result = FileHelper.TryReadMappingFileWithRetryAndDelay(staticMappingHandlerMock.Object, @"c:\temp", out string value);
+            string result = FileHelper.ReadAllTextWithRetryAndDelay(staticMappingHandlerMock.Object, @"c:\temp");
 
             // Assert
-            result.Should().BeTrue();
-            value.Should().Be("text");
+            Check.That(result).Equals("text");
 
             // Verify
             staticMappingHandlerMock.Verify(m => m.ReadMappingFile(@"c:\temp"), Times.Once);
         }
 
         [Fact]
-        public void TryReadMappingFileWithRetryAndDelay_WithIFileSystemHandlerThrows_ReturnsFalse()
+        public void FileHelper_ReadAllTextWithRetryAndDelay_Throws()
         {
             // Assign
             var staticMappingHandlerMock = new Mock<IFileSystemHandler>();
             staticMappingHandlerMock.Setup(m => m.ReadMappingFile(It.IsAny<string>())).Throws<NotSupportedException>();
 
             // Act
-            bool result = FileHelper.TryReadMappingFileWithRetryAndDelay(staticMappingHandlerMock.Object, @"c:\temp", out string value);
-
-            // Assert
-            result.Should().BeFalse();
-            value.Should().BeNull();
+            Check.ThatCode(() => FileHelper.ReadAllTextWithRetryAndDelay(staticMappingHandlerMock.Object, @"c:\temp")).Throws<IOException>();
 
             // Verify
             staticMappingHandlerMock.Verify(m => m.ReadMappingFile(@"c:\temp"), Times.Exactly(3));

test/WireMock.Net.Tests/Util/QueryStringParserTests.cs

@@ -1,224 +0,0 @@
-using FluentAssertions;
-using System.Collections.Generic;
-using WireMock.Util;
-using Xunit;
-
-namespace WireMock.Net.Tests.Util
-{
-    public class QueryStringParserTests
-    {
-        [Fact]
-        public void Parse_WithNullString()
-        {
-            // Assign
-            string query = null;
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Should().Equal(new Dictionary<string, WireMockList<string>>());
-        }
-
-        [Fact]
-        public void Parse_WithEmptyString()
-        {
-            // Assign
-            string query = "";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Should().Equal(new Dictionary<string, WireMockList<string>>());
-        }
-
-        [Fact]
-        public void Parse_WithQuestionMark()
-        {
-            // Assign
-            string query = "?";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Should().Equal(new Dictionary<string, WireMockList<string>>());
-        }
-
-        [Fact]
-        public void Parse_With1Param()
-        {
-            // Assign
-            string query = "?key=bla/blub.xml";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>("bla/blub.xml"));
-        }
-
-        [Fact]
-        public void Parse_With2Params()
-        {
-            // Assign
-            string query = "?x=1&y=2";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(2);
-            result["x"].Should().Equal(new WireMockList<string>("1"));
-            result["y"].Should().Equal(new WireMockList<string>("2"));
-        }
-
-        [Fact]
-        public void Parse_With1ParamNoValue()
-        {
-            // Assign
-            string query = "?empty";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["empty"].Should().Equal(new WireMockList<string>());
-        }
-
-        [Fact]
-        public void Parse_With1ParamNoValueWithEqualSign()
-        {
-            // Assign
-            string query = "?empty=";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["empty"].Should().Equal(new WireMockList<string>());
-        }
-
-        [Fact]
-        public void Parse_With1ParamAndJustAndSign()
-        {
-            // Assign
-            string query = "?key=1&";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>("1"));
-        }
-
-        [Fact]
-        public void Parse_With2ParamsAndWhereOneHasAQuestion()
-        {
-            // Assign
-            string query = "?key=value?&b=c";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(2);
-            result["key"].Should().Equal(new WireMockList<string>("value?"));
-            result["b"].Should().Equal(new WireMockList<string>("c"));
-        }
-
-        [Fact]
-        public void Parse_With1ParamWithEqualSign()
-        {
-            // Assign
-            string query = "?key=value=what";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>("value=what"));
-        }
-
-        [Fact]
-        public void Parse_WithMultipleParamWithSameKeySeparatedBySemiColon()
-        {
-            // Assign
-            string query = "?key=value;key=anotherValue";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>(new[] { "value", "anotherValue" }));
-        }
-
-        [Fact]
-        public void Parse_With1ParamContainingComma()
-        {
-            // Assign
-            string query = "?key=1,2&key=3";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>(new[] { "1", "2", "3" }));
-        }
-
-        [Fact]
-        public void Parse_WithMultipleParamWithSameKey()
-        {
-            // Assign
-            string query = "?key=value&key=anotherValue";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["key"].Should().Equal(new WireMockList<string>(new[] { "value", "anotherValue" }));
-        }
-
-        [Fact]
-        public void Parse_With1ParamContainingSpacesAndEqualSign()
-        {
-            // Assign
-            string query = "?q=SELECT Id from User where username='user@gmail.com'";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(1);
-            result["q"].Should().Equal(new WireMockList<string>("SELECT Id from User where username='user@gmail.com'"));
-        }
-
-        [Fact]
-        public void Parse_WithComplex()
-        {
-            // Assign
-            string query = "?q=energy+edge&rls=com.microsoft:en-au&ie=UTF-8&oe=UTF-8&startIndex=&startPage=1%22";
-
-            // Act
-            var result = QueryStringParser.Parse(query);
-
-            // Assert
-            result.Count.Should().Be(6);
-            result["q"].Should().Equal(new WireMockList<string>("energy+edge"));
-            result["rls"].Should().Equal(new WireMockList<string>("com.microsoft:en-au"));
-            result["ie"].Should().Equal(new WireMockList<string>("UTF-8"));
-            result["oe"].Should().Equal(new WireMockList<string>("UTF-8"));
-            result["startIndex"].Should().Equal(new WireMockList<string>());
-            result["startPage"].Should().Equal(new WireMockList<string>("1%22"));
-        }
-    }
-}

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -13,14 +13,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <SonarQubeTestProject>True</SonarQubeTestProject>
     <SonarQubeExclude>True</SonarQubeExclude>
-
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../../src/WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,10 +26,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.7.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
-    <PackageReference Include="RestEase" Version="1.4.7" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.8" />
+
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MimeKitLite" Version="2.0.7" />
     <PackageReference Include="Moq" Version="4.10.1" />
@@ -52,7 +42,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <!--<PackageReference Include="StrongNamer" Version="0.0.8" />-->
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">