Update the logic for ProxyAndRecord (#747)

* .

* set

* .

* .

* .

* .

* prio

* appsettings

* TinyMapperUtils

* set

* p

* nullable

* .

* ,

* fs

* .

* .

* --PreferProxyMapping

examples/WireMock.Net.WebApplication.NET6/App.cs

@@ -1,28 +1,27 @@
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace WireMock.Net.WebApplication
+namespace WireMock.Net.WebApplication;
+
+public class App : IHostedService
 {
-    public class App : IHostedService
-    {
-        private readonly IWireMockService _service;
+    private readonly IWireMockService _service;
         
-        public App(IWireMockService service)
-        {
-            _service = service;
-        }
+    public App(IWireMockService service)
+    {
+        _service = service;
+    }
 
-        public Task StartAsync(CancellationToken cancellationToken)
-        {
-            _service.Start();
-            return Task.CompletedTask;
-        }
+    public Task StartAsync(CancellationToken cancellationToken)
+    {
+        _service.Start();
+        return Task.CompletedTask;
+    }
 
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            _service.Stop();
-            return Task.CompletedTask;
-        }
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        _service.Stop();
+        return Task.CompletedTask;
     }
 }

examples/WireMock.Net.WebApplication.NET6/IWireMockService.cs

@@ -1,9 +1,8 @@
-namespace WireMock.Net.WebApplication
-{
-    public interface IWireMockService
-    {
-        void Start();
+namespace WireMock.Net.WebApplication;
 
-        void Stop();
-    }
+public interface IWireMockService
+{
+    void Start();
+
+    void Stop();
 }

examples/WireMock.Net.WebApplication.NET6/Program.cs

@@ -1,30 +1,29 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using WireMock.Settings;
 
-namespace WireMock.Net.WebApplication
+namespace WireMock.Net.WebApplication;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        CreateHostBuilder(args).Build().Run();
+    }
 
-        private static IHostBuilder CreateHostBuilder(string[] args)
-            => Host.CreateDefaultBuilder(args)
-                .ConfigureServices((host, services) => ConfigureServices(services, host.Configuration));
+    private static IHostBuilder CreateHostBuilder(string[] args)
+        => Host.CreateDefaultBuilder(args)
+            .ConfigureServices((host, services) => ConfigureServices(services, host.Configuration));
 
-        private static void ConfigureServices(IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddLogging(logging => logging.AddConsole().AddDebug());
+    private static void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+    {
+        services.AddLogging(logging => logging.AddConsole().AddDebug());
 
-            services.AddTransient<IWireMockService, WireMockService>();
-            services.Configure<WireMockServerSettings>(configuration.GetSection("WireMockServerSettings"));
+        services.AddTransient<IWireMockService, WireMockService>();
+        services.Configure<WireMockServerSettings>(configuration.GetSection("WireMockServerSettings"));
 
-            services.AddHostedService<App>();
-        }
+        services.AddHostedService<App>();
     }
 }

examples/WireMock.Net.WebApplication.NET6/WireMockService.cs

@@ -1,83 +1,81 @@
-using System;
+using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-
 using WireMock.Admin.Requests;
 using WireMock.Logging;
 using WireMock.Server;
 using WireMock.Settings;
 
-namespace WireMock.Net.WebApplication
+namespace WireMock.Net.WebApplication;
+
+public class WireMockService : IWireMockService
 {
-    public class WireMockService : IWireMockService
+    private WireMockServer? _server;
+    private readonly ILogger _logger;
+    private readonly WireMockServerSettings _settings;
+
+    private class Logger : IWireMockLogger
     {
-        private WireMockServer _server;
         private readonly ILogger _logger;
-        private readonly WireMockServerSettings _settings;
 
-        private class Logger : IWireMockLogger
-        {
-            private readonly ILogger _logger;
-
-            public Logger(ILogger logger)
-            {
-                _logger = logger;
-            }
-
-            public void Debug(string formatString, params object[] args)
-            {
-                _logger.LogDebug(formatString, args);
-            }
-
-            public void Info(string formatString, params object[] args)
-            {
-                _logger.LogInformation(formatString, args);
-            }
-
-            public void Warn(string formatString, params object[] args)
-            {
-                _logger.LogWarning(formatString, args);
-            }
-
-            public void Error(string formatString, params object[] args)
-            {
-                _logger.LogError(formatString, args);
-            }
-
-            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
-            {
-                string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-                _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
-            }
-
-            public void Error(string formatString, Exception exception)
-            {
-                _logger.LogError(formatString, exception.Message);
-            }
-        }
-
-        public WireMockService(ILogger<WireMockService> logger, IOptions<WireMockServerSettings> settings)
+        public Logger(ILogger logger)
         {
             _logger = logger;
-            _settings = settings.Value;
-
-            _settings.Logger = new Logger(logger);
         }
 
-        public void Start()
+        public void Debug(string formatString, params object[] args)
         {
-            _logger.LogInformation("WireMock.Net server starting");
-
-            _server = WireMockServer.Start(_settings);
-
-            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+            _logger.LogDebug(formatString, args);
         }
 
-        public void Stop()
+        public void Info(string formatString, params object[] args)
         {
-            _logger.LogInformation("WireMock.Net server stopping");
-            _server?.Stop();
+            _logger.LogInformation(formatString, args);
+        }
+
+        public void Warn(string formatString, params object[] args)
+        {
+            _logger.LogWarning(formatString, args);
+        }
+
+        public void Error(string formatString, params object[] args)
+        {
+            _logger.LogError(formatString, args);
+        }
+
+        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
+        {
+            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+            _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
+        }
+
+        public void Error(string formatString, Exception exception)
+        {
+            _logger.LogError(formatString, exception.Message);
         }
     }
-}
+
+    public WireMockService(ILogger<WireMockService> logger, IOptions<WireMockServerSettings> settings)
+    {
+        _logger = logger;
+        _settings = settings.Value;
+
+        _settings.Logger = new Logger(logger);
+    }
+
+    public void Start()
+    {
+        _logger.LogInformation("WireMock.Net server starting");
+
+        _server = WireMockServer.Start(_settings);
+
+        _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+    }
+
+    public void Stop()
+    {
+        _logger.LogInformation("WireMock.Net server stopping");
+        _server?.Stop();
+    }
+}

examples/WireMock.Net.WebApplication.NET6/appsettings.json

@@ -1,29 +1,29 @@
-{
-  "Logging": {
-    "IncludeScopes": false,
-    "Debug": {
-      "LogLevel": {
-        "Default": "Debug"
-      }
+{
+    "Logging": {
+        "IncludeScopes": false,
+        "Debug": {
+            "LogLevel": {
+                "Default": "Debug"
+            }
+        },
+        "Console": {
+            "LogLevel": {
+                "Default": "Debug"
+            }
+        }
     },
-    "Console": {
-      "LogLevel": {
-        "Default": "Debug"
-      }
+    "WireMockServerSettings": {
+        "StartAdminInterface": true,
+        "Urls": [
+            "https://localhost:8081/"
+        ],
+        "AllowPartialMapping": false,
+        "HandleRequestsSynchronously": true,
+        "ThrowExceptionWhenMatcherFails": true,
+        "ProxyAndRecordSettings": {
+            "Url": "http://postman-echo.com/post",
+            "SaveMapping": true,
+            "SaveMappingToFile": true
+        }
     }
-  },
-  "WireMockServerSettings": {
-    "StartAdminInterface": true,
-    "Urls": [
-      "https://localhost:8081/"
-    ],
-    "AllowPartialMapping": false,
-    "HandleRequestsSynchronously": true,
-    "ThrowExceptionWhenMatcherFails": true,
-    "ProxyAndRecordSettings": {
-      "Url": "https://support.smartbear.com/",
-      "SaveMapping": true,
-      "SaveMappingToFile": true
-    }
-  }
 }