Update the logic for ProxyAndRecord (#747)

* .

* set

* .

* .

* .

* .

* prio

* appsettings

* TinyMapperUtils

* set

* p

* nullable

* .

* ,

* fs

* .

* .

* --PreferProxyMapping

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

@@ -25,7 +25,7 @@ namespace WireMock.Admin.Mappings
         public string Title { get; set; }
 
         /// <summary>
-        /// The priority.
+        /// The priority. (A low value means higher priority.)
         /// </summary>
         public int? Priority { get; set; }
 

src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs

@@ -0,0 +1,59 @@
+using JetBrains.Annotations;
+
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
+{
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }
+
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }
+
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    public bool SaveMapping { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    public bool SaveMappingToFile { get; set; }
+
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }
+}

src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
+using JetBrains.Annotations;
 using WireMock.Handlers;
-using WireMock.Types;
 
 namespace WireMock.Admin.Settings
 {
@@ -55,9 +55,29 @@ namespace WireMock.Admin.Settings
         /// </summary>
         public bool? SaveUnmatchedRequests { get; set; }
 
+        /// <summary>
+        /// Gets or sets if the static mappings should be read at startup.
+        /// </summary>
+        public bool? ReadStaticMappings { get; set; }
+
+        /// <summary>
+        /// Watch the static mapping files + folder for changes when running.
+        /// </summary>
+        public bool? WatchStaticMappings { get; set; }
+
+        /// <summary>
+        /// A value indicating whether subdirectories within the static mappings path should be monitored.
+        /// </summary>
+        public bool? WatchStaticMappingsInSubdirectories { get; set; }
+
         /// <summary>
         /// Policies to use when using CORS. By default CORS is disabled. [Optional]
         /// </summary>
         public string CorsPolicyOptions { get; set; }
+
+        /// <summary>
+        /// The proxy and record settings.
+        /// </summary>
+        public ProxyAndRecordSettingsModel ProxyAndRecordSettings { get; set; }
     }
 }

src/WireMock.Net.Abstractions/Admin/Settings/WebProxySettings.cs

@@ -0,0 +1,24 @@
+namespace WireMock.Admin.Settings
+{
+    /// <summary>
+    /// WebProxySettings
+    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
+    public class WebProxySettingsModel
+    {
+        /// <summary>
+        /// A string instance that contains the address of the proxy server.
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// The user name associated with the credentials.
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// The password for the user name associated with the credentials.
+        /// </summary>
+        public string Password { get; set; }
+    }
+}

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -41,4 +41,11 @@
         </PackageReference>
     </ItemGroup>
 
+    <!--<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+        <PackageReference Include="Nullable" Version="1.2.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>-->
+
 </Project>