wip

CHANGELOG.md

@@ -1,34 +1,8 @@
-# 1.0.7.0 (19 January 2019)
-- [#244](https://github.com/WireMock-Net/WireMock.Net/pull/244) - Fix BodyAsFile to also allow relative paths [feature] contributed by [StefH](https://github.com/StefH)
-- [#240](https://github.com/WireMock-Net/WireMock.Net/issues/240) - How to submit mappings for multiple request, responses [feature]
-- [#243](https://github.com/WireMock-Net/WireMock.Net/issues/243) - Not able to read response from file [question]
-
-# 1.0.6.1 (10 January 2019)
-- [#247](https://github.com/WireMock-Net/WireMock.Net/pull/247) - Issue 225 improve logging in example for wire mock as windows service contributed by [paulssn](https://github.com/paulssn)
-- [#249](https://github.com/WireMock-Net/WireMock.Net/pull/249) - Fixed "Content-Type multipart/form-data" [bug] contributed by [StefH](https://github.com/StefH)
-- [#225](https://github.com/WireMock-Net/WireMock.Net/issues/225) - Feature: Improve logging in example for WireMock as Windows Service [feature]
-- [#238](https://github.com/WireMock-Net/WireMock.Net/issues/238) - Localhost and free port problem [question]
-- [#245](https://github.com/WireMock-Net/WireMock.Net/issues/245) - Not able to match XML request body using XPathMatcher pattern [question]
-- [#248](https://github.com/WireMock-Net/WireMock.Net/issues/248) - Content-Type multipart/form-data is not seen as byte[] anymore
-
-# 1.0.6 (15 December 2018)
-- [#242](https://github.com/WireMock-Net/WireMock.Net/pull/242) - Post multiple Mappings [feature] contributed by [StefH](https://github.com/StefH)
-- [#237](https://github.com/WireMock-Net/WireMock.Net/issues/237) - Port not released [question]
-- [#239](https://github.com/WireMock-Net/WireMock.Net/issues/239) - Not able to hit the mock server if AllowPartialMapping is not set to true [question]
-
-# 1.0.5 (07 December 2018)
-- [#236](https://github.com/WireMock-Net/WireMock.Net/pull/236) - Add Random Regex (using Fare) [feature] contributed by [StefH](https://github.com/StefH)
-
-# 1.0.4.21 (30 November 2018)
+# 1.0.4.21 (09 November 2018)
 - [#221](https://github.com/WireMock-Net/WireMock.Net/pull/221) - Update dependencies [feature] contributed by [StefH](https://github.com/StefH)
 - [#229](https://github.com/WireMock-Net/WireMock.Net/pull/229) - Fix proxy tests [test] contributed by [StefH](https://github.com/StefH)
 - [#230](https://github.com/WireMock-Net/WireMock.Net/pull/230) - Add HandleBars Random functionality (#219) [feature] contributed by [StefH](https://github.com/StefH)
-- [#231](https://github.com/WireMock-Net/WireMock.Net/pull/231) - Use RandomDataGenerator.Net 1.0.3.0 contributed by [StefH](https://github.com/StefH)
-- [#232](https://github.com/WireMock-Net/WireMock.Net/pull/232) - Add SonarLint checks [feature] contributed by [StefH](https://github.com/StefH)
-- [#233](https://github.com/WireMock-Net/WireMock.Net/pull/233) - RandomDataGenerator.Net 1.0.4 [feature] contributed by [StefH](https://github.com/StefH)
-- [#235](https://github.com/WireMock-Net/WireMock.Net/pull/235) - Check aggregate exception during startup [bug] contributed by [StefH](https://github.com/StefH)
 - [#219](https://github.com/WireMock-Net/WireMock.Net/issues/219) - Feature: random value helper [feature]
-- [#234](https://github.com/WireMock-Net/WireMock.Net/issues/234) - Timeout Exception on VSTS Test Platform (Azure DevOps), with private build agent
 
 # 1.0.4.20 (07 November 2018)
 - [#222](https://github.com/WireMock-Net/WireMock.Net/pull/222) - Codecov contributed by [StefH](https://github.com/StefH)
@@ -184,7 +158,7 @@
 - [#124](https://github.com/WireMock-Net/WireMock.Net/issues/124) - Issue: Unable to get host to listen on ips other than 127.0.0.1 using StandAloneApp
 
 # 1.0.3.15 (05 April 2018)
-- [#117](https://github.com/WireMock-Net/WireMock.Net/pull/117) - Respect start timeout setting and expose exception from server startup contributed by [evanlwj](https://github.com/evanlwj)
+- [#117](https://github.com/WireMock-Net/WireMock.Net/pull/117) - Respect start timeout setting and expose exception from server startup contributed by [msft-eliang](https://github.com/msft-eliang)
 
 # 1.0.3.14 (01 April 2018)
 - [#111](https://github.com/WireMock-Net/WireMock.Net/issues/111) - Question: Adding wiki documentation on how to use WireMock.Net.WebApplication project

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.7</VersionPrefix>
+    <VersionPrefix>1.0.4.20</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.7.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.4.21

README.md

@@ -5,10 +5,10 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
 * Runs in unit tests, as a standalone process, as windows service, as Azure or IIS or as docker
 * Configurable via a fluent DotNet API, JSON files and JSON over HTTP
-* Record/playback of stubs (proxying)
+* Record/playback of stubs
 * Per-request conditional proxying
 * Stateful behaviour simulation
-* Response transformation
+* Configurable response delays
 
 ## Info
 | | |

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

@@ -18,10 +18,6 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="__admin\mappings\array.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="log4net" Version="2.0.8" />
@@ -41,9 +37,6 @@
     <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
-    <None Update="__admin\mappings\MyXmlResponse.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/BodyAsFileExample.json

@@ -1,22 +0,0 @@
-{
-    "Request": {
-        "Path": {
-            "Matchers": [
-                {
-                    "Name": "WildcardMatcher",
-                    "Pattern": "/bodyasfilexmltest",
-                    "IgnoreCase": false
-                }
-            ]
-        },
-        "Methods": [
-            "get"
-        ]
-    },
-    "Response": {
-        "StatusCode": 200,
-        "Headers": {"Content-Type": "application/xml"},
-        "BodyAsFile": "MyXmlResponse.xml",
-        "UseTransformer": false
-    }
-}

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/MyXmlResponse.xml

@@ -1,3 +0,0 @@
-<xml>
-<hello>world</hello>
-</xml>

examples/WireMock.Net.Console.NETCoreApp2/__admin/mappings/array.json

@@ -1,46 +0,0 @@
-[
-  {
-    "Title": "1",
-    "Request": {
-      "Path": {
-        "Matchers": [
-          {
-            "Name": "WildcardMatcher",
-            "Pattern": "/mappings_static_1"
-          }
-        ]
-      },
-      "Methods": [
-        "get"
-      ]
-    },
-    "Response": {
-      "BodyAsJson": { "result": "mappings static_1" },
-      "Headers": {
-        "Content-Type": "application/json"
-      }
-    }
-  },
-  {
-    "Title": "2",
-    "Request": {
-      "Path": {
-        "Matchers": [
-          {
-            "Name": "WildcardMatcher",
-            "Pattern": "/mappings_static_2"
-          }
-        ]
-      },
-      "Methods": [
-        "get"
-      ]
-    },
-    "Response": {
-      "BodyAsJson": { "result": "mappings static_2" },
-      "Headers": {
-        "Content-Type": "application/json"
-      }
-    }
-  }
-]

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

@@ -43,11 +43,5 @@ namespace WireMock.Net.ConsoleApplication
         {
             File.WriteAllText(path, text);
         }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public byte[] ReadResponseBodyAsFile(string path)
-        {
-            return File.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
     }
 }

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

@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Globalization;
 using System.Net;
+using Newtonsoft.Json;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
@@ -39,7 +39,7 @@ namespace WireMock.Net.ConsoleApplication
 
             server.SetBasicAuthentication("a", "b");
 
-            // server.AllowPartialMapping();
+            server.AllowPartialMapping();
 
             server
                 .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
@@ -388,10 +388,11 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(500)
                     .WithBody(requestMessage =>
                     {
-                        return JsonConvert.SerializeObject(new
+                        string returnStr = JsonConvert.SerializeObject(new
                         {
                             Message = "Test error"
                         });
+                        return returnStr;
                     })
                 );
 
@@ -401,43 +402,26 @@ namespace WireMock.Net.ConsoleApplication
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new
                     {
-                        Xeger1 = "{{Xeger \"\\w{4}\\d{5}\"}}",
-                        Xeger2 = "{{Xeger \"\\d{5}\"}}",
-                        TextRegexPostcode = "{{Random Type=\"TextRegex\" Pattern=\"[1-9][0-9]{3}[A-Z]{2}\"}}",
                         Text = "{{Random Type=\"Text\" Min=8 Max=20}}",
                         TextLipsum = "{{Random Type=\"TextLipsum\"}}",
-                        IBAN = "{{Random Type=\"IBAN\" CountryCode=\"NL\"}}",
                         TimeSpan1 = "{{Random Type=\"TimeSpan\" Format=\"c\" IncludeMilliseconds=false}}",
                         TimeSpan2 = "{{Random Type=\"TimeSpan\"}}",
                         DateTime1 = "{{Random Type=\"DateTime\"}}",
                         DateTimeNow = DateTime.Now,
-                        DateTimeNowToString = DateTime.Now.ToString("s", CultureInfo.InvariantCulture),
+                        DateTimeToString = DateTime.Now.ToString("s", CultureInfo.InvariantCulture),
                         Guid1 = "{{Random Type=\"Guid\" Uppercase=false}}",
                         Guid2 = "{{Random Type=\"Guid\"}}",
-                        Boolean = "{{Random Type=\"Boolean\"}}",
-                        Integer = "{{Random Type=\"Integer\" Min=1000 Max=9999}}",
-                        Long = "{{#Random Type=\"Long\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
-                        Double = "{{Random Type=\"Double\" Min=10 Max=99}}",
-                        Float = "{{Random Type=\"Float\" Min=100 Max=999}}",
+                        Integer1 = "{{Random Type=\"Integer\" Min=1000 Max=9999}}",
+                        Integer2 = "{{#Random Type=\"Integer\" Min=10000000 Max=99999999}}{{this}}{{/Random}}",
+                        Double1 = "{{Random Type=\"Double\" Min=10 Max=99}}",
+                        Double2 = "{{Random Type=\"Double\" Min=100 Max=999}}",
                         IP4Address = "{{Random Type=\"IPv4Address\" Min=\"10.2.3.4\"}}",
                         IP6Address = "{{Random Type=\"IPv6Address\"}}",
-                        MACAddress = "{{Random Type=\"MACAddress\" Separator=\"-\"}}",
-                        StringListValue = "{{Random Type=\"StringList\" Values=[\"a\", \"b\", \"c\"]}}"
+                        MACAddress = "{{Random Type=\"MACAddress\" Separator=\"-\"}}"
                     })
                     .WithTransformer()
                 );
 
-            server
-                .Given(Request.Create()
-                    .UsingPost()
-                    .WithPath("/xpathsoap")
-                    .WithBody(new XPathMatcher("//*[local-name() = 'getMyData']"))
-                )
-                .RespondWith(Response.Create()
-                    .WithHeader("Content-Type", "application/xml")
-                    .WithBody("<xml>ok</xml>")
-                );
-
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();

examples/WireMock.Net.Service/Program.cs

@@ -1,8 +1,6 @@
-using log4net.Config;
-using System;
-using System.IO;
+using System;
 using System.ServiceProcess;
-using WireMock.Net.Service;
+using WireMock.Logging;
 using WireMock.Net.StandAlone;
 using WireMock.Server;
 using WireMock.Settings;
@@ -23,7 +21,7 @@ namespace Wiremock.Net.Service
 
             protected override void OnStart(string[] args)
             {
-                Start();
+                Start(new WireMockNullLogger());
             }
 
             protected override void OnStop()
@@ -37,11 +35,6 @@ namespace Wiremock.Net.Service
 
         static void Main(string[] args)
         {
-            //Setting the current directory explicitly is required if the application is running as Windows Service, 
-            //as the current directory of a Windows Service is %WinDir%\System32 per default.
-            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
-            XmlConfigurator.ConfigureAndWatch(new FileInfo("log4net.config"));
-
             // running as service
             if (!Environment.UserInteractive)
             {
@@ -53,7 +46,7 @@ namespace Wiremock.Net.Service
             else
             {
                 // running as console app
-                Start();
+                Start(new WireMockConsoleLogger());
 
                 Console.WriteLine("Press any key to stop...");
                 Console.ReadKey(true);
@@ -62,14 +55,14 @@ namespace Wiremock.Net.Service
             }
         }
 
-        private static void Start()
+        private static void Start(IWireMockLogger logger)
         {
             _server = StandAloneApp.Start(new FluentMockServerSettings
             {
                 Urls = new[] { "http://*:9091/" },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
-                Logger = new WireMockLog4NetLogger()
+                Logger = logger
             });
         }
 

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -35,9 +35,6 @@
     <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -99,13 +96,9 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WireMockLog4NetLogger.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Service-Start.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

examples/WireMock.Net.Service/WireMockLog4NetLogger.cs

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

examples/WireMock.Net.Service/log4net.config

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log.txt" />
-      <appendToFile value="true" />
-      <rollingStyle value="Size" />
-      <maxSizeRollBackups value="10" />
-      <maximumFileSize value="10000KB" />
-      <staticLogFileName value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender" >
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-      <appender-ref ref="RollingLogFileAppender" />
-      <!--<appender-ref ref="EventLogAppender" /> --> <!-- comment in if needed -->
-    </root>
-  </log4net>
-</configuration>

examples/WireMock.Net.Service/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />

examples/WireMock.Net.WebApplication/Connected Services/Application Insights/ConnectedService.json

@@ -1,7 +0,0 @@
-{
-  "ProviderId": "Microsoft.ApplicationInsights.ConnectedService.ConnectedServiceProvider",
-  "Version": "8.14.20131.1",
-  "GettingStartedDocument": {
-    "Uri": "https://go.microsoft.com/fwlink/?LinkID=798432"
-  }
-}

examples/WireMock.Net.WebApplication/Program.cs

@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Configuration;
+using System;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System;
 using WireMock.Settings;
 
 namespace WireMock.Net.WebApplication
@@ -21,7 +21,7 @@ namespace WireMock.Net.WebApplication
             serviceProvider.GetService<App>().Run();
         }
 
-        private static void ConfigureServices(IServiceCollection services)
+        private static void ConfigureServices(IServiceCollection serviceCollection)
         {
             // Build configuration
             var configuration = new ConfigurationBuilder()
@@ -30,30 +30,28 @@ namespace WireMock.Net.WebApplication
                 .AddEnvironmentVariables() // <-- this is needed to to override settings via the Azure Portal App Settings
                 .Build();
 
-            // Add LoggerFactory and Logger
+            // Add LoggerFactory
             var factory = new LoggerFactory();
-            services.AddSingleton(factory
+            serviceCollection.AddSingleton(factory
                 .AddConsole(configuration.GetSection("Logging"))
                 .AddDebug()
                 .AddAzureWebAppDiagnostics()
             );
-            services.AddSingleton(factory.CreateLogger("WireMock.Net Logger"));
 
-            // Add ApplicationInsights
-            services.AddApplicationInsightsTelemetry();
+            serviceCollection.AddSingleton(factory.CreateLogger("WireMock.Net Logger"));
 
             // Add access to generic IConfigurationRoot
-            services.AddSingleton(configuration);
+            serviceCollection.AddSingleton(configuration);
 
             // Add access to IFluentMockServerSettings
             var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
-            services.AddSingleton<IFluentMockServerSettings>(settings);
+            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
 
             // Add services
-            services.AddTransient<IWireMockService, WireMockService>();
+            serviceCollection.AddTransient<IWireMockService, WireMockService>();
 
             // Add app
-            services.AddTransient<App>();
+            serviceCollection.AddTransient<App>();
         }
     }
 }

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

@@ -16,8 +16,7 @@
       "commandName": "IISExpress",
       "launchUrl": "__admin/settings",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ApplicationInsights:InstrumentationKey": "..."
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "WireMock.Net.WebApplication": {
@@ -25,16 +24,14 @@
       "launchBrowser": true,
       "launchUrl": "__admin/settings",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "ApplicationInsights:InstrumentationKey": "..."
+        "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:56514/"
     },
     "IIS": {
       "commandName": "IIS",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "development",
-        "ApplicationInsights:InstrumentationKey": "..."
+        "ASPNETCORE_ENVIRONMENT": "development"
       }
     }
   }

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

@@ -1,19 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <!--<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>-->
+    <TargetFrameworks>netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
     <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
     <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
     <UserSecretsId>efcf4a18-fd7c-4622-825d-336d65290599</UserSecretsId>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.5" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,8 +32,4 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services" />
-  </ItemGroup>
-
 </Project>

examples/WireMock.Net.WebApplication/WireMockService.cs

@@ -44,10 +44,10 @@ namespace WireMock.Net.WebApplication
                 _logger.LogError(formatString, args);
             }
 
-            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
             {
                 string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-                _logger.LogDebug("Admin[{0}] {1}", isAdminRequest, message);
+                _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
             }
         }
 

examples/WireMock.Net.WebApplication/appsettings.json

@@ -1,4 +1,4 @@
-{
+{
   "Logging": {
     "IncludeScopes": false,
     "Debug": {
@@ -16,8 +16,5 @@
     "AdminUsername": "a",
     "AdminPassword": "b",
     "StartAdminInterface": true
-  },
-  "ApplicationInsights": {
-    "InstrumentationKey": ""
   }
 }

src/WireMock.Net.StandAlone/CommandLineArguments.cs

@@ -0,0 +1,32 @@
+using CommandLineParser.Arguments;
+
+namespace WireMock.Net.StandAlone
+{
+    public class CommandLineArguments
+    {
+        [ValueArgument(typeof(bool), "StartAdminInterface", DefaultValue = true, Description = "Start the AdminInterface")]
+        public bool StartAdminInterface { get; set; }
+
+        [ValueArgument(typeof(bool), "ReadStaticMappings", DefaultValue = false, Description = "Read StaticMappings")]
+        public bool ReadStaticMappings { get; set; }
+
+        [ValueArgument(typeof(bool), 'w', "WatchStaticMappings", DefaultValue = false, Description = "Watch the static mapping files + folder for changes when running.")]
+        public bool WatchStaticMappings { get; set; }
+
+        [ValueArgument(typeof(bool), 'm', "AllowPartialMapping", DefaultValue = false, Description = "Allow PartialMapping")]
+        public bool AllowPartialMapping { get; set; }
+
+        [ValueArgument(typeof(string), 'u', "AdminUsername", Description = "The username needed for __admin access.")]
+        public string AdminUsername { get; set; }
+
+        [ValueArgument(typeof(string), 'p', "AdminPassword", Description = "The password needed for __admin access.")]
+        public string AdminPassword { get; set; }
+
+
+        [BoundedValueArgument(typeof(int), 'o', "MaxRequestLogCount", MinValue = 0, Description = "The Maximum number of RequestLogs to keep")]
+        public int MaxRequestLogCount { get; set; }
+
+        [BoundedValueArgument(typeof(int), 'x', "RequestLogExpirationDuration", MinValue = 0, Description = "The RequestLog Expiration Duration in hours")]
+        public int RequestLogExpirationDuration { get; set; }
+    }
+}

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -38,8 +38,9 @@ namespace WireMock.Net.StandAlone
         {
             Check.NotNull(args, nameof(args));
 
-            var parser = new SimpleCommandLineParser();
-            parser.Parse(args);
+            var parser = new CommandLineParser.CommandLineParser();
+            var p = new CommandLineArguments();
+            parser.ExtractArgumentAttributes(p);
 
             var settings = new FluentMockServerSettings
             {

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

@@ -41,6 +41,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="SimpleCommandLineParser.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineArgumentsParser" Version="3.0.19" />
     <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -58,14 +58,6 @@ namespace WireMock.Client
         [Header("Content-Type", "application/json")]
         Task<StatusModel> PostMappingAsync([Body] MappingModel mapping);
 
-        /// <summary>
-        /// Add new mappings.
-        /// </summary>
-        /// <param name="mappings">MappingModels</param>
-        [Post("__admin/mappings")]
-        [Header("Content-Type", "application/json")]
-        Task<StatusModel> PostMappingsAsync([Body] IList<MappingModel> mappings);
-
         /// <summary>
         /// Delete all mappings.
         /// </summary>

src/WireMock.Net/Exceptions/WireMockException.cs

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

src/WireMock.Net/Handlers/IFileSystemHandler.cs

@@ -10,7 +10,7 @@ namespace WireMock.Handlers
         /// <summary>
         /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
         /// </summary>
-        /// <returns>The folder name.</returns>
+        /// <returns>The foldername.</returns>
         string GetMappingFolder();
 
         /// <summary>
@@ -37,7 +37,6 @@ namespace WireMock.Handlers
         /// Read a static mapping file as text.
         /// </summary>
         /// <param name="path">The path (folder + filename with .json extension).</param>
-        /// <returns>The file content as text.</returns>
         string ReadMappingFile(string path);
 
         /// <summary>
@@ -46,12 +45,5 @@ namespace WireMock.Handlers
         /// <param name="path">The path (folder + filename with .json extension).</param>
         /// <param name="text">The text.</param>
         void WriteMappingFile(string path, string text);
-
-        /// <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 bytes.</returns>
-        byte[] ReadResponseBodyAsFile(string path);
     }
 }

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -1,6 +1,6 @@
-using JetBrains.Annotations;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
+using JetBrains.Annotations;
 using WireMock.Validation;
 
 namespace WireMock.Handlers
@@ -58,15 +58,5 @@ namespace WireMock.Handlers
 
             File.WriteAllText(path, text);
         }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public byte[] ReadResponseBodyAsFile(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.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
     }
 }

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -8,7 +8,6 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using WireMock.Handlers;
 using WireMock.HttpsCertificate;
 using WireMock.Logging;
 using WireMock.Owin.Mappers;
@@ -59,8 +58,7 @@ namespace WireMock.Owin
             _host = new WebHostBuilder()
                 .ConfigureServices(services =>
                 {
-                    services.AddSingleton(_options.FileSystemHandler);
-                    services.AddSingleton(_options);
+                    services.AddSingleton<IWireMockMiddlewareOptions>(_options);
                     services.AddSingleton<IMappingMatcher, MappingMatcher>();
                     services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                     services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
-using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 #if !USE_ASPNETCORE
@@ -35,7 +34,5 @@ namespace WireMock.Owin
         Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }
 
         Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
-
-        IFileSystemHandler FileSystemHandler { get; set; }
     }
 }

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

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-using WireMock.Handlers;
 using WireMock.Http;
 using WireMock.Util;
-using WireMock.Validation;
 #if !USE_ASPNETCORE
 using IResponse = Microsoft.Owin.IOwinResponse;
 #else
@@ -22,7 +21,6 @@ namespace WireMock.Owin.Mappers
     /// </summary>
     public class OwinResponseMapper : IOwinResponseMapper
     {
-        private readonly IFileSystemHandler _fileSystemHandler;
         private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
 
         // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
@@ -34,17 +32,6 @@ namespace WireMock.Owin.Mappers
             { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() }
         };
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="fileSystemHandler">The IFileSystemHandler.</param>
-        public OwinResponseMapper(IFileSystemHandler fileSystemHandler)
-        {
-            Check.NotNull(fileSystemHandler, nameof(fileSystemHandler));
-
-            _fileSystemHandler = fileSystemHandler;
-        }
-
         /// <inheritdoc cref="IOwinResponseMapper.MapAsync"/>
         public async Task MapAsync(ResponseMessage responseMessage, IResponse response)
         {
@@ -73,7 +60,7 @@ namespace WireMock.Owin.Mappers
                     break;
 
                 case BodyType.File:
-                    bytes = _fileSystemHandler.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
+                    bytes = File.ReadAllBytes(responseMessage.BodyData.BodyAsFile);
                     break;
             }
 

src/WireMock.Net/Owin/OwinSelfHost.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Owin.Mappers;
 using WireMock.Util;
@@ -76,7 +75,7 @@ namespace WireMock.Owin
             try
             {
                 var requestMapper = new OwinRequestMapper();
-                var responseMapper = new OwinResponseMapper(_options.FileSystemHandler);
+                var responseMapper = new OwinResponseMapper();
                 var matcher = new MappingMatcher(_options);
 
                 Action<IAppBuilder> startup = app =>

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
-using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
@@ -36,8 +35,5 @@ namespace WireMock.Owin
         public Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }
 
         public Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
-
-        /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
-        public IFileSystemHandler FileSystemHandler { get; set; }
     }
 }

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -1,13 +1,13 @@
-using JetBrains.Annotations;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using WireMock.Handlers;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Settings;
 using WireMock.Transformers;
@@ -21,7 +21,6 @@ namespace WireMock.ResponseBuilders
     /// </summary>
     public class Response : IResponseBuilder
     {
-        private readonly IFileSystemHandler _fileSystemHandler = new LocalFileSystemHandler();
         private HttpClient _httpClientForProxy;
 
         /// <summary>
@@ -227,7 +226,7 @@ namespace WireMock.ResponseBuilders
             if (cache)
             {
                 ResponseMessage.BodyData.DetectedBodyType = BodyType.Bytes;
-                ResponseMessage.BodyData.BodyAsBytes = _fileSystemHandler.ReadResponseBodyAsFile(filename);
+                ResponseMessage.BodyData.BodyAsBytes = File.ReadAllBytes(filename);
             }
             else
             {
@@ -256,7 +255,7 @@ namespace WireMock.ResponseBuilders
             {
                 case BodyDestinationFormat.Bytes:
                     ResponseMessage.BodyData.DetectedBodyType = BodyType.Bytes;
-                    ResponseMessage.BodyData.BodyAsBytes = encoding.GetBytes(body);
+                    ResponseMessage.BodyData.BodyAsBytes= encoding.GetBytes(body);
                     break;
 
                 case BodyDestinationFormat.Json:
@@ -286,7 +285,7 @@ namespace WireMock.ResponseBuilders
                 BodyAsJson = body,
                 BodyAsJsonIndented = indented
             };
-
+            
             return this;
         }
 

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -102,44 +102,49 @@ namespace WireMock.Serialization
                 mappingModel.Response.Headers = Map(response.ResponseMessage.Headers);
                 mappingModel.Response.UseTransformer = response.UseTransformer;
 
-                if (response.ResponseMessage.BodyData != null)
-                {
-                    switch (response.ResponseMessage.BodyData?.DetectedBodyType)
-                    {
-                        case BodyType.String:
-                            mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
-                            break;
-
-                        case BodyType.Json:
-                            mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
-                            mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
-                            break;
-
-                        case BodyType.Bytes:
-                            mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyData.BodyAsBytes;
-                            break;
-
-                        case BodyType.File:
-                            mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyData.BodyAsFile;
-                            mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyData.BodyAsFileIsCached;
-                            break;
-                    }
-
-                    if (response.ResponseMessage.BodyData.Encoding != null && response.ResponseMessage.BodyData.Encoding.WebName != "utf-8")
-                    {
-                        mappingModel.Response.BodyEncoding = new EncodingModel
-                        {
-                            EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
-                            CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
-                            WebName = response.ResponseMessage.BodyData.Encoding.WebName
-                        };
-                    }
-                }
+                MapBodyData(response, mappingModel);
             }
 
             return mappingModel;
         }
 
+        private static void MapBodyData(Response response, MappingModel mappingModel)
+        {
+            if (response.ResponseMessage.BodyData != null)
+            {
+                switch (response.ResponseMessage.BodyData?.DetectedBodyType)
+                {
+                    case BodyType.String:
+                        mappingModel.Response.Body = response.ResponseMessage.BodyData.BodyAsString;
+                        break;
+
+                    case BodyType.Json:
+                        mappingModel.Response.BodyAsJson = response.ResponseMessage.BodyData.BodyAsJson;
+                        mappingModel.Response.BodyAsJsonIndented = response.ResponseMessage.BodyData.BodyAsJsonIndented;
+                        break;
+
+                    case BodyType.Bytes:
+                        mappingModel.Response.BodyAsBytes = response.ResponseMessage.BodyData.BodyAsBytes;
+                        break;
+
+                    case BodyType.File:
+                        mappingModel.Response.BodyAsFile = response.ResponseMessage.BodyData.BodyAsFile;
+                        mappingModel.Response.BodyAsFileIsCached = response.ResponseMessage.BodyData.BodyAsFileIsCached;
+                        break;
+                }
+
+                if (response.ResponseMessage.BodyData.Encoding != null && response.ResponseMessage.BodyData.Encoding.WebName != "utf-8")
+                {
+                    mappingModel.Response.BodyEncoding = new EncodingModel
+                    {
+                        EncodingName = response.ResponseMessage.BodyData.Encoding.EncodingName,
+                        CodePage = response.ResponseMessage.BodyData.Encoding.CodePage,
+                        WebName = response.ResponseMessage.BodyData.Encoding.WebName
+                    };
+                }
+            }
+        }
+
         private static IDictionary<string, object> Map(IDictionary<string, WireMockList<string>> dictionary)
         {
             if (dictionary == null || dictionary.Count == 0)

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

@@ -1,6 +1,3 @@
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -8,6 +5,9 @@ using System.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
@@ -206,17 +206,14 @@ namespace WireMock.Server
 
             string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
 
-            var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(_fileSystemHandler.ReadMappingFile(path)));
-            foreach (var mappingModel in mappingModels)
+            MappingModel mappingModel = JsonConvert.DeserializeObject<MappingModel>(_fileSystemHandler.ReadMappingFile(path));
+            if (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);
             }
         }
         #endregion
@@ -415,21 +412,11 @@ namespace WireMock.Server
 
         private ResponseMessage MappingsPost(RequestMessage requestMessage)
         {
+            Guid? guid;
             try
             {
-                var mappingModels = DeserializeRequestMessageToArray<MappingModel>(requestMessage);
-                if (mappingModels.Length == 1)
-                {
-                    Guid? guid = DeserializeAndAddOrUpdateMapping(mappingModels[0]);
-                    return ResponseMessageBuilder.Create("Mapping added", 201, guid);
-                }
-
-                foreach (var mappingModel in mappingModels)
-                {
-                    DeserializeAndAddOrUpdateMapping(mappingModel);
-                }
-
-                return ResponseMessageBuilder.Create("Mappings added", 201);
+                var mappingModel = DeserializeObject<MappingModel>(requestMessage);
+                guid = DeserializeAndAddOrUpdateMapping(mappingModel);
             }
             catch (ArgumentException a)
             {
@@ -441,6 +428,8 @@ namespace WireMock.Server
                 _logger.Error("HttpStatusCode set to 500 {0}", e);
                 return ResponseMessageBuilder.Create(e.ToString(), 500);
             }
+
+            return ResponseMessageBuilder.Create("Mapping added", 201, guid);
         }
 
         private Guid? DeserializeAndAddOrUpdateMapping(MappingModel mappingModel, Guid? guid = null, string path = null)
@@ -804,28 +793,5 @@ namespace WireMock.Server
 
             return default(T);
         }
-
-        private T[] DeserializeRequestMessageToArray<T>(RequestMessage requestMessage)
-        {
-            if (requestMessage?.BodyData?.DetectedBodyType == BodyType.Json)
-            {
-                var bodyAsJson = requestMessage.BodyData.BodyAsJson;
-
-                return DeserializeObjectToArray<T>(bodyAsJson);
-            }
-
-            return default(T[]);
-        }
-
-        private T[] DeserializeObjectToArray<T>(object value)
-        {
-            if (value is JArray jArray)
-            {
-                return jArray.ToObject<T[]>();
-            }
-
-            var singleResult = ((JObject)value).ToObject<T>();
-            return new[] { singleResult };
-        }
     }
 }

src/WireMock.Net/Server/FluentMockServer.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using Newtonsoft.Json;
-using WireMock.Exceptions;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
@@ -203,7 +202,6 @@ namespace WireMock.Server
                 Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
             }
 
-            _options.FileSystemHandler = settings.FileSystemHandler;
             _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
             _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
             _options.Logger = _logger;
@@ -215,27 +213,21 @@ namespace WireMock.Server
 #endif
             Ports = _httpServer.Ports;
 
-            var startTask = _httpServer.StartAsync();
+            _httpServer.StartAsync();
 
             using (var ctsStartTimeout = new CancellationTokenSource(settings.StartTimeout))
             {
                 while (!_httpServer.IsStarted)
                 {
-                    // Throw exception if service start fails
+                    // Throw out exception if service start fails
                     if (_httpServer.RunningException != null)
                     {
-                        throw new WireMockException($"Service start failed with error: {_httpServer.RunningException.Message}", _httpServer.RunningException);
+                        throw new Exception($"Service start failed with error: {_httpServer.RunningException.Message}", _httpServer.RunningException);
                     }
 
+                    // Respect start timeout setting by throwing TimeoutException
                     if (ctsStartTimeout.IsCancellationRequested)
                     {
-                        // In case of an aggregate exception, throw the exception.
-                        if (startTask.Exception != null)
-                        {
-                            throw new WireMockException($"Service start failed with error: {startTask.Exception.Message}", startTask.Exception);
-                        }
-
-                        // Else throw TimeoutException
                         throw new TimeoutException($"Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}");
                     }
 

src/WireMock.Net/Transformers/HandleBarsHelpers.cs

@@ -13,8 +13,6 @@ namespace WireMock.Transformers
             HandleBarsLinq.Register(handlebarsContext);
 
             HandleBarsRandom.Register(handlebarsContext);
-
-            HandleBarsXeger.Register(handlebarsContext);
         }
     }
 }

src/WireMock.Net/Transformers/HandleBarsXeger.cs

@@ -1,39 +0,0 @@
-using System;
-using Fare;
-using HandlebarsDotNet;
-using WireMock.Validation;
-
-namespace WireMock.Transformers
-{
-    internal static class HandleBarsXeger
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Xeger", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("Xeger", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndGenerate(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string pattern:
-                    return new Xeger(pattern).Generate();
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars Xeger.");
-        }
-    }
-}

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -120,34 +120,23 @@ namespace WireMock.Transformers
                 string transformedString = templateForStringValue(template);
                 if (!string.Equals(stringValue, transformedString))
                 {
-                    ReplaceNodeValue(node, transformedString);
+                    JToken value;
+                    try
+                    {
+                        // Try to convert this string into a real JsonObject
+                        value = JToken.Parse(transformedString);
+                    }
+                    catch (JsonException)
+                    {
+                        // Ignore JsonException and just convert to JToken
+                        value = transformedString;
+                    }
+
+                    node.Replace(value);
                 }
             }
         }
 
-        private static void ReplaceNodeValue(JToken node, string stringValue)
-        {
-            if (bool.TryParse(stringValue, out bool valueAsBoolean))
-            {
-                node.Replace(valueAsBoolean);
-                return;
-            }
-
-            JToken value;
-            try
-            {
-                // Try to convert this string into a JsonObject
-                value = JToken.Parse(stringValue);
-            }
-            catch (JsonException)
-            {
-                // Ignore JsonException and just keep string value and convert to JToken
-                value = stringValue;
-            }
-
-            node.Replace(value);
-        }
-
         private static void TransformBodyAsString(object template, ResponseMessage original, ResponseMessage responseMessage)
         {
             var templateBody = HandlebarsContext.Compile(original.BodyData.BodyAsString);

src/WireMock.Net/Util/BodyParser.cs

@@ -1,11 +1,11 @@
-using JetBrains.Annotations;
-using MimeKit;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+using MimeKit;
+using Newtonsoft.Json;
 using WireMock.Matchers;
 using WireMock.Validation;
 
@@ -28,10 +28,6 @@ namespace WireMock.Util
         */
         private static readonly string[] AllowedBodyParseMethods = { "PUT", "POST", "OPTIONS", "PATCH" };
 
-        private static readonly IStringMatcher[] MultipartContentTypesMatchers = {
-            new WildcardMatcher("multipart/*", true)
-        };
-
         private static readonly IStringMatcher[] JsonContentTypesMatchers = {
             new WildcardMatcher("application/json", true),
             new WildcardMatcher("application/vnd.*+json", true)
@@ -72,11 +68,6 @@ namespace WireMock.Util
                 return BodyType.Json;
             }
 
-            if (MultipartContentTypesMatchers.Any(matcher => MatchScores.IsPerfect(matcher.IsMatch(contentType.MimeType))))
-            {
-                return BodyType.MultiPart;
-            }
-
             return BodyType.Bytes;
         }
 
@@ -91,12 +82,6 @@ namespace WireMock.Util
                 DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(contentType)
             };
 
-            // In case of MultiPart: never try to read as String but keep as-is
-            if (data.DetectedBodyTypeFromContentType == BodyType.MultiPart)
-            {
-                return data;
-            }
-
             // Try to get the body as String
             try
             {

src/WireMock.Net/Util/BodyType.cs

@@ -28,11 +28,6 @@
         /// <summary>
         /// Body is a File
         /// </summary>
-        File,
-
-        /// <summary>
-        /// Body is a MultiPart
-        /// </summary>
-        MultiPart
+        File
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -58,7 +58,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.9" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.7" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

test/WireMock.Net.Tests/FluentMockServerAdminRestClientTests.cs

@@ -1,9 +1,9 @@
-using NFluent;
-using RestEase;
-using System.Linq;
+using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using NFluent;
+using RestEase;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Settings;
 using WireMock.Client;
@@ -19,7 +19,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_GetSettingsAsync()
         {
-            // Arrange
+            // Assign
             var server = FluentMockServer.StartWithAdminInterface();
             var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
 
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_PostSettingsAsync()
         {
-            // Arrange
+            // Assign
             var server = FluentMockServer.StartWithAdminInterface();
             var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
 
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_PutSettingsAsync()
         {
-            // Arrange
+            // Assign
             var server = FluentMockServer.StartWithAdminInterface();
             var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
 
@@ -57,15 +57,22 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_PostMappingAsync()
         {
-            // Arrange
+            // Assign
             var server = FluentMockServer.StartWithAdminInterface();
             var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
 
             // Act
             var model = new MappingModel
             {
-                Request = new RequestModel { Path = "/1" },
-                Response = new ResponseModel { Body = "txt", StatusCode = 200 },
+                Request = new RequestModel
+                {
+                    Path = "/1"
+                },
+                Response = new ResponseModel
+                {
+                    Body = "txt",
+                    StatusCode = 200
+                },
                 Priority = 500,
                 Title = "test"
             };
@@ -83,41 +90,10 @@ namespace WireMock.Net.Tests
             server.Stop();
         }
 
-        [Fact]
-        public async Task IFluentMockServerAdmin_PostMappingsAsync()
-        {
-            // Arrange
-            var server = FluentMockServer.StartWithAdminInterface();
-            var api = RestClient.For<IFluentMockServerAdmin>(server.Urls[0]);
-
-            // Act
-            var model1 = new MappingModel
-            {
-                Request = new RequestModel { Path = "/1" },
-                Response = new ResponseModel { Body = "txt 1" },
-                Title = "test 1"
-            };
-            var model2 = new MappingModel
-            {
-                Request = new RequestModel { Path = "/2" },
-                Response = new ResponseModel { Body = "txt 2" },
-                Title = "test 2"
-            };
-            var result = await api.PostMappingsAsync(new[] { model1, model2 });
-
-            // Assert
-            Check.That(result).IsNotNull();
-            Check.That(result.Status).IsNotNull();
-            Check.That(result.Guid).IsNull();
-            Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2);
-
-            server.Stop();
-        }
-
         [Fact]
         public async Task IFluentMockServerAdmin_FindRequestsAsync()
         {
-            // Arrange
+            // given
             var server = FluentMockServer.Start(new FluentMockServerSettings
             {
                 StartAdminInterface = true,
@@ -127,10 +103,10 @@ namespace WireMock.Net.Tests
             await new HttpClient().GetAsync(serverUrl + "/foo");
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
-            // Act
+            // when
             var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } });
 
-            // Assert
+            // then
             Check.That(requests).HasSize(1);
             var requestLogged = requests.First();
             Check.That(requestLogged.Request.Method).IsEqualTo("GET");
@@ -141,7 +117,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_GetRequestsAsync()
         {
-            // Arrange
+            // given
             var server = FluentMockServer.Start(new FluentMockServerSettings
             {
                 StartAdminInterface = true,
@@ -151,10 +127,10 @@ namespace WireMock.Net.Tests
             await new HttpClient().GetAsync(serverUrl + "/foo");
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
-            // Act
+            // when
             var requests = await api.GetRequestsAsync();
 
-            // Assert
+            // then
             Check.That(requests).HasSize(1);
             var requestLogged = requests.First();
             Check.That(requestLogged.Request.Method).IsEqualTo("GET");
@@ -165,7 +141,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_GetRequestsAsync_JsonApi()
         {
-            // Arrange
+            // given
             var server = FluentMockServer.Start(new FluentMockServerSettings
             {
                 StartAdminInterface = true,
@@ -183,14 +159,13 @@ namespace WireMock.Net.Tests
             request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
 
             var response = await new HttpClient().SendAsync(request);
-            Check.That(response).IsNotNull();
 
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
-            // Act
+            // when
             var requests = await api.GetRequestsAsync();
 
-            // Assert
+            // then
             Check.That(requests).HasSize(1);
             var requestLogged = requests.First();
             Check.That(requestLogged.Request.Method).IsEqualTo("POST");
@@ -201,7 +176,7 @@ namespace WireMock.Net.Tests
         [Fact]
         public async Task IFluentMockServerAdmin_GetRequestsAsync_Json()
         {
-            // Arrange
+            // given
             var server = FluentMockServer.Start(new FluentMockServerSettings
             {
                 StartAdminInterface = true,
@@ -218,14 +193,13 @@ namespace WireMock.Net.Tests
             request.Content = new StringContent(data);
             request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(jsonApiContentType);
             var response = await new HttpClient().SendAsync(request);
-            Check.That(response).IsNotNull();
 
             var api = RestClient.For<IFluentMockServerAdmin>(serverUrl);
 
-            // Act
+            // when
             var requests = await api.GetRequestsAsync();
 
-            // Assert
+            // then
             Check.That(requests).HasSize(1);
             var requestLogged = requests.First();
             Check.That(requestLogged.Request.Method).IsEqualTo("POST");

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

@@ -46,7 +46,7 @@ namespace WireMock.Net.Tests
             string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings");
             server.ReadStaticMappings(folder);
 
-            Check.That(server.Mappings).HasSize(5);
+            Check.That(server.Mappings).HasSize(3);
 
             // Act
             server.ResetMappings();
@@ -92,8 +92,8 @@ namespace WireMock.Net.Tests
 
             var server = FluentMockServer.Start();
 
-            string path = Path.Combine(GetCurrentFolder(), "__admin", "mappings", "documentdb_root.json");
-            server.ReadStaticMappingAndAddOrUpdate(path);
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", "documentdb_root.json");
+            server.ReadStaticMappingAndAddOrUpdate(folder);
 
             var mappings = server.Mappings.ToArray();
             Check.That(mappings).HasSize(1);
@@ -110,8 +110,8 @@ namespace WireMock.Net.Tests
             string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
 
             var server = FluentMockServer.Start();
-            string path = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
-            server.ReadStaticMappingAndAddOrUpdate(path);
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
+            server.ReadStaticMappingAndAddOrUpdate(folder);
 
             var mappings = server.Mappings.ToArray();
             Check.That(mappings).HasSize(1);
@@ -122,25 +122,13 @@ namespace WireMock.Net.Tests
             Check.That(mappings.First().Title).IsNullOrEmpty();
         }
 
-        [Fact]
-        public void FluentMockServer_Admin_ReadStaticMapping_WithArray()
-        {
-            var server = FluentMockServer.Start();
-
-            string path = Path.Combine(GetCurrentFolder(), "__admin", "mappings", "array.json");
-            server.ReadStaticMappingAndAddOrUpdate(path);
-
-            var mappings = server.Mappings.ToArray();
-            Check.That(mappings).HasSize(2);
-        }
-
         [Fact]
         public void FluentMockServer_Admin_ReadStaticMapping_WithResponseBodyFromFile()
         {
             string guid = "00000002-ee28-4f29-ae63-1ac9b0802d87";
 
-            string path = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
-            string json = File.ReadAllText(path);
+            string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings", guid + ".json");
+            string json = File.ReadAllText(folder);
 
             string responseBodyFilePath = Path.Combine(GetCurrentFolder(), "responsebody.json");
 
@@ -148,10 +136,10 @@ namespace WireMock.Net.Tests
             jsonObj["Response"]["BodyAsFile"] = responseBodyFilePath;
 
             string output = JsonConvert.SerializeObject(jsonObj, Formatting.Indented);
-            File.WriteAllText(path, output);
+            File.WriteAllText(folder, output);
 
             var server = FluentMockServer.Start();
-            server.ReadStaticMappingAndAddOrUpdate(path);
+            server.ReadStaticMappingAndAddOrUpdate(folder);
 
             var mappings = server.Mappings.ToArray();
             Check.That(mappings).HasSize(1);
@@ -214,7 +202,7 @@ namespace WireMock.Net.Tests
             server.ReadStaticMappings(folder);
 
             var mappings = server.Mappings.ToArray();
-            Check.That(mappings).HasSize(5);
+            Check.That(mappings).HasSize(3);
         }
 
         [Fact]

test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs

@@ -33,12 +33,5 @@ namespace WireMock.Net.Tests.Handlers
             // Act
             Check.ThatCode(() => _sut.WriteMappingFile(null, null)).Throws<ArgumentNullException>();
         }
-
-        [Fact]
-        public void LocalFileSystemHandler_ReadResponseBodyAsFile_Throws()
-        {
-            // Act
-            Check.ThatCode(() => _sut.ReadResponseBodyAsFile(null)).Throws<ArgumentNullException>();
-        }
     }
 }

test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs

@@ -4,7 +4,6 @@ using Xunit;
 using Moq;
 using System.Threading.Tasks;
 using System.Threading;
-using WireMock.Handlers;
 using WireMock.Owin.Mappers;
 using WireMock.Util;
 #if NET452
@@ -27,7 +26,6 @@ namespace WireMock.Net.Tests.Owin.Mappers
         private readonly Mock<IResponse> _responseMock;
         private readonly Mock<Stream> _stream;
         private readonly Mock<IHeaderDictionary> _headers;
-        private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
 
         public OwinResponseMapperTests()
         {
@@ -48,23 +46,20 @@ namespace WireMock.Net.Tests.Owin.Mappers
             _responseMock.SetupGet(r => r.Body).Returns(_stream.Object);
             _responseMock.SetupGet(r => r.Headers).Returns(_headers.Object);
 
-            _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-            _fileSystemHandlerMock.SetupAllProperties();
-
-            _sut = new OwinResponseMapper(_fileSystemHandlerMock.Object);
+            _sut = new OwinResponseMapper();
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_Null()
+        public async void OwinResponseMapper_MapAsync_Null()
         {
             // Act
             await _sut.MapAsync(null, _responseMock.Object);
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_StatusCode()
+        public async void OwinResponseMapper_MapAsync_StatusCode()
         {
-            // Arrange
+            // Assign
             var responseMessage = new ResponseMessage
             {
                 StatusCode = 302
@@ -78,9 +73,9 @@ namespace WireMock.Net.Tests.Owin.Mappers
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_NoBody()
+        public async void OwinResponseMapper_MapAsync_NoBody()
         {
-            // Arrange
+            // Assign
             var responseMessage = new ResponseMessage
             {
                 Headers = new Dictionary<string, WireMockList<string>>()
@@ -94,9 +89,9 @@ namespace WireMock.Net.Tests.Owin.Mappers
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_Body()
+        public async void OwinResponseMapper_MapAsync_Body()
         {
-            // Arrange
+            // Assign
             string body = "abc";
             var responseMessage = new ResponseMessage
             {
@@ -112,9 +107,9 @@ namespace WireMock.Net.Tests.Owin.Mappers
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_BodyAsBytes()
+        public async void OwinResponseMapper_MapAsync_BodyAsBytes()
         {
-            // Arrange
+            // Assign
             var bytes = new byte[] { 48, 49 };
             var responseMessage = new ResponseMessage
             {
@@ -130,9 +125,9 @@ namespace WireMock.Net.Tests.Owin.Mappers
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_BodyAsJson()
+        public async void OwinResponseMapper_MapAsync_BodyAsJson()
         {
-            // Arrange
+            // Assign
             var json = new { t = "x", i = (string)null };
             var responseMessage = new ResponseMessage
             {
@@ -148,9 +143,9 @@ namespace WireMock.Net.Tests.Owin.Mappers
         }
 
         [Fact]
-        public async Task OwinResponseMapper_MapAsync_SetResponseHeaders()
+        public async void OwinResponseMapper_MapAsync_SetResponseHeaders()
         {
-            // Arrange
+            // Assign
             var responseMessage = new ResponseMessage
             {
                 Headers = new Dictionary<string, WireMockList<string>> { { "h", new WireMockList<string>("x", "y") } }

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

@@ -34,30 +34,9 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             // Assert
             JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Text"].Value<string>()).IsNotEmpty();
+            Check.That(j["Text"]).IsNotNull();
             Check.That(j["Integer"].Value<int>()).IsEqualTo(1000);
-            Check.That(j["Long"].Value<long>()).IsStrictlyGreaterThan(77777777).And.IsStrictlyLessThan(99999999);
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_Random1_Boolean()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Value = "{{Random Type=\"Boolean\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Value"].Type).IsEqualTo(JTokenType.Boolean);
+            Check.That(j["Long"].Value<int>()).IsStrictlyGreaterThan(77777777).And.IsStrictlyLessThan(99999999);
         }
 
         [Fact]

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

@@ -1,60 +0,0 @@
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using NFluent;
-using WireMock.Models;
-using WireMock.ResponseBuilders;
-using Xunit;
-
-namespace WireMock.Net.Tests.ResponseBuilders
-{
-    public class ResponseWithHandlebarsXegerTests
-    {
-        private const string ClientIp = "::1";
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_Xeger1()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Number = "{{Xeger \"[1-9]{1}\\d{3}\"}}",
-                    Postcode = "{{Xeger \"[1-9][0-9]{3}[A-Z]{2}\"}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
-            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
-        }
-
-        [Fact]
-        public async Task Response_ProvideResponseAsync_Handlebars_Xeger2()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "GET", ClientIp);
-
-            var response = Response.Create()
-                .WithBodyAsJson(new
-                {
-                    Number = "{{#Xeger \"[1-9]{1}\\d{3}\"}}{{this}}{{/Xeger}}",
-                    Postcode = "{{#Xeger \"[1-9][0-9]{3}[A-Z]{2}\"}}{{this}}{{/Xeger}}"
-                })
-                .WithTransformer();
-
-            // Act
-            var responseMessage = await response.ProvideResponseAsync(request);
-
-            // Assert
-            JObject j = JObject.FromObject(responseMessage.BodyData.BodyAsJson);
-            Check.That(j["Number"].Value<int>()).IsStrictlyGreaterThan(1000).And.IsStrictlyLessThan(9999);
-            Check.That(j["Postcode"].Value<string>()).IsNotEmpty();
-        }
-    }
-}

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

@@ -1,7 +1,7 @@
-using NFluent;
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading.Tasks;
+using NFluent;
 using WireMock.Util;
 using Xunit;
 
@@ -17,7 +17,7 @@ namespace WireMock.Net.Tests.Util
         [InlineData("application/vnd.test+json", "{ \"x\": 1 }", BodyType.Json, BodyType.Json)]
         public async Task BodyParser_Parse_ContentTypeJson(string contentType, string bodyAsJson, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Arrange
+            // Assign
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsJson));
 
             // Act
@@ -36,7 +36,7 @@ namespace WireMock.Net.Tests.Util
         [InlineData("something", "hello", BodyType.String, BodyType.Bytes)]
         public async Task BodyParser_Parse_ContentTypeString(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Arrange
+            // Assign
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
 
             // Act
@@ -50,49 +50,11 @@ namespace WireMock.Net.Tests.Util
             Check.That(body.DetectedBodyTypeFromContentType).IsEqualTo(detectedBodyTypeFromContentType);
         }
 
-        [Fact]
-        public async Task BodyParser_Parse_ContentTypeMultipart()
-        {
-            // Arrange
-            string contentType = "multipart/form-data";
-            string body = @"
-
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""text""
-
-text default
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""file1""; filename=""a.txt""
-Content-Type: text/plain
-
-Content of a txt
-
------------------------------9051914041544843365972754266
-Content-Disposition: form-data; name=""file2""; filename=""a.html""
-Content-Type: text/html
-
-<!DOCTYPE html><title>Content of a.html.</title>
-
------------------------------9051914041544843365972754266--";
-
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(body));
-
-            // Act
-            var result = await BodyParser.Parse(memoryStream, contentType);
-
-            // Assert
-            Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
-            Check.That(result.DetectedBodyTypeFromContentType).IsEqualTo(BodyType.MultiPart);
-            Check.That(result.BodyAsBytes).IsNotNull();
-            Check.That(result.BodyAsJson).IsNull();
-            Check.That(result.BodyAsString).IsNull();
-        }
-
         [Theory]
         [InlineData(null, "hello", BodyType.String, BodyType.Bytes)]
         public async Task BodyParser_Parse_ContentTypeIsNull(string contentType, string bodyAsString, BodyType detectedBodyType, BodyType detectedBodyTypeFromContentType)
         {
-            // Arrange
+            // Assign
             var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(bodyAsString));
 
             // Act

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

@@ -62,15 +62,9 @@
     <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d87.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="__admin\mappings\array.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="__admin\mappings\documentdb_root.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="__admin\mappings\MyXmlResponse.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
   <ItemGroup>

test/WireMock.Net.Tests/__admin/mappings/00000002-ee28-4f29-ae63-1ac9b0802d87.json

@@ -16,9 +16,9 @@
   },
   "Response": {
     "StatusCode": 200,
-    "BodyAsFile": "MyXmlResponse.xml",
+    "BodyAsFile": "responsebody.json",
     "Headers": {
-      "Content-Type": "application/xml"
+      "Content-Type": "application/json"
     }
   }
 }

test/WireMock.Net.Tests/__admin/mappings/MyXmlResponse.xml

@@ -1,3 +0,0 @@
-<xml>
-<hello>world</hello>
-</xml>

test/WireMock.Net.Tests/__admin/mappings/array.json

@@ -1,46 +0,0 @@
-[
-  {
-    "Title": "1",
-    "Request": {
-      "Path": {
-        "Matchers": [
-          {
-            "Name": "WildcardMatcher",
-            "Pattern": "/mappings_static_1"
-          }
-        ]
-      },
-      "Methods": [
-        "get"
-      ]
-    },
-    "Response": {
-      "BodyAsJson": { "result": "mappings static_1" },
-      "Headers": {
-        "Content-Type": "application/json"
-      }
-    }
-  },
-  {
-    "Title": "2",
-    "Request": {
-      "Path": {
-        "Matchers": [
-          {
-            "Name": "WildcardMatcher",
-            "Pattern": "/mappings_static_2"
-          }
-        ]
-      },
-      "Methods": [
-        "get"
-      ]
-    },
-    "Response": {
-      "BodyAsJson": { "result": "mappings static_2" },
-      "Headers": {
-        "Content-Type": "application/json"
-      }
-    }
-  }
-]