1.0.2.13

#76

README.md

@@ -28,7 +28,7 @@ To build you need:
 
 
 ## Stubbing
-A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing](https://github.com/StefH/WireMock.Net/wiki/Stubbing).
+A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing & Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing-and-Request-Matching).
 
 ## Using WireMock in UnitTest framework
 You can use your favorite test framework and use WireMock within your tests, see

WireMock.Net Solution.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2010
+VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -14,9 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"
-	ProjectSection(SolutionItems) = preProject
-		examples\WireMock.Net.Console.Record.NETCoreApp\__admin\mappings\ab38efae-4e4d-4f20-8afe-635533ec2535.json = examples\WireMock.Net.Console.Record.NETCoreApp\__admin\mappings\ab38efae-4e4d-4f20-8afe-635533ec2535.json
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{890A1DED-C229-4FA1-969E-AAC3BBFC05E5}"
 EndProject
@@ -41,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +82,10 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,6 +100,7 @@ Global
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}

examples/WireMock.Net.Client/WireMock.Net.Client.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="RestEase" Version="1.4.3" />
+    <PackageReference Include="RestEase" Version="1.4.4" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -7,15 +7,15 @@ namespace WireMock.Net.StandAlone.NETCoreApp
     class Program
     {
         private static int sleepTime = 30000;
-        private static FluentMockServer server;
+        private static FluentMockServer _server;
 
         static void Main(string[] args)
         {
-            server = StandAloneApp.Start(args);
+            _server = StandAloneApp.Start(args);
 
             Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
 
-            System.Console.CancelKeyPress += (s,e) =>
+            Console.CancelKeyPress += (s, e) =>
             {
                 Stop("CancelKeyPress");
             };
@@ -25,7 +25,7 @@ namespace WireMock.Net.StandAlone.NETCoreApp
                 Stop("AssemblyLoadContext.Default.Unloading");
             };
 
-            while(true)
+            while (true)
             {
                 Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running");
                 Thread.Sleep(sleepTime);
@@ -35,7 +35,7 @@ namespace WireMock.Net.StandAlone.NETCoreApp
         private static void Stop(string why)
         {
             Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopping because '{why}'");
-            server.Stop();
+            _server.Stop();
             Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopped");
         }
     }

examples/WireMock.Net.WebApplication/App.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Logging;
+
+namespace WireMock.Net.WebApplication
+{
+    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 App running");
+            _service.Run();
+        }
+    }
+}

examples/WireMock.Net.WebApplication/IWireMockService.cs

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

examples/WireMock.Net.WebApplication/Program.cs

@@ -0,0 +1,57 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    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 serviceCollection)
+        {
+            // 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();
+
+            // Add LoggerFactory
+            var factory = new LoggerFactory();
+            serviceCollection.AddSingleton(factory
+                .AddConsole(configuration.GetSection("Logging"))
+                .AddDebug()
+                .AddAzureWebAppDiagnostics()
+            );
+
+            serviceCollection.AddSingleton(factory.CreateLogger("WireMock.Net Logger"));
+
+            // Add access to generic IConfigurationRoot
+            serviceCollection.AddSingleton(configuration);
+
+            // Add access to IFluentMockServerSettings
+            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
+            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
+
+            // Add services
+            serviceCollection.AddTransient<IWireMockService, WireMockService>();
+
+            // Add app
+            serviceCollection.AddTransient<App>();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <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>

examples/WireMock.Net.WebApplication/WireMockService.cs

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

examples/WireMock.Net.WebApplication/appsettings.json

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

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -18,7 +18,7 @@ namespace WireMock.Net.StandAlone
         /// </summary>
         /// <param name="settings">The FluentMockServerSettings</param>
         [PublicAPI]
-        public static FluentMockServer Start([NotNull] FluentMockServerSettings settings)
+        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
 

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
-    <Version>1.0.2.10</Version>
+    <Version>1.0.2.13</Version>
     <Authors>Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -55,6 +55,7 @@ namespace WireMock.Client
         /// </summary>
         /// <param name="mapping">MappingModel</param>
         [Post("__admin/mappings")]
+        [Header("Content-Type", "application/json")]
         Task<string> PostMappingAsync([Body] MappingModel mapping);
 
         /// <summary>
@@ -137,6 +138,7 @@ namespace WireMock.Client
         /// </summary>
         /// <param name="model">The RequestModel</param>
         [Post("__admin/requests/find")]
+        [Header("Content-Type", "application/json")]
         Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);
 
         /// <summary>

src/WireMock.Net/DynamicResponseProvider.cs

@@ -42,10 +42,10 @@ namespace WireMock
 
     internal class ProxyAsyncResponseProvider : IResponseProvider
     {
-        private readonly Func<RequestMessage, ProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly ProxyAndRecordSettings _settings;
+        private readonly Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly IProxyAndRecordSettings _settings;
 
-        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, ProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] ProxyAndRecordSettings settings)
+        public ProxyAsyncResponseProvider([NotNull] Func<RequestMessage, IProxyAndRecordSettings, Task<ResponseMessage>> responseMessageFunc, [NotNull] IProxyAndRecordSettings settings)
         {
             Check.NotNull(responseMessageFunc, nameof(responseMessageFunc));
             Check.NotNull(settings, nameof(settings));

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -62,7 +62,7 @@ namespace WireMock.Http
             var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
 
             // Set Body if present
-            if (requestMessage.BodyAsBytes != null && requestMessage.BodyAsBytes.Length > 0)
+            if (requestMessage.BodyAsBytes != null)
             {
                 httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
             }

src/WireMock.Net/Http/PortUtil.cs

@@ -5,18 +5,15 @@ using System.Text.RegularExpressions;
 namespace WireMock.Http
 {
     /// <summary>
-    /// Utility class
+    /// Port Utility class
     /// </summary>
     public static class PortUtil
     {
         private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)?/", RegexOptions.Compiled);
 
         /// <summary>
-        /// The find free TCP port.
+        /// Finds a free TCP port.
         /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
         /// <remarks>see http://stackoverflow.com/questions/138043/find-the-next-tcp-port-in-net.</remarks>
         public static int FindFreeTcpPort()
         {

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

@@ -29,6 +29,7 @@ namespace WireMock.Server
     public partial class FluentMockServer
     {
         private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+        private const string ContentTypeJson = "application/json";
         private const string AdminMappings = "/__admin/mappings";
         private const string AdminRequests = "/__admin/requests";
         private const string AdminSettings = "/__admin/settings";
@@ -86,12 +87,12 @@ namespace WireMock.Server
         {
             // __admin/settings
             Given(Request.Create().WithPath(AdminSettings).UsingGet()).RespondWith(new DynamicResponseProvider(SettingsGet));
-            Given(Request.Create().WithPath(AdminSettings).UsingVerb("PUT", "POST").WithHeader("Content-Type", "application/json")).RespondWith(new DynamicResponseProvider(SettingsUpdate));
+            Given(Request.Create().WithPath(AdminSettings).UsingVerb("PUT", "POST").WithHeader(HttpKnownHeaderNames.ContentType, ContentTypeJson)).RespondWith(new DynamicResponseProvider(SettingsUpdate));
 
 
             // __admin/mappings
             Given(Request.Create().WithPath(AdminMappings).UsingGet()).RespondWith(new DynamicResponseProvider(MappingsGet));
-            Given(Request.Create().WithPath(AdminMappings).UsingPost().WithHeader("Content-Type", "application/json")).RespondWith(new DynamicResponseProvider(MappingsPost));
+            Given(Request.Create().WithPath(AdminMappings).UsingPost().WithHeader(HttpKnownHeaderNames.ContentType, ContentTypeJson)).RespondWith(new DynamicResponseProvider(MappingsPost));
             Given(Request.Create().WithPath(AdminMappings).UsingDelete()).RespondWith(new DynamicResponseProvider(MappingsDelete));
 
             // __admin/mappings/reset
@@ -99,7 +100,7 @@ namespace WireMock.Server
 
             // __admin/mappings/{guid}
             Given(Request.Create().WithPath(_adminMappingsGuidPathMatcher).UsingGet()).RespondWith(new DynamicResponseProvider(MappingGet));
-            Given(Request.Create().WithPath(_adminMappingsGuidPathMatcher).UsingPut().WithHeader("Content-Type", "application/json")).RespondWith(new DynamicResponseProvider(MappingPut));
+            Given(Request.Create().WithPath(_adminMappingsGuidPathMatcher).UsingPut().WithHeader(HttpKnownHeaderNames.ContentType, ContentTypeJson)).RespondWith(new DynamicResponseProvider(MappingPut));
             Given(Request.Create().WithPath(_adminMappingsGuidPathMatcher).UsingDelete()).RespondWith(new DynamicResponseProvider(MappingDelete));
 
             // __admin/mappings/save
@@ -132,13 +133,13 @@ namespace WireMock.Server
         #region Proxy and Record
         private HttpClient _httpClientForProxy;
 
-        private void InitProxyAndRecord(ProxyAndRecordSettings settings)
+        private void InitProxyAndRecord(IProxyAndRecordSettings settings)
         {
             _httpClientForProxy = HttpClientHelper.CreateHttpClient(settings.X509Certificate2ThumbprintOrSubjectName);
             Given(Request.Create().WithPath("/*").UsingAnyVerb()).RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
         }
 
-        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, ProxyAndRecordSettings settings)
+        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IProxyAndRecordSettings settings)
         {
             var requestUri = new Uri(requestMessage.Url);
             var proxyUri = new Uri(settings.Url);

src/WireMock.Net/Server/FluentMockServer.cs

@@ -25,12 +25,15 @@ namespace WireMock.Server
         private readonly IOwinSelfHost _httpServer;
         private readonly WireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
 
+        /// <summary>
+        /// Gets a value indicating whether this server is started.
+        /// </summary>
+        [PublicAPI]
+        public bool IsStarted { get; }
+
         /// <summary>
         /// Gets the ports.
         /// </summary>
-        /// <value>
-        /// The ports.
-        /// </value>
         [PublicAPI]
         public List<int> Ports { get; }
 
@@ -59,7 +62,7 @@ namespace WireMock.Server
         /// <param name="settings">The FluentMockServerSettings.</param>
         /// <returns>The <see cref="FluentMockServer"/>.</returns>
         [PublicAPI]
-        public static FluentMockServer Start(FluentMockServerSettings settings)
+        public static FluentMockServer Start(IFluentMockServerSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
 
@@ -150,7 +153,7 @@ namespace WireMock.Server
             });
         }
 
-        private FluentMockServer(FluentMockServerSettings settings)
+        private FluentMockServer(IFluentMockServerSettings settings)
         {
             if (settings.Urls != null)
             {
@@ -170,6 +173,8 @@ namespace WireMock.Server
 #else
             _httpServer = new OwinSelfHost(_options, Urls);
 #endif
+            IsStarted = _httpServer.IsStarted;
+
             Ports = _httpServer.Ports;
 
             _httpServer.StartAsync();
@@ -363,18 +368,18 @@ namespace WireMock.Server
             return new RespondWithAProvider(RegisterMapping, requestMatcher);
         }
 
-        /// <summary>
-        /// The register mapping.
-        /// </summary>
-        /// <param name="mapping">
-        /// The mapping.
-        /// </param>
         private void RegisterMapping(Mapping mapping)
         {
-            // Check a mapping exists with the same GUID, if so, remove it first.
-            DeleteMapping(mapping.Guid);
-
-            _options.Mappings.Add(mapping);
+            // Check a mapping exists with the same Guid, if so, replace it.
+            var existingMapping = _options.Mappings.FirstOrDefault(m => m.Guid == mapping.Guid);
+            if (existingMapping != null)
+            {
+                _options.Mappings[_options.Mappings.IndexOf(existingMapping)] = mapping;
+            }
+            else
+            {
+                _options.Mappings.Add(mapping);
+            }
         }
     }
 }

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -6,91 +6,62 @@ namespace WireMock.Settings
     /// <summary>
     /// FluentMockServerSettings
     /// </summary>
-    public class FluentMockServerSettings
+    public class FluentMockServerSettings : IFluentMockServerSettings
     {
-        /// <summary>
-        /// Gets or sets the port.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
         [PublicAPI]
         public int? Port { get; set; }
 
-        /// <summary>
-        /// Gets or sets the use SSL.
-        /// </summary>
-        // ReSharper disable once InconsistentNaming
+        /// <inheritdoc cref="IFluentMockServerSettings.UseSSL"/>
         [PublicAPI]
+        // ReSharper disable once InconsistentNaming
         public bool? UseSSL { get; set; }
 
-        /// <summary>
-        /// Gets or sets wether to start admin interface.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.StartAdminInterface"/>
         [PublicAPI]
         public bool? StartAdminInterface { get; set; }
 
-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.ReadStaticMappings"/>
         [PublicAPI]
         public bool? ReadStaticMappings { get; set; }
 
-        /// <summary>
-        /// Gets or sets if the server should record and save requests and responses.
-        /// </summary>
-        /// <value>true/false</value>
+        /// <inheritdoc cref="IFluentMockServerSettings.ProxyAndRecordSettings"/>
         [PublicAPI]
-        public ProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
+        public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the urls.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.Urls"/>
         [PublicAPI]
         public string[] Urls { get; set; }
 
-        /// <summary>
-        /// StartTimeout
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.StartTimeout"/>
         [PublicAPI]
         public int StartTimeout { get; set; } = 10000;
 
-        /// <summary>
-        /// Allow Partial Mapping (default set to false).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AllowPartialMapping"/>
         [PublicAPI]
         public bool? AllowPartialMapping { get; set; }
 
-        /// <summary>
-        /// The username needed for __admin access.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AdminUsername"/>
         [PublicAPI]
         public string AdminUsername { get; set; }
 
-        /// <summary>
-        /// The password needed for __admin access.
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.AdminPassword"/>
         [PublicAPI]
         public string AdminPassword { get; set; }
 
-        /// <summary>
-        /// The RequestLog expiration in hours (optional).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.RequestLogExpirationDuration"/>
         [PublicAPI]
         public int? RequestLogExpirationDuration { get; set; }
 
-        /// <summary>
-        /// The MaxRequestLog count (optional).
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.MaxRequestLogCount"/>
         [PublicAPI]
         public int? MaxRequestLogCount { get; set; }
 
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.PreWireMockMiddlewareInit"/>
         [PublicAPI]
         public Action<object> PreWireMockMiddlewareInit { get; set; }
 
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
+        /// <inheritdoc cref="IFluentMockServerSettings.PostWireMockMiddlewareInit"/>
         [PublicAPI]
         public Action<object> PostWireMockMiddlewareInit { get; set; }
     }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -0,0 +1,81 @@
+using System;
+
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IFluentMockServerSettings
+    /// </summary>
+    public interface IFluentMockServerSettings
+    {
+        /// <summary>
+        /// Gets or sets the port.
+        /// </summary>
+        int? Port { get; set; }
+
+        /// <summary>
+        /// Gets or sets the use SSL.
+        /// </summary>
+        // ReSharper disable once InconsistentNaming
+        bool? UseSSL { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether to start admin interface.
+        /// </summary>
+        bool? StartAdminInterface { get; set; }
+
+        /// <summary>
+        /// Gets or sets if the static mappings should be read at startup.
+        /// </summary>
+        bool? ReadStaticMappings { get; set; }
+
+        /// <summary>
+        /// Gets or sets if the proxy and record settings.
+        /// </summary>
+        IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
+
+        /// <summary>
+        /// Gets or sets the urls.
+        /// </summary>
+        string[] Urls { get; set; }
+
+        /// <summary>
+        /// StartTimeout
+        /// </summary>
+        int StartTimeout { get; set; }
+
+        /// <summary>
+        /// Allow Partial Mapping (default set to false).
+        /// </summary>
+        bool? AllowPartialMapping { get; set; }
+
+        /// <summary>
+        /// The username needed for __admin access.
+        /// </summary>
+        string AdminUsername { get; set; }
+
+        /// <summary>
+        /// The password needed for __admin access.
+        /// </summary>
+        string AdminPassword { get; set; }
+
+        /// <summary>
+        /// The RequestLog expiration in hours (optional).
+        /// </summary>
+        int? RequestLogExpirationDuration { get; set; }
+
+        /// <summary>
+        /// The MaxRequestLog count (optional).
+        /// </summary>
+        int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        Action<object> PreWireMockMiddlewareInit { get; set; }
+
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
+        Action<object> PostWireMockMiddlewareInit { get; set; }
+    }
+}

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -0,0 +1,28 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IRecordAndSaveSettings
+    /// </summary>
+    public interface IProxyAndRecordSettings
+    {
+        /// <summary>
+        /// The URL to proxy.
+        /// </summary>
+        string Url { get; set; }
+
+        /// <summary>
+        /// Save the mapping for each request/response to the internal Mappings.
+        /// </summary>
+        bool SaveMapping { get; set; }
+
+        /// <summary>
+        /// Save the mapping for each request/response to also file. (Note that SaveMapping must also be set to true.)
+        /// </summary>
+        bool SaveMappingToFile { get; set; }
+
+        /// <summary>
+        /// The clientCertificate thumbprint or subject name fragment to use. Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+        /// </summary>
+        string X509Certificate2ThumbprintOrSubjectName { get; set; }
+    }
+}

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,28 +1,26 @@
-namespace WireMock.Settings
+using JetBrains.Annotations;
+
+namespace WireMock.Settings
 {
     /// <summary>
     /// RecordAndSaveSettings
     /// </summary>
-    public class ProxyAndRecordSettings
+    public class ProxyAndRecordSettings : IProxyAndRecordSettings
     {
-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.Url"/>
+        [PublicAPI]
         public string Url { get; set; }
 
-        /// <summary>
-        /// Save the mapping for each request/response to the internal Mappings.
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.SaveMapping"/>
+        [PublicAPI]
         public bool SaveMapping { get; set; } = true;
 
-        /// <summary>
-        /// Save the mapping for each request/response to also file. (Note that SaveMapping must also be set to true.)
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.SaveMappingToFile"/>
+        [PublicAPI]
         public bool SaveMappingToFile { get; set; } = true;
 
-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use. Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
+        /// <inheritdoc cref="IProxyAndRecordSettings.X509Certificate2ThumbprintOrSubjectName"/>
+        [PublicAPI]
         public string X509Certificate2ThumbprintOrSubjectName { get; set; }
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Version>1.0.2.10</Version>
+    <Version>1.0.2.13</Version>
     <Authors>Alexandre Victoor;Stef Heyenrath</Authors>
     <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -34,9 +34,9 @@
     </PackageReference>
     <PackageReference Include="Handlebars.Net" Version="1.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
-    <PackageReference Include="System.Net.Http" Version="4.3.2" />
-    <PackageReference Include="RestEase" Version="1.4.2" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
+    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <PackageReference Include="RestEase" Version="1.4.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>

test/WireMock.Net.Tests/ClientTests.cs

@@ -0,0 +1,48 @@
+using System.Linq;
+using System.Threading.Tasks;
+using NFluent;
+using RestEase;
+using WireMock.Admin.Mappings;
+using WireMock.Client;
+using WireMock.Server;
+using Xunit;
+
+namespace WireMock.Net.Tests
+{
+    public class ClientTests
+    {
+        [Fact]
+        public async Task Client_IFluentMockServerAdmin_PostMappingAsync()
+        {
+            // 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
+                },
+                Priority = 500,
+                Title = "test"
+            };
+            string result = await api.PostMappingAsync(model);
+
+            // Assert
+            Check.That(result).IsNotNull();
+
+            var mapping = server.Mappings.Single(m => m.Priority == 500);
+            Check.That(mapping).IsNotNull();
+            Check.That(mapping.Title).Equals("test");
+
+            server.Stop();
+        }
+    }
+}

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

@@ -63,6 +63,37 @@ namespace WireMock.Net.Tests
             Check.That(receivedRequest.Headers["Content-Type"]).ContainsExactly("text/plain");
         }
 
+        [Fact]
+        public async Task FluentMockServer_Should_preserve_content_header_in_proxied_request_with_empty_content()
+        {
+            // given
+            _serverForProxyForwarding = FluentMockServer.Start();
+            _serverForProxyForwarding
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create());
+
+            _server = FluentMockServer.Start();
+            _server
+                .Given(Request.Create().WithPath("/*"))
+                .RespondWith(Response.Create().WithProxy(_serverForProxyForwarding.Urls[0]));
+
+            // when
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Post,
+                RequestUri = new Uri(_server.Urls[0]),
+                Content = new StringContent("")
+            };
+            requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+            await new HttpClient().SendAsync(requestMessage);
+
+            // then
+            var receivedRequest = _serverForProxyForwarding.LogEntries.First().RequestMessage;
+            Check.That(receivedRequest.Body).IsEqualTo("");
+            Check.That(receivedRequest.Headers).ContainsKey("Content-Type");
+            Check.That(receivedRequest.Headers["Content-Type"]).ContainsExactly("text/plain");
+        }
+
         [Fact]
         public async Task FluentMockServer_Should_preserve_content_header_in_proxied_response()
         {

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -117,20 +117,24 @@ namespace WireMock.Net.Tests
             var guid = Guid.Parse("90356dba-b36c-469a-a17e-669cd84f1f05");
             _server = FluentMockServer.Start();
 
-            _server.Given(Request.Create().WithPath("/1").UsingGet())
+            var response1 = Response.Create().WithStatusCode(500);
+            _server.Given(Request.Create().UsingGet())
                 .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
+                .RespondWith(response1);
 
-            var mappings = _server.Mappings.ToArray();
-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
+            var mappings1 = _server.Mappings.ToArray();
+            Check.That(mappings1).HasSize(1);
+            Check.That(mappings1.First().Guid).Equals(guid);
 
+            var response2 = Response.Create().WithStatusCode(400);
             _server.Given(Request.Create().WithPath("/2").UsingGet())
                 .WithGuid(guid)
-                .RespondWith(Response.Create().WithStatusCode(500));
+                .RespondWith(response2);
 
-            Check.That(mappings).HasSize(1);
-            Check.That(mappings.First().Guid).Equals(guid);
+            var mappings2 = _server.Mappings.ToArray();
+            Check.That(mappings2).HasSize(1);
+            Check.That(mappings2.First().Guid).Equals(guid);
+            Check.That(mappings2.First().Provider).Equals(response2);
         }
 
         [Fact]

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

@@ -16,12 +16,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.1.0" />
-    <PackageReference Include="Moq" Version="4.7.99" />
+    <PackageReference Include="Moq" Version="4.8.1" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NFluent" Version="2.0.0" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="2.5.11" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
 	  <PackageReference Include="xunit" Version="2.3.0-beta1-build3642" /> 
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />