Fix WithBody when using Pact and added more nullable annotations (#783)

* More nullable annotations

* .

* .

* FIX

* pact

* .

* p

* xxx

* ...

* auth

* array

* ...

src/WireMock.Net/Settings/SimpleCommandLineParser.cs

@@ -2,91 +2,105 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+// Based on http://blog.gauffin.org/2014/12/simple-command-line-parser/
+internal class SimpleCommandLineParser
 {
-    // Based on http://blog.gauffin.org/2014/12/simple-command-line-parser/
-    internal class SimpleCommandLineParser
+    private const string Sigil = "--";
+
+    private IDictionary<string, string[]> Arguments { get; } = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
+
+    public void Parse(string[] arguments)
     {
-        private const string Sigil = "--";
+        string currentName = string.Empty;
 
-        private IDictionary<string, string[]> Arguments { get; } = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);
+        var values = new List<string>();
 
-        public void Parse(string[] arguments)
+        // Split a single argument on a space character to fix issue (e.g. Azure Service Fabric) when an argument is supplied like "--x abc" or '--x abc'
+        foreach (string arg in arguments.SelectMany(arg => arg.Split(' ')))
         {
-            string currentName = null;
-
-            var values = new List<string>();
-
-            // Split a single argument on a space character to fix issue (e.g. Azure Service Fabric) when an argument is supplied like "--x abc" or '--x abc'
-            foreach (string arg in arguments.SelectMany(arg => arg.Split(' ')))
+            if (arg.StartsWith(Sigil))
             {
-                if (arg.StartsWith(Sigil))
+                if (!string.IsNullOrEmpty(currentName))
                 {
-                    if (!string.IsNullOrEmpty(currentName))
-                    {
-                        Arguments[currentName] = values.ToArray();
-                    }
+                    Arguments[currentName] = values.ToArray();
+                }
 
-                    values.Clear();
-                    currentName = arg.Substring(Sigil.Length);
-                }
-                else if (string.IsNullOrEmpty(currentName))
-                {
-                    Arguments[arg] = new string[0];
-                }
-                else
-                {
-                    values.Add(arg);
-                }
+                values.Clear();
+                currentName = arg.Substring(Sigil.Length);
             }
-
-            if (!string.IsNullOrEmpty(currentName))
+            else if (string.IsNullOrEmpty(currentName))
             {
-                Arguments[currentName] = values.ToArray();
+                Arguments[arg] = new string[0];
+            }
+            else
+            {
+                values.Add(arg);
             }
         }
 
-        public bool Contains(string name)
+        if (!string.IsNullOrEmpty(currentName))
         {
-            return Arguments.ContainsKey(name);
-        }
-
-        public string[] GetValues(string name, string[] defaultValue = null)
-        {
-            return Contains(name) ? Arguments[name] : defaultValue;
-        }
-
-        public T GetValue<T>(string name, Func<string[], T> func, T defaultValue = default(T))
-        {
-            return Contains(name) ? func(Arguments[name]) : defaultValue;
-        }
-
-        public bool GetBoolValue(string name, bool defaultValue = false)
-        {
-            return GetValue(name, values =>
-            {
-                string value = values.FirstOrDefault();
-                return !string.IsNullOrEmpty(value) ? bool.Parse(value) : defaultValue;
-            }, defaultValue);
-        }
-
-        public bool GetBoolSwitchValue(string name)
-        {
-            return Contains(name);
-        }
-
-        public int? GetIntValue(string name, int? defaultValue = null)
-        {
-            return GetValue(name, values =>
-            {
-                string value = values.FirstOrDefault();
-                return !string.IsNullOrEmpty(value) ? int.Parse(value) : defaultValue;
-            }, defaultValue);
-        }
-
-        public string GetStringValue(string name, string defaultValue = null)
-        {
-            return GetValue(name, values => values.FirstOrDefault() ?? defaultValue, defaultValue);
+            Arguments[currentName] = values.ToArray();
         }
     }
+
+    public bool Contains(string name)
+    {
+        return Arguments.ContainsKey(name);
+    }
+
+    public string[] GetValues(string name, string[] defaultValue)
+    {
+        return Contains(name) ? Arguments[name] : defaultValue;
+    }
+
+    public string[]? GetValues(string name)
+    {
+        return Contains(name) ? Arguments[name] : default;
+    }
+
+    public T GetValue<T>(string name, Func<string[], T> func, T defaultValue)
+    {
+        return Contains(name) ? func(Arguments[name]) : defaultValue;
+    }
+
+    public T? GetValue<T>(string name, Func<string[], T> func)
+    {
+        return Contains(name) ? func(Arguments[name]) : default;
+    }
+
+    public bool GetBoolValue(string name, bool defaultValue = false)
+    {
+        return GetValue(name, values =>
+        {
+            var value = values.FirstOrDefault();
+            return !string.IsNullOrEmpty(value) ? bool.Parse(value) : defaultValue;
+        }, defaultValue);
+    }
+
+    public bool GetBoolSwitchValue(string name)
+    {
+        return Contains(name);
+    }
+
+    public int? GetIntValue(string name, int? defaultValue = null)
+    {
+        return GetValue(name, values =>
+        {
+            var value = values.FirstOrDefault();
+            return !string.IsNullOrEmpty(value) ? int.Parse(value) : defaultValue;
+        }, defaultValue);
+    }
+
+    public string GetStringValue(string name, string defaultValue)
+    {
+        return GetValue(name, values => values.FirstOrDefault() ?? defaultValue, defaultValue);
+    }
+
+    public string? GetStringValue(string name)
+    {
+        return GetValue(name, values => values.FirstOrDefault());
+    }
 }

src/WireMock.Net/Settings/WebhookSettings.cs

@@ -1,9 +1,8 @@
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+/// <summary>
+/// WebhookSettings
+/// </summary>
+public class WebhookSettings : HttpClientSettings
 {
-    /// <summary>
-    /// WebhookSettings
-    /// </summary>
-    public class WebhookSettings : HttpClientSettings
-    {
-    }
 }

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -251,5 +251,11 @@ namespace WireMock.Settings
         /// </summary>
         [PublicAPI, JsonIgnore]
         public IDictionary<string, Func<MatcherModel, IMatcher>>? CustomMatcherMappings { get; set; }
+
+        /// <summary>
+        /// The <see cref="JsonSerializerSettings"/> used when the a JSON response is generated.
+        /// </summary>
+        [PublicAPI, JsonIgnore]
+        public JsonSerializerSettings? JsonSerializerSettings { get; set; }
     }
 }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -1,129 +1,129 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Stef.Validation;
 using WireMock.Logging;
 using WireMock.Types;
 
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+/// <summary>
+/// A static helper class to parse commandline arguments into WireMockServerSettings.
+/// </summary>
+public static class WireMockServerSettingsParser
 {
     /// <summary>
-    /// A static helper class to parse commandline arguments into WireMockServerSettings.
+    /// Parse commandline arguments into WireMockServerSettings.
     /// </summary>
-    public static class WireMockServerSettingsParser
+    /// <param name="args">The commandline arguments</param>
+    /// <param name="logger">The logger (optional, can be null)</param>
+    /// <param name="settings">The parsed settings</param>
+    [PublicAPI]
+    public static bool TryParseArguments(string[] args, [NotNullWhen(true)] out WireMockServerSettings? settings, IWireMockLogger? logger = null)
     {
-        /// <summary>
-        /// Parse commandline arguments into WireMockServerSettings.
-        /// </summary>
-        /// <param name="args">The commandline arguments</param>
-        /// <param name="logger">The logger (optional, can be null)</param>
-        /// <param name="settings">The parsed settings</param>
-        [PublicAPI]
-        public static bool TryParseArguments([NotNull] string[] args, out WireMockServerSettings settings, [CanBeNull] IWireMockLogger logger = null)
+        Guard.HasNoNulls(args, nameof(args));
+
+        var parser = new SimpleCommandLineParser();
+        parser.Parse(args);
+
+        if (parser.GetBoolSwitchValue("help"))
         {
-            Guard.HasNoNulls(args, nameof(args));
+            (logger ?? new WireMockConsoleLogger()).Info("See https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-commandline-parameters for details on all commandline options.");
+            settings = null;
+            return false;
+        }
 
-            var parser = new SimpleCommandLineParser();
-            parser.Parse(args);
-
-            if (parser.GetBoolSwitchValue("help"))
-            {
-                (logger ?? new WireMockConsoleLogger()).Info("See https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-commandline-parameters for details on all commandline options.");
-                settings = null;
-                return false;
-            }
-
-            settings = new WireMockServerSettings
-            {
-                AdminAzureADAudience = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADAudience)),
-                AdminAzureADTenant = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADTenant)),
-                AdminPassword = parser.GetStringValue("AdminPassword"),
-                AdminUsername = parser.GetStringValue("AdminUsername"),
-                AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods"),
-                AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
-                AllowOnlyDefinedHttpStatusCodeInResponse = parser.GetBoolValue("AllowOnlyDefinedHttpStatusCodeInResponse"),
-                AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping"),
-                DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing"),
-                HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
-                MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
-                ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
-                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
-                SaveUnmatchedRequests = parser.GetBoolValue(nameof(WireMockServerSettings.SaveUnmatchedRequests)),
-                StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
-                ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
-                UseRegexExtended = parser.GetBoolValue(nameof(WireMockServerSettings.UseRegexExtended), true),
-                WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
-                WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
-            };
+        settings = new WireMockServerSettings
+        {
+            AdminAzureADAudience = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADAudience)),
+            AdminAzureADTenant = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADTenant)),
+            AdminPassword = parser.GetStringValue("AdminPassword"),
+            AdminUsername = parser.GetStringValue("AdminUsername"),
+            AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods"),
+            AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
+            AllowOnlyDefinedHttpStatusCodeInResponse = parser.GetBoolValue("AllowOnlyDefinedHttpStatusCodeInResponse"),
+            AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping"),
+            DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing"),
+            HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
+            MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
+            ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
+            RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
+            SaveUnmatchedRequests = parser.GetBoolValue(nameof(WireMockServerSettings.SaveUnmatchedRequests)),
+            StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
+            ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
+            UseRegexExtended = parser.GetBoolValue(nameof(WireMockServerSettings.UseRegexExtended), true),
+            WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
+            WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
+        };
 
 #if USE_ASPNETCORE
-            settings.CorsPolicyOptions = parser.GetValue(nameof(WireMockServerSettings.CorsPolicyOptions), values =>
-            {
-                var value = string.Join(string.Empty, values);
-                return Enum.TryParse<CorsPolicyOptions>(value, true, out var corsPolicyOptions) ? corsPolicyOptions : CorsPolicyOptions.None;
-            });
+        settings.CorsPolicyOptions = parser.GetValue(nameof(WireMockServerSettings.CorsPolicyOptions), values =>
+        {
+            var value = string.Join(string.Empty, values);
+            return Enum.TryParse<CorsPolicyOptions>(value, true, out var corsPolicyOptions) ? corsPolicyOptions : CorsPolicyOptions.None;
+        });
 #endif
 
-            if (logger != null)
-            {
-                settings.Logger = logger;
-            }
-
-            if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger")
-            {
-                settings.Logger = new WireMockConsoleLogger();
-            }
-
-            if (parser.Contains(nameof(WireMockServerSettings.Port)))
-            {
-                settings.Port = parser.GetIntValue(nameof(WireMockServerSettings.Port));
-            }
-            else
-            {
-                settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
-            }
-
-            string proxyUrl = parser.GetStringValue("ProxyURL") ?? parser.GetStringValue("ProxyUrl");
-            if (!string.IsNullOrEmpty(proxyUrl))
-            {
-                settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect"),
-                    ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
-                    ExcludedCookies = parser.GetValues("ExcludedCookies"),
-                    ExcludedHeaders = parser.GetValues("ExcludedHeaders"),
-                    // PreferProxyMapping = parser.GetBoolValue(nameof(ProxyAndRecordSettings.PreferProxyMapping)),
-                    SaveMapping = parser.GetBoolValue("SaveMapping"),
-                    SaveMappingForStatusCodePattern = parser.GetStringValue("SaveMappingForStatusCodePattern"),
-                    SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
-                    Url = proxyUrl
-                };
-
-                string proxyAddress = parser.GetStringValue("WebProxyAddress");
-                if (!string.IsNullOrEmpty(proxyAddress))
-                {
-                    settings.ProxyAndRecordSettings.WebProxySettings = new WebProxySettings
-                    {
-                        Address = proxyAddress,
-                        UserName = parser.GetStringValue("WebProxyUserName"),
-                        Password = parser.GetStringValue("WebProxyPassword")
-                    };
-                }
-            }
-
-            var certificateSettings = new WireMockCertificateSettings
-            {
-                X509StoreName = parser.GetStringValue("X509StoreName"),
-                X509StoreLocation = parser.GetStringValue("X509StoreLocation"),
-                X509StoreThumbprintOrSubjectName = parser.GetStringValue("X509StoreThumbprintOrSubjectName"),
-                X509CertificateFilePath = parser.GetStringValue("X509CertificateFilePath"),
-                X509CertificatePassword = parser.GetStringValue("X509CertificatePassword")
-            };
-            if (certificateSettings.IsDefined)
-            {
-                settings.CertificateSettings = certificateSettings;
-            }
-
-            return true;
+        if (logger != null)
+        {
+            settings.Logger = logger;
         }
+
+        if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger")
+        {
+            settings.Logger = new WireMockConsoleLogger();
+        }
+
+        if (parser.Contains(nameof(WireMockServerSettings.Port)))
+        {
+            settings.Port = parser.GetIntValue(nameof(WireMockServerSettings.Port));
+        }
+        else
+        {
+            settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
+        }
+
+        var proxyUrl = parser.GetStringValue("ProxyURL") ?? parser.GetStringValue("ProxyUrl");
+        if (!string.IsNullOrEmpty(proxyUrl))
+        {
+            settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
+            {
+                AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect"),
+                ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
+                ExcludedCookies = parser.GetValues("ExcludedCookies"),
+                ExcludedHeaders = parser.GetValues("ExcludedHeaders"),
+                // PreferProxyMapping = parser.GetBoolValue(nameof(ProxyAndRecordSettings.PreferProxyMapping)),
+                SaveMapping = parser.GetBoolValue("SaveMapping"),
+                SaveMappingForStatusCodePattern = parser.GetStringValue("SaveMappingForStatusCodePattern", "*"),
+                SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
+                Url = proxyUrl
+            };
+
+            string? proxyAddress = parser.GetStringValue("WebProxyAddress");
+            if (!string.IsNullOrEmpty(proxyAddress))
+            {
+                settings.ProxyAndRecordSettings.WebProxySettings = new WebProxySettings
+                {
+                    Address = proxyAddress,
+                    UserName = parser.GetStringValue("WebProxyUserName"),
+                    Password = parser.GetStringValue("WebProxyPassword")
+                };
+            }
+        }
+
+        var certificateSettings = new WireMockCertificateSettings
+        {
+            X509StoreName = parser.GetStringValue("X509StoreName"),
+            X509StoreLocation = parser.GetStringValue("X509StoreLocation"),
+            X509StoreThumbprintOrSubjectName = parser.GetStringValue("X509StoreThumbprintOrSubjectName"),
+            X509CertificateFilePath = parser.GetStringValue("X509CertificateFilePath"),
+            X509CertificatePassword = parser.GetStringValue("X509CertificatePassword")
+        };
+        if (certificateSettings.IsDefined)
+        {
+            settings.CertificateSettings = certificateSettings;
+        }
+
+        return true;
     }
 }