Merge branch 'master' into stef-IgnoreOpenApiErrors

.
2026-02-14 22:37:41 +01:00 · 2023-06-03 17:01:15 +02:00 · 2023-06-01 21:14:13 +02:00 · 2023-06-01 21:04:21 +02:00 · 2023-05-30 21:41:30 +02:00 · 2023-05-28 23:10:09 +02:00
36 changed files with 441 additions and 1084 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,3 @@
-# 1.5.29 (22 June 2023)
- [#954](https://github.com/WireMock-Net/WireMock.Net/pull/954) - Support setting WireMockServerSettings via Environment [feature] contributed by [StefH](https://github.com/StefH)
- [#955](https://github.com/WireMock-Net/WireMock.Net/pull/955) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)
- [#953](https://github.com/WireMock-Net/WireMock.Net/issues/953) - How to use environment variable [feature]
-
-# 1.5.28 (11 June 2023)
- [#948](https://github.com/WireMock-Net/WireMock.Net/pull/948) - WireMock.Net.Testcontainers [feature] contributed by [StefH](https://github.com/StefH)
- [#951](https://github.com/WireMock-Net/WireMock.Net/pull/951) - Allow setting the Content-Length header for a HTTP method HEAD [feature] contributed by [StefH](https://github.com/StefH)
-
 # 1.5.27 (03 June 2023)
 - [#946](https://github.com/WireMock-Net/WireMock.Net/pull/946) - Add warning logging when sending a request to a Webhook does not return status 200 [feature] contributed by [StefH](https://github.com/StefH)
 - [#949](https://github.com/WireMock-Net/WireMock.Net/pull/949) - Add &quot;.NET Framework 4.7&quot; to WireMock.Net.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.5.29</VersionPrefix>
+        <VersionPrefix>1.5.27</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.5.29
+SET version=1.5.27

 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,6 +1,7 @@
-# 1.5.29 (22 June 2023)
- #954 Support setting WireMockServerSettings via Environment [feature]
- #955 Fix some SonarCloud issues [refactor]
- #953 How to use environment variable [feature]
+# 1.5.27 (03 June 2023)
+- #946 Add warning logging when sending a request to a Webhook does not return status 200 [feature]
+- #949 Add &quot;.NET Framework 4.7&quot; to WireMock.Net.FluentAssertions [feature]
+- #928 TypeLoadException when using WithHeader method. [bug]
+- #945 Webhook logging [feature]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -42,7 +42,6 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 | &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
-| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
 | &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)


@@ -69,15 +68,13 @@ WireMock.Net can be used in several ways:
 You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).

-### Unit/Integration Testing using Testcontainers.DotNet
-You can use [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
-
 ### As a dotnet tool
 It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).

 ### As standalone process / console application
 This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).

+
 ### As a Windows Service
 You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).

--- a/Solution.sln
+++ b/Solution.sln
@@ -111,10 +111,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Testcontainers", "src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj", "{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TestcontainersExample", "examples\WireMock.Net.TestcontainersExample\WireMock.Net.TestcontainersExample.csproj", "{56A38798-C48B-4A4A-B805-071E05C02CE1}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -269,14 +265,6 @@ Global
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -321,8 +309,6 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{56A38798-C48B-4A4A-B805-071E05C02CE1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -10,7 +10,6 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
@@ -33,7 +32,6 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=sheyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using WireMock.Net.OpenApiParser.Types;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;

@@ -18,7 +19,7 @@ class Program
    private static void RunMockServerWithDynamicExampleGeneration()
    {
        // Run your mocking framework specifying your Example Values generator class.
-        var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), Types.ExampleValueType.Value, Types.ExampleValueType.Value);
+        var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), ExampleValueType.Value, ExampleValueType.Value);
        Console.WriteLine("Press any key to stop the servers");

        Console.ReadKey();
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -29,7 +29,7 @@ static class Program

        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));

-        if (!WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings, new WireMockLog4NetLogger()))
+        if (!WireMockServerSettingsParser.TryParseArguments(args, out var settings, new WireMockLog4NetLogger()))
        {
            return;
        }
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -1,43 +0,0 @@
-using Newtonsoft.Json;
-using Testcontainers.MsSql;
-using WireMock.Net.Testcontainers;
-
-namespace WireMock.Net.TestcontainersExample;
-
-internal class Program
-{
-    private static async Task Main(string[] args)
-    {
-        var container = new WireMockContainerBuilder()
-            .WithAdminUserNameAndPassword("x", "y")
-            .WithMappings(@"C:\Dev\GitHub\WireMock.Net\examples\WireMock.Net.Console.NET6\__admin\mappings")
-            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
-            .Build();
-
-        await container.StartAsync().ConfigureAwait(false);
-
-        var logs = await container.GetLogsAsync(DateTime.Now.AddDays(-1)).ConfigureAwait(false);
-        Console.WriteLine("logs = " + logs.Stdout);
-
-        var restEaseApiClient = container.CreateWireMockAdminClient();
-
-        var settings = await restEaseApiClient.GetSettingsAsync();
-        Console.WriteLine("settings = " + JsonConvert.SerializeObject(settings, Formatting.Indented));
-
-        var mappings = await restEaseApiClient.GetMappingsAsync();
-        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
-
-        var client = container.CreateClient();
-        var result = await client.GetStringAsync("/static/mapping");
-        Console.WriteLine("result = " + result);
-
-        await container.StopAsync();
-
-        var sql = new MsSqlBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
-            .Build();
-    }
-}
--- a/examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj
+++ b/examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Testcontainers.MsSql" Version="3.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -23,12 +23,14 @@ internal class OpenApiPathsMapper
    private const string HeaderContentType = "Content-Type";

    private readonly WireMockOpenApiParserSettings _settings;
-    private readonly ExampleValueGenerator _exampleValueGenerator;
+    private readonly IExampleValueGenerator _exampleValueGenerator;
+    private readonly IExampleValueGenerator _regexExampleValueGenerator;

    public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
    {
        _settings = Guard.NotNull(settings);
        _exampleValueGenerator = new ExampleValueGenerator(settings);
+        _regexExampleValueGenerator = new RegexExampleValueGenerator(settings);
    }

    public IReadOnlyList<MappingModel> ToMappingModels(OpenApiPaths? paths, IList<OpenApiServer> servers)
@@ -37,18 +39,7 @@ internal class OpenApiPathsMapper
            .OrderBy(p => p.Key)
            .Select(p => MapPath(p.Key, p.Value, servers))
            .SelectMany(x => x)
-            .ToArray() ??
-               Array.Empty<MappingModel>();
-    }
-
-    private IReadOnlyList<MappingModel> MapPaths(OpenApiPaths? paths, IList<OpenApiServer> servers)
-    {
-        return paths?
-            .OrderBy(p => p.Key)
-            .Select(p => MapPath(p.Key, p.Value, servers))
-            .SelectMany(x => x)
-            .ToArray() ??
-               Array.Empty<MappingModel>();
+            .ToArray() ?? Array.Empty<MappingModel>();
    }

    private IReadOnlyList<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
@@ -280,54 +271,19 @@ internal class OpenApiPathsMapper
        return newPath;
    }

-    private string MapBasePath(IList<OpenApiServer>? servers)
-    {
-        if (servers == null || servers.Count == 0)
-        {
-            return string.Empty;
-        }
-
-        OpenApiServer server = servers.First();
-        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
-        {
-            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
-        }
-
-        return string.Empty;
-    }
-
-    private JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
-    {
-        if (any == null)
-        {
-            return null;
-        }
-
-        using var outputString = new StringWriter();
-        var writer = new OpenApiJsonWriter(outputString);
-        any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
-
-        if (any.AnyType == AnyType.Array)
-        {
-            return JArray.Parse(outputString.ToString());
-        }
-
-        return JObject.Parse(outputString.ToString());
-    }
-
    private IDictionary<string, object>? MapHeaders(string? responseContentType, IDictionary<string, OpenApiHeader>? headers)
    {
        var mappedHeaders = headers?.ToDictionary(
            item => item.Key,
            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern!
-        ) ?? new Dictionary<string, object>();
+        );

        if (!string.IsNullOrEmpty(responseContentType))
        {
            mappedHeaders.TryAdd(HeaderContentType, responseContentType!);
        }

-        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
+        return mappedHeaders?.Keys.Any() == true ? mappedHeaders : null;
    }

    private IList<ParamModel>? MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
@@ -366,28 +322,38 @@ internal class OpenApiPathsMapper
        return list.Any() ? list : null;
    }

-    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType type)
+    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType exampleValueType)
    {
-        return type switch
+        return exampleValueType switch
        {
            ExampleValueType.Value => new MatcherModel
            {
                Name = "ExactMatcher",
-                Pattern = GetExampleValueAsStringForSchemaType(schema),
+                Pattern = GetExampleValueAsStringForSchemaType(schema, exampleValueType),
+                IgnoreCase = _settings.IgnoreCaseExampleValues
+            },
+
+            ExampleValueType.Regex => new MatcherModel
+            {
+                Name = "RegexMatcher",
+                Pattern = GetExampleValueAsStringForSchemaType(schema, exampleValueType),
                IgnoreCase = _settings.IgnoreCaseExampleValues
            },

            _ => new MatcherModel
            {
                Name = "WildcardMatcher",
-                Pattern = "*"
+                Pattern = "*",
+                IgnoreCase = _settings.IgnoreCaseExampleValues
            }
        };
    }

-    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema)
+    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema, ExampleValueType exampleValueType)
    {
-        var value = _exampleValueGenerator.GetExampleValue(schema);
+        var value = exampleValueType == ExampleValueType.Regex ?
+            _regexExampleValueGenerator.GetExampleValue(schema) :
+            _exampleValueGenerator.GetExampleValue(schema);

        return value switch
        {
@@ -396,4 +362,39 @@ internal class OpenApiPathsMapper
            _ => value.ToString(),
        };
    }
+
+    private static string MapBasePath(IList<OpenApiServer>? servers)
+    {
+        if (servers == null || servers.Count == 0)
+        {
+            return string.Empty;
+        }
+
+        var server = servers.First();
+        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
+        {
+            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
+        }
+
+        return string.Empty;
+    }
+
+    private static JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
+    {
+        if (any == null)
+        {
+            return null;
+        }
+
+        using var outputString = new StringWriter();
+        var writer = new OpenApiJsonWriter(outputString);
+        any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+
+        if (any.AnyType == AnyType.Array)
+        {
+            return JArray.Parse(outputString.ToString());
+        }
+
+        return JObject.Parse(outputString.ToString());
+    }
 }
--- a/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
+++ b/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
@@ -1,7 +1,7 @@
 namespace WireMock.Net.OpenApiParser.Types;

 /// <summary>
-/// The example value to use
+/// The (example) value pattern to use.
 /// </summary>
 public enum ExampleValueType
 {
@@ -12,6 +12,11 @@ public enum ExampleValueType
    /// </summary>
    Value,

+    /// <summary>
+    /// Build a Regex based on the SchemaType.
+    /// </summary>
+    Regex,
+
    /// <summary>
    /// Just use a Wildcard (*) character.
    /// </summary>
--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -8,7 +8,7 @@ using WireMock.Net.OpenApiParser.Types;

 namespace WireMock.Net.OpenApiParser.Utils;

-internal class ExampleValueGenerator
+internal class ExampleValueGenerator : IExampleValueGenerator
 {
    private readonly IWireMockOpenApiParserExampleValues _exampleValues;

--- a/src/WireMock.Net.OpenApiParser/Utils/IExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/IExampleValueGenerator.cs
@@ -0,0 +1,8 @@
+using Microsoft.OpenApi.Models;
+
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal interface IExampleValueGenerator
+{
+    object GetExampleValue(OpenApiSchema? schema);
+}
--- a/src/WireMock.Net.OpenApiParser/Utils/RegexExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/RegexExampleValueGenerator.cs
@@ -0,0 +1,40 @@
+using Microsoft.OpenApi.Models;
+using Stef.Validation;
+using WireMock.Net.OpenApiParser.Extensions;
+using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
+
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal class RegexExampleValueGenerator : IExampleValueGenerator
+{
+    public RegexExampleValueGenerator(WireMockOpenApiParserSettings settings)
+    {
+        Guard.NotNull(settings);
+    }
+
+    public object GetExampleValue(OpenApiSchema? schema)
+    {
+        switch (schema?.GetSchemaType())
+        {
+            case SchemaType.Boolean:
+                return @"(true|false)";
+
+            case SchemaType.Integer:
+                return @"-?\d+";
+
+            case SchemaType.Number:
+                return @"[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?";
+
+            default:
+                return schema?.GetSchemaFormat() switch
+                {
+                    SchemaFormat.Date => @"(\d{4})-([01]\d)-([0-3]\d)",
+                    SchemaFormat.DateTime => @"(\d{4})-([01]\d)-([0-3]\d)T([0-2]\d):([0-5]\d):([0-5]\d)(\.\d+)?(Z|[+-][0-2]\d:[0-5]\d)",
+                    SchemaFormat.Byte => @"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)",
+                    SchemaFormat.Binary => @"[a-zA-Z0-9\+/]*={0,3}",
+                    _ => ".*"
+                };
+        }
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -9,6 +9,7 @@ using RamlToOpenApiConverter;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Mappers;
 using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;

 namespace WireMock.Net.OpenApiParser;

@@ -17,13 +18,20 @@ namespace WireMock.Net.OpenApiParser;
 /// </summary>
 public class WireMockOpenApiParser : IWireMockOpenApiParser
 {
+    private readonly WireMockOpenApiParserSettings _wireMockOpenApiParserSettings = new WireMockOpenApiParserSettings
+    {
+        HeaderPatternToUse = ExampleValueType.Regex,
+        QueryParameterPatternToUse = ExampleValueType.Regex,
+        PathPatternToUse = ExampleValueType.Regex
+    };
+
    private readonly OpenApiStreamReader _reader = new();

    /// <inheritdoc />
    [PublicAPI]
    public IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
    {
-        return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
+        return FromFile(path, _wireMockOpenApiParserSettings, out diagnostic);
    }

    /// <inheritdoc />
@@ -47,9 +55,9 @@ public class WireMockOpenApiParser : IWireMockOpenApiParser

    /// <inheritdoc />
    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
+    public IReadOnlyList<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
    {
-        return new OpenApiPathsMapper(settings ?? new WireMockOpenApiParserSettings()).ToMappingModels(document.Paths, document.Servers);
+        return new OpenApiPathsMapper(settings ?? _wireMockOpenApiParserSettings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
    }

    /// <inheritdoc  />
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
@@ -25,7 +24,7 @@ public static class StandAloneApp
    [PublicAPI]
    public static WireMockServer Start(WireMockServerSettings settings)
    {
-        Guard.NotNull(settings);
+        Guard.NotNull(settings, nameof(settings));

        var server = WireMockServer.Start(settings);

@@ -43,7 +42,7 @@ public static class StandAloneApp
    [PublicAPI]
    public static WireMockServer Start(string[] args, IWireMockLogger? logger = null)
    {
-        Guard.NotNull(args);
+        Guard.NotNull(args, nameof(args));

        if (TryStart(args, out var server, logger))
        {
@@ -62,9 +61,9 @@ public static class StandAloneApp
    [PublicAPI]
    public static bool TryStart(string[] args, [NotNullWhen(true)] out WireMockServer? server, IWireMockLogger? logger = null)
    {
-        Guard.NotNull(args);
+        Guard.NotNull(args, nameof(args));

-        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings, logger))
+        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
        {
            settings.Logger?.Info("Version [{0}]", Version);
            settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
--- a/src/WireMock.Net.Testcontainers/Models/ContainerInfo.cs
+++ b/src/WireMock.Net.Testcontainers/Models/ContainerInfo.cs
@@ -1,7 +0,0 @@
-namespace WireMock.Net.Testcontainers.Models;
-
-internal record ContainerInfo
-(
-    string Image,
-    string MappingsPath
-);
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Description>A fluent testcontainer builder for the Docker version of WireMock.Net</Description>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageTags>wiremock;docker;testcontainer;testcontainers</PackageTags>
-        <ProjectGuid>{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}</ProjectGuid>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <LangVersion>10</LangVersion>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="IsExternalInit" Version="1.0.3">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="3.2.0" />
-        <PackageReference Include="JetBrains.Annotations" VersionOverride="2022.3.1" PrivateAssets="All" Version="2022.3.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
-    </ItemGroup>
-</Project>
--- a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
@@ -1,66 +0,0 @@
-using Docker.DotNet.Models;
-using DotNet.Testcontainers.Builders;
-using DotNet.Testcontainers.Configurations;
-using JetBrains.Annotations;
-
-namespace WireMock.Net.Testcontainers;
-
-/// <inheritdoc cref="ContainerConfiguration" />
-[PublicAPI]
-public sealed class WireMockConfiguration : ContainerConfiguration
-{
-#pragma warning disable CS1591
-    public string? Username { get; }
-
-    public string? Password { get; }
-
-    public bool HasBasicAuthentication => !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);
-
-    public WireMockConfiguration(
-        string? username = null,
-        string? password = null
-    )
-    {
-        Username = username;
-        Password = password;
-    }
-#pragma warning restore CS1591
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
-    /// </summary>
-    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-    public WireMockConfiguration(IResourceConfiguration<CreateContainerParameters> resourceConfiguration) : base(resourceConfiguration)
-    {
-        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
-    /// </summary>
-    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-    public WireMockConfiguration(IContainerConfiguration resourceConfiguration) : base(resourceConfiguration)
-    {
-        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
-    /// </summary>
-    /// <param name="resourceConfiguration">The Docker resource configuration.</param>
-    public WireMockConfiguration(WireMockConfiguration resourceConfiguration) : this(new WireMockConfiguration(), resourceConfiguration)
-    {
-        // Passes the configuration upwards to the base implementations to create an updated immutable copy.
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockConfiguration" /> class.
-    /// </summary>
-    /// <param name="oldValue">The old Docker resource configuration.</param>
-    /// <param name="newValue">The new Docker resource configuration.</param>
-    public WireMockConfiguration(WireMockConfiguration oldValue, WireMockConfiguration newValue) : base(oldValue, newValue)
-    {
-        Username = BuildConfiguration.Combine(oldValue.Username, newValue.Username);
-        Password = BuildConfiguration.Combine(oldValue.Password, newValue.Password);
-    }
-}
--- a/src/WireMock.Net.Testcontainers/WireMockContainer.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainer.cs
@@ -1,110 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using DotNet.Testcontainers.Containers;
-using JetBrains.Annotations;
-using Microsoft.Extensions.Logging;
-using RestEase;
-using Stef.Validation;
-using WireMock.Client;
-
-namespace WireMock.Net.Testcontainers;
-
-/// <summary>
-/// A container for running WireMock in a docker environment.
-/// </summary>
-public sealed class WireMockContainer : DockerContainer
-{
-    internal const int ContainerPort = 80;
-
-    private readonly WireMockConfiguration _configuration;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
-    /// </summary>
-    /// <param name="configuration">The container configuration.</param>
-    /// <param name="logger">The logger.</param>
-    public WireMockContainer(WireMockConfiguration configuration, ILogger logger) : base(configuration, logger)
-    {
-        _configuration = Guard.NotNull(configuration);
-    }
-
-    /// <summary>
-    /// Gets the public Url.
-    /// </summary>
-    [PublicAPI]
-    public string GetPublicUrl() => GetPublicUri().ToString();
-
-    /// <summary>
-    /// Create a RestEase Admin client which can be used to call the admin REST endpoint.
-    /// </summary>
-    /// <returns>A <see cref="IWireMockAdminApi"/></returns>
-    [PublicAPI]
-    public IWireMockAdminApi CreateWireMockAdminClient()
-    {
-        ValidateIfRunning();
-
-        var api = RestClient.For<IWireMockAdminApi>(GetPublicUri());
-
-        if (_configuration.HasBasicAuthentication)
-        {
-            api.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{_configuration.Username}:{_configuration.Password}")));
-        }
-
-        return api;
-    }
-
-    /// <summary>
-    /// Create a <see cref="HttpClient"/> which can be used to call this instance.
-    /// <param name="handlers">
-    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
-    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
-    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
-    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
-    /// That is, the first entry is invoked first for an outbound request message but
-    /// last for an inbound response message.
-    /// </param>
-    /// </summary>
-    [PublicAPI]
-    public HttpClient CreateClient(params DelegatingHandler[] handlers)
-    {
-        ValidateIfRunning();
-
-        var client = HttpClientFactory.Create(handlers);
-        client.BaseAddress = GetPublicUri();
-        return client;
-    }
-
-    /// <summary>
-    /// Create a <see cref="HttpClient"/> (one for each URL) which can be used to call this instance.
-    /// <param name="innerHandler">The inner handler represents the destination of the HTTP message channel.</param>
-    /// <param name="handlers">
-    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
-    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
-    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
-    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
-    /// That is, the first entry is invoked first for an outbound request message but
-    /// last for an inbound response message.
-    /// </param>
-    /// </summary>
-    [PublicAPI]
-    public HttpClient CreateClient(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
-    {
-        ValidateIfRunning();
-
-        var client = HttpClientFactory.Create(innerHandler, handlers);
-        client.BaseAddress = GetPublicUri();
-        return client;
-    }
-
-    private void ValidateIfRunning()
-    {
-        if (State != TestcontainersStates.Running)
-        {
-            throw new InvalidOperationException("Unable to create HttpClient because the WireMock.Net is not yet running.");
-        }
-    }
-
-    private Uri GetPublicUri() => new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(ContainerPort)).Uri;
-}
--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -1,175 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Docker.DotNet.Models;
-using DotNet.Testcontainers.Builders;
-using DotNet.Testcontainers.Configurations;
-using JetBrains.Annotations;
-using Stef.Validation;
-using WireMock.Net.Testcontainers.Models;
-
-namespace WireMock.Net.Testcontainers;
-
-/// <summary>
-/// An specific fluent Docker container builder for WireMock.Net
-/// </summary>
-public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContainerBuilder, WireMockContainer, WireMockConfiguration>
-{
-    private readonly Dictionary<bool, ContainerInfo> _info = new()
-    {
-        { false, new ContainerInfo("sheyenrath/wiremock.net:latest", "/app/__admin/mappings") },
-        { true, new ContainerInfo("sheyenrath/wiremock.net-windows:latest", @"c:\app\__admin\mappings") }
-    };
-
-    private const string DefaultLogger = "WireMockConsoleLogger";
-
-    private readonly Lazy<Task<bool>> _isWindowsAsLazy = new(async () =>
-    {
-        using var dockerClientConfig = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientConfiguration();
-        using var dockerClient = dockerClientConfig.CreateClient();
-
-        var version = await dockerClient.System.GetVersionAsync();
-        return version.Os.IndexOf("Windows", StringComparison.OrdinalIgnoreCase) > -1;
-    });
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ContainerBuilder" /> class.
-    /// </summary>
-    public WireMockContainerBuilder() : this(new WireMockConfiguration())
-    {
-        DockerResourceConfiguration = Init().DockerResourceConfiguration;
-    }
-
-    /// <summary>
-    /// Automatically set the correct image (Linux or Windows) for WireMock which to create the container.
-    /// </summary>
-    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
-    [PublicAPI]
-    public WireMockContainerBuilder WithImage()
-    {
-        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
-        return WithImage(_info[isWindows].Image);
-    }
-
-    /// <summary>
-    /// Set the admin username and password for the container (basic authentication).
-    /// </summary>
-    /// <param name="username">The admin username.</param>
-    /// <param name="password">The admin password.</param>
-    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
-    public WireMockContainerBuilder WithAdminUserNameAndPassword(string username, string password)
-    {
-        Guard.NotNull(username);
-        Guard.NotNull(password);
-
-        if (string.IsNullOrEmpty(username) && string.IsNullOrEmpty(password))
-        {
-            return this;
-        }
-
-        return Merge(DockerResourceConfiguration, new WireMockConfiguration(username, password))
-            .WithCommand($"--AdminUserName {username}", $"--AdminPassword {password}");
-    }
-
-    /// <summary>
-    /// Use the WireMockNullLogger.
-    /// </summary>
-    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
-    [PublicAPI]
-    public WireMockContainerBuilder WithNullLogger()
-    {
-        return WithCommand("--WireMockLogger WireMockNullLogger");
-    }
-
-    /// <summary>
-    /// Defines if the static mappings should be read at startup (default set to false).
-    /// </summary>
-    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
-    [PublicAPI]
-    public WireMockContainerBuilder WithReadStaticMappings()
-    {
-        return WithCommand("--ReadStaticMappings true");
-    }
-
-    /// <summary>
-    /// Watch the static mapping files + folder for changes when running.
-    /// </summary>
-    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
-    [PublicAPI]
-    public WireMockContainerBuilder WithWatchStaticMappings(bool includeSubDirectories)
-    {
-        return WithCommand("--WatchStaticMappings true").WithCommand($"--WatchStaticMappingsInSubdirectories {includeSubDirectories}");
-    }
-
-    /// <summary>
-    /// Specifies the path for the (static) mapping json files.
-    /// </summary>
-    /// <param name="path">The path</param>
-    /// <returns></returns>
-    [PublicAPI]
-    public WireMockContainerBuilder WithMappings(string path)
-    {
-        Guard.NotNullOrEmpty(path);
-
-        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
-
-        return WithReadStaticMappings().WithBindMount(path, _info[isWindows].MappingsPath);
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="WireMockContainerBuilder" /> class.
-    /// </summary>
-    /// <param name="dockerResourceConfiguration">The Docker resource configuration.</param>
-    private WireMockContainerBuilder(WireMockConfiguration dockerResourceConfiguration) : base(dockerResourceConfiguration)
-    {
-        DockerResourceConfiguration = dockerResourceConfiguration;
-    }
-
-    /// <inheritdoc />
-    protected override WireMockConfiguration DockerResourceConfiguration { get; }
-
-    /// <inheritdoc />
-    public override WireMockContainer Build()
-    {
-        Validate();
-
-        return new WireMockContainer(DockerResourceConfiguration, TestcontainersSettings.Logger);
-    }
-
-    /// <inheritdoc />
-    protected override WireMockContainerBuilder Init()
-    {
-        var builder = base.Init();
-
-        // In case no image has been set, set the image using internal logic.
-        if (builder.DockerResourceConfiguration.Image == null)
-        {
-            builder = builder.WithImage();
-        }
-
-        var isWindows = _isWindowsAsLazy.Value.GetAwaiter().GetResult();
-        var waitForContainerOS = isWindows ? Wait.ForWindowsContainer() : Wait.ForUnixContainer();
-        return builder
-            .WithPortBinding(WireMockContainer.ContainerPort, true)
-            .WithCommand($"--WireMockLogger {DefaultLogger}")
-            .WithWaitStrategy(waitForContainerOS.UntilMessageIsLogged("By Stef Heyenrath"));
-    }
-
-    /// <inheritdoc />
-    protected override WireMockContainerBuilder Clone(IContainerConfiguration resourceConfiguration)
-    {
-        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
-    }
-
-    /// <inheritdoc />
-    protected override WireMockContainerBuilder Clone(IResourceConfiguration<CreateContainerParameters> resourceConfiguration)
-    {
-        return Merge(DockerResourceConfiguration, new WireMockConfiguration(resourceConfiguration));
-    }
-
-    /// <inheritdoc />
-    protected override WireMockContainerBuilder Merge(WireMockConfiguration oldValue, WireMockConfiguration newValue)
-    {
-        return new WireMockContainerBuilder(new WireMockConfiguration(oldValue, newValue));
-    }
-}
--- a/src/WireMock.Net/Extensions/DictionaryExtensions.cs
+++ b/src/WireMock.Net/Extensions/DictionaryExtensions.cs
@@ -1,29 +0,0 @@
-using System.Collections;
-using System.Diagnostics.CodeAnalysis;
-using Stef.Validation;
-
-namespace WireMock.Extensions;
-
-internal static class DictionaryExtensions
-{
-    public static bool TryGetStringValue(this IDictionary dictionary, string key, [NotNullWhen(true)] out string? value)
-    {
-        Guard.NotNull(dictionary);
-        
-        if (dictionary[key] is string valueIsString)
-        {
-            value = valueIsString;
-            return true;
-        }
-
-        var valueToString = dictionary[key]?.ToString();
-        if (valueToString != null)
-        {
-            value = valueToString;
-            return true;
-        }
-
-        value = default;
-        return false;
-    }
-}
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -5,18 +5,12 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
 using Stef.Validation;
-using WireMock.Constants;
 using WireMock.Types;

 namespace WireMock.Http;

 internal static class HttpRequestMessageHelper
 {
-    private static readonly IDictionary<string, bool> ContentLengthHeaderAllowed = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase)
-    {
-        { HttpRequestMethod.HEAD, true }
-    };
-
    internal static HttpRequestMessage Create(IRequestMessage requestMessage, string url)
    {
        Guard.NotNull(requestMessage);
@@ -56,19 +50,7 @@ internal static class HttpRequestMessageHelper
            return httpRequestMessage;
        }

-        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host };
-
-        var contentLengthHeaderAllowed = ContentLengthHeaderAllowed.TryGetValue(requestMessage.Method, out var allowed) && allowed;
-        if (contentLengthHeaderAllowed)
-        {
-            // Set Content to empty ByteArray to be able to set the Content-Length on the content in case of a HEAD method.
-            httpRequestMessage.Content ??= new ByteArrayContent(EmptyArray<byte>.Value);
-        }
-        else
-        {
-            excludeHeaders.Add(HttpKnownHeaderNames.ContentLength);
-        }
-
+        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host, HttpKnownHeaderNames.ContentLength };
        if (contentType != null)
        {
            // Content-Type should be set on the content
--- a/src/WireMock.Net/Server/WireMockServer.OpenApiParser.cs
+++ b/src/WireMock.Net/Server/WireMockServer.OpenApiParser.cs
@@ -2,20 +2,39 @@
 using System;
 using System.Linq;
 using System.Net;
+using Newtonsoft.Json;
 using WireMock.Net.OpenApiParser;
+using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
+using WireMock.Serialization;
 #endif

 namespace WireMock.Server;

 public partial class WireMockServer
 {
+#if OPENAPIPARSER
+    private readonly WireMockOpenApiParserSettings _openApiParserSettings = new WireMockOpenApiParserSettings
+    {
+        PathPatternToUse = ExampleValueType.Regex,
+        HeaderPatternToUse = ExampleValueType.Regex,
+        QueryParameterPatternToUse = ExampleValueType.Regex
+    };
+#endif
+
    private IResponseMessage OpenApiConvertToMappings(IRequestMessage requestMessage)
    {
 #if OPENAPIPARSER
        try
        {
            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body, out var diagnostic);
-            return diagnostic.Errors.Any() ? ToJson(diagnostic, false, HttpStatusCode.BadRequest) : ToJson(mappingModels);
+            if (diagnostic.Errors.Any())
+            {
+                var diagnosticAsJson = JsonConvert.SerializeObject(diagnostic, JsonSerializationConstants.JsonSerializerSettingsDefault);
+                _settings.Logger.Warn("OpenApiError(s) while converting OpenAPI specification to MappingModel(s) : {0}", diagnosticAsJson);
+            }
+
+            return ToJson(mappingModels);
        }
        catch (Exception e)
        {
@@ -35,7 +54,8 @@ public partial class WireMockServer
            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body, out var diagnostic);
            if (diagnostic.Errors.Any())
            {
-                return ToJson(diagnostic, false, HttpStatusCode.BadRequest);
+                var diagnosticAsJson = JsonConvert.SerializeObject(diagnostic, JsonSerializationConstants.JsonSerializerSettingsDefault);
+                _settings.Logger.Warn("OpenApiError(s) while converting OpenAPI specification to MappingModel(s) : {0}", diagnosticAsJson);
            }

            ConvertMappingsAndRegisterAsRespondProvider(mappingModels);
--- a/src/WireMock.Net/Settings/SimpleCommandLineParser.cs
+++ b/src/WireMock.Net/Settings/SimpleCommandLineParser.cs
@@ -1,21 +1,17 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using WireMock.Extensions;

 namespace WireMock.Settings;

 // Based on http://blog.gauffin.org/2014/12/simple-command-line-parser/
-internal class SimpleSettingsParser
+internal class SimpleCommandLineParser
 {
    private const string Sigil = "--";
-    private const string Prefix = $"{nameof(WireMockServerSettings)}__";
-    private static readonly int PrefixLength = Prefix.Length;

    private IDictionary<string, string[]> Arguments { get; } = new Dictionary<string, string[]>(StringComparer.OrdinalIgnoreCase);

-    public void Parse(string[] arguments, IDictionary? environment = null)
+    public void Parse(string[] arguments)
    {
        string currentName = string.Empty;

@@ -48,18 +44,6 @@ internal class SimpleSettingsParser
        {
            Arguments[currentName] = values.ToArray();
        }
-
-        // Now also parse environment
-        if (environment != null)
-        {
-            foreach (string key in environment.Keys)
-            {
-                if (key.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase) && environment.TryGetStringValue(key, out var value))
-                {
-                    Arguments[key.Substring(PrefixLength)] = value.Split(' ').ToArray();
-                }
-            }
-        }
    }

    public bool Contains(string name)
@@ -101,16 +85,7 @@ internal class SimpleSettingsParser
        return Contains(name);
    }

-    public int? GetIntValue(string name)
-    {
-        return GetValue<int?>(name, values =>
-        {
-            var value = values.FirstOrDefault();
-            return !string.IsNullOrEmpty(value) ? int.Parse(value) : null;
-        }, null);
-    }
-
-    public int GetIntValue(string name, int defaultValue)
+    public int? GetIntValue(string name, int? defaultValue = null)
    {
        return GetValue(name, values =>
        {
--- a/src/WireMock.Net/Settings/WireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettings.cs
@@ -22,8 +22,6 @@ namespace WireMock.Settings;
 /// </summary>
 public class WireMockServerSettings
 {
-    internal const int DefaultStartTimeout = 10000;
-
    /// <summary>
    /// Gets or sets the http port.
    /// </summary>
@@ -83,7 +81,7 @@ public class WireMockServerSettings
    /// StartTimeout
    /// </summary>
    [PublicAPI]
-    public int StartTimeout { get; set; } = DefaultStartTimeout;
+    public int StartTimeout { get; set; } = 10000;

    /// <summary>
    /// Allow Partial Mapping (default set to false).
--- a/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
@@ -19,16 +18,16 @@ public static class WireMockServerSettingsParser
    /// Parse commandline arguments into WireMockServerSettings.
    /// </summary>
    /// <param name="args">The commandline arguments</param>
-    /// <param name="environment">The environment settings (optional)</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, IDictionary? environment, [NotNullWhen(true)] out WireMockServerSettings? settings, IWireMockLogger? logger = null)
+    public static bool TryParseArguments(string[] args, [NotNullWhen(true)] out WireMockServerSettings? settings,
+        IWireMockLogger? logger = null)
    {
        Guard.HasNoNulls(args);

-        var parser = new SimpleSettingsParser();
-        parser.Parse(args, environment);
+        var parser = new SimpleCommandLineParser();
+        parser.Parse(args);

        if (parser.GetBoolSwitchValue("help"))
        {
@@ -56,7 +55,6 @@ public static class WireMockServerSettingsParser
            RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
            SaveUnmatchedRequests = parser.GetBoolValue(nameof(WireMockServerSettings.SaveUnmatchedRequests)),
            StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
-            StartTimeout = parser.GetIntValue(nameof(WireMockServerSettings.StartTimeout), WireMockServerSettings.DefaultStartTimeout),
            ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
            UseRegexExtended = parser.GetBoolValue(nameof(WireMockServerSettings.UseRegexExtended), true),
            WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
@@ -81,7 +79,8 @@ public static class WireMockServerSettingsParser
        return true;
    }

-    private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger, SimpleSettingsParser parser)
+    private static void ParseLoggerSettings(WireMockServerSettings settings, IWireMockLogger? logger,
+        SimpleCommandLineParser parser)
    {
        var loggerType = parser.GetStringValue("WireMockLogger");
        switch (loggerType)
@@ -104,7 +103,7 @@ public static class WireMockServerSettingsParser
        }
    }

-    private static void ParseProxyAndRecordSettings(WireMockServerSettings settings, SimpleSettingsParser parser)
+    private static void ParseProxyAndRecordSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
    {
        var proxyUrl = parser.GetStringValue("ProxyURL") ?? parser.GetStringValue("ProxyUrl");
        if (!string.IsNullOrEmpty(proxyUrl))
@@ -136,7 +135,7 @@ public static class WireMockServerSettingsParser
        }
    }

-    private static void ParsePortSettings(WireMockServerSettings settings, SimpleSettingsParser parser)
+    private static void ParsePortSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
    {
        if (parser.Contains(nameof(WireMockServerSettings.Port)))
        {
@@ -148,7 +147,7 @@ public static class WireMockServerSettingsParser
        }
    }

-    private static void ParseCertificateSettings(WireMockServerSettings settings, SimpleSettingsParser parser)
+    private static void ParseCertificateSettings(WireMockServerSettings settings, SimpleCommandLineParser parser)
    {
        var certificateSettings = new WireMockCertificateSettings
        {
@@ -164,7 +163,7 @@ public static class WireMockServerSettingsParser
        }
    }

-    private static void ParseWebProxyAddressSettings(ProxyAndRecordSettings settings, SimpleSettingsParser parser)
+    private static void ParseWebProxyAddressSettings(ProxyAndRecordSettings settings, SimpleCommandLineParser parser)
    {
        string? proxyAddress = parser.GetStringValue("WebProxyAddress");
        if (!string.IsNullOrEmpty(proxyAddress))
@@ -178,7 +177,7 @@ public static class WireMockServerSettingsParser
        }
    }

-    private static void ParseProxyUrlReplaceSettings(ProxyAndRecordSettings settings, SimpleSettingsParser parser)
+    private static void ParseProxyUrlReplaceSettings(ProxyAndRecordSettings settings, SimpleCommandLineParser parser)
    {
        var proxyUrlReplaceOldValue = parser.GetStringValue("ProxyUrlReplaceOldValue");
        var proxyUrlReplaceNewValue = parser.GetStringValue("ProxyUrlReplaceNewValue");
--- a/src/WireMock.Net/Util/CSharpFormatter.cs
+++ b/src/WireMock.Net/Util/CSharpFormatter.cs
@@ -138,7 +138,7 @@ internal static class CSharpFormatter
            return "\"\"";
        }

-        if (value.Contains('\n'))
+        if (value.Contains("\n"))
        {
            var escapedValue = value?.Replace("\"", "\"\"") ?? string.Empty;
            return $"@\"{escapedValue}\"";
--- a/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs
+++ b/test/WireMock.Net.Tests/Extensions/DictionaryExtensionsTests.cs
@@ -1,51 +0,0 @@
-using System.Collections;
-using FluentAssertions;
-using WireMock.Extensions;
-using Xunit;
-
-namespace WireMock.Net.Tests.Extensions;
-
-public class DictionaryExtensionsTests
-{
-    [Fact]
-    public void TryGetStringValue_WhenKeyExistsAndValueIsString_ReturnsTrueAndStringValue()
-    {
-        // Arrange
-        var dictionary = new Hashtable { { "key", "value" } };
-
-        // Act
-        var result = dictionary.TryGetStringValue("key", out var value);
-
-        // Assert
-        result.Should().BeTrue();
-        value.Should().Be("value");
-    }
-
-    [Fact]
-    public void TryGetStringValue_WhenKeyExistsAndValueIsNotString_ReturnsTrueAndStringValue()
-    {
-        // Arrange
-        var dictionary = new Hashtable { { "key", 123 } };
-
-        // Act
-        var result = dictionary.TryGetStringValue("key", out var value);
-
-        // Assert
-        result.Should().BeTrue();
-        value.Should().Be("123");
-    }
-
-    [Fact]
-    public void TryGetStringValue_WhenKeyDoesNotExist_ReturnsFalseAndNull()
-    {
-        // Arrange
-        var dictionary = new Hashtable { { "otherKey", "value" } };
-
-        // Act
-        var result = dictionary.TryGetStringValue("key", out var value);
-
-        // Assert
-        result.Should().BeFalse();
-        value.Should().BeNull();
-    }
-}
--- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
+++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
@@ -1,9 +1,7 @@
 using NFluent;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using FluentAssertions;
 using WireMock.Http;
 using WireMock.Models;
 using WireMock.Types;
@@ -162,29 +160,4 @@ public class HttpRequestMessageHelperTests
        // Assert
        Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/xml; charset=Ascii");
    }
-
-    [Theory]
-    [InlineData("HEAD", true)]
-    [InlineData("GET", false)]
-    [InlineData("PUT", false)]
-    [InlineData("POST", false)]
-    [InlineData("DELETE", false)]
-    [InlineData("TRACE", false)]
-    [InlineData("OPTIONS", false)]
-    [InlineData("CONNECT", false)]
-    [InlineData("PATCH", false)]
-    public void HttpRequestMessageHelper_Create_ContentLengthAllowedForMethod(string method, bool resultShouldBe)
-    {
-        // Arrange
-        var key = "Content-Length";
-        var value = 1234;
-        var headers = new Dictionary<string, string[]> { { key, new[] { "1234" } } };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), method, ClientIp, null, headers);
-
-        // Act
-        var message = HttpRequestMessageHelper.Create(request, "http://url");
-
-        // Assert
-        message.Content?.Headers.ContentLength.Should().Be(resultShouldBe ? value : null);
-    }
 }
--- a/test/WireMock.Net.Tests/Pact/PactTests.cs
+++ b/test/WireMock.Net.Tests/Pact/PactTests.cs
@@ -42,14 +42,7 @@ public class PactTests
                    })
            );

-        var folder = Path.Combine("../../../", "Pact", "files");
-        var file = "pact-get.json";
-
-        // Act
-        server.SavePact(folder, file);
-
-        // Assert
-        File.ReadAllBytes(Path.Combine(folder, file)).Length.Should().BeGreaterThan(1);
+        server.SavePact(Path.Combine("../../../", "Pact", "files"), "pact-get.json");
    }

    [Fact]
@@ -208,13 +201,6 @@ public class PactTests
                    })
            );

-        var folder = Path.Combine("../../../", "Pact", "files");
-        var file = "pact-multiple.json";
-
-        // Act
-        server.SavePact(folder, file);
-
-        // Assert
-        File.ReadAllBytes(Path.Combine(folder, file)).Length.Should().BeGreaterThan(1);
+        server.SavePact(Path.Combine("../../../", "Pact", "files"), "pact-multiple.json");
    }
 }
--- a/test/WireMock.Net.Tests/Settings/SimpleCommandLineParserTests.cs
+++ b/test/WireMock.Net.Tests/Settings/SimpleCommandLineParserTests.cs
@@ -0,0 +1,102 @@
+using NFluent;
+using WireMock.Settings;
+using Xunit;
+
+namespace WireMock.Net.Tests.Settings;
+
+public class SimpleCommandLineParserTests
+{
+    private readonly SimpleCommandLineParser _parser;
+
+    public SimpleCommandLineParserTests()
+    {
+        _parser = new SimpleCommandLineParser();
+    }
+
+    [Fact]
+    public void SimpleCommandLineParser_Parse_Arguments()
+    {
+        // Assign
+        _parser.Parse(new[] { "--test1", "one", "--test2", "two", "--test3", "three" });
+
+        // Act
+        string? value1 = _parser.GetStringValue("test1");
+        string? value2 = _parser.GetStringValue("test2");
+        string? value3 = _parser.GetStringValue("test3");
+
+        // Assert
+        Check.That(value1).IsEqualTo("one");
+        Check.That(value2).IsEqualTo("two");
+        Check.That(value3).IsEqualTo("three");
+    }
+
+    [Fact]
+    public void SimpleCommandLineParser_Parse_ArgumentsAsCombinedKeyAndValue()
+    {
+        // Assign
+        _parser.Parse(new[] { "--test1 one", "--test2 two", "--test3 three" });
+
+        // Act
+        string? value1 = _parser.GetStringValue("test1");
+        string? value2 = _parser.GetStringValue("test2");
+        string? value3 = _parser.GetStringValue("test3");
+
+        // Assert
+        Check.That(value1).IsEqualTo("one");
+        Check.That(value2).IsEqualTo("two");
+        Check.That(value3).IsEqualTo("three");
+    }
+
+    [Fact]
+    public void SimpleCommandLineParser_Parse_ArgumentsMixed()
+    {
+        // Assign
+        _parser.Parse(new[] { "--test1 one", "--test2", "two", "--test3 three" });
+
+        // Act
+        string? value1 = _parser.GetStringValue("test1");
+        string? value2 = _parser.GetStringValue("test2");
+        string? value3 = _parser.GetStringValue("test3");
+
+        // Assert
+        Check.That(value1).IsEqualTo("one");
+        Check.That(value2).IsEqualTo("two");
+        Check.That(value3).IsEqualTo("three");
+    }
+
+    [Fact]
+    public void SimpleCommandLineParser_Parse_GetBoolValue()
+    {
+        // Assign
+        _parser.Parse(new[] { "'--test1", "false'", "--test2 true" });
+
+        // Act
+        bool value1 = _parser.GetBoolValue("test1");
+        bool value2 = _parser.GetBoolValue("test2");
+        bool value3 = _parser.GetBoolValue("test3", true);
+
+        // Assert
+        Check.That(value1).IsEqualTo(false);
+        Check.That(value2).IsEqualTo(true);
+        Check.That(value3).IsEqualTo(true);
+    }
+
+    [Fact]
+    public void SimpleCommandLineParser_Parse_GetIntValue()
+    {
+        // Assign
+        _parser.Parse(new[] { "--test1", "42", "--test2 55" });
+
+        // Act
+        int? value1 = _parser.GetIntValue("test1");
+        int? value2 = _parser.GetIntValue("test2");
+        int? value3 = _parser.GetIntValue("test3", 100);
+        int? value4 = _parser.GetIntValue("test4");
+
+        // Assert
+        Check.That(value1).IsEqualTo(42);
+        Check.That(value2).IsEqualTo(55);
+        Check.That(value3).IsEqualTo(100);
+        Check.That(value4).IsNull();
+    }
+}
--- a/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs
+++ b/test/WireMock.Net.Tests/Settings/SimpleSettingsParserTests.cs
@@ -1,177 +0,0 @@
-using System.Collections.Generic;
-using FluentAssertions;
-using NFluent;
-using WireMock.Settings;
-using WireMock.Types;
-using Xunit;
-
-namespace WireMock.Net.Tests.Settings;
-
-public class SimpleSettingsParserTests
-{
-    private readonly SimpleSettingsParser _parser;
-
-    public SimpleSettingsParserTests()
-    {
-        _parser = new SimpleSettingsParser();
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_Arguments()
-    {
-        // Assign
-        _parser.Parse(new[] { "--test1", "one", "--test2", "2", "--test3", "3", "--test4", "true", "--test5", "Https" });
-
-        // Act
-        string? stringValue = _parser.GetStringValue("test1");
-        int? intOptional = _parser.GetIntValue("test2");
-        int intWithDefault = _parser.GetIntValue("test3", 42);
-        bool? boolWithDefault = _parser.GetBoolValue("test4");
-        HostingScheme? enumOptional = _parser.GetEnumValue<HostingScheme>("test5");
-        HostingScheme enumWithDefault = _parser.GetEnumValue("test99", HostingScheme.HttpAndHttps);
-
-        // Assert
-        stringValue.Should().Be("one");
-        intOptional.Should().Be(2);
-        intWithDefault.Should().Be(3);
-        boolWithDefault.Should().Be(true);
-        enumOptional.Should().Be(HostingScheme.Https);
-        enumWithDefault.Should().Be(HostingScheme.HttpAndHttps);
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_Environment()
-    {
-        // Assign
-        var env = new Dictionary<string, string>
-        {
-            { "WireMockServerSettings__test1", "one" },
-            { "WireMockServerSettings__test2", "two" }
-        };
-        _parser.Parse(new string[0], env);
-
-        // Act
-        string? value1 = _parser.GetStringValue("test1");
-        string? value2 = _parser.GetStringValue("test2");
-
-        // Assert
-        Check.That(value1).IsEqualTo("one");
-        Check.That(value2).IsEqualTo("two");
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_ArgumentsAsCombinedKeyAndValue()
-    {
-        // Assign
-        _parser.Parse(new[] { "--test1 one", "--test2 two", "--test3 three" });
-
-        // Act
-        string? value1 = _parser.GetStringValue("test1");
-        string? value2 = _parser.GetStringValue("test2");
-        string? value3 = _parser.GetStringValue("test3");
-
-        // Assert
-        Check.That(value1).IsEqualTo("one");
-        Check.That(value2).IsEqualTo("two");
-        Check.That(value3).IsEqualTo("three");
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_ArgumentsMixed()
-    {
-        // Assign
-        _parser.Parse(new[] { "--test1 one", "--test2", "two", "--test3 three" });
-
-        // Act
-        string? value1 = _parser.GetStringValue("test1");
-        string? value2 = _parser.GetStringValue("test2");
-        string? value3 = _parser.GetStringValue("test3");
-
-        // Assert
-        Check.That(value1).IsEqualTo("one");
-        Check.That(value2).IsEqualTo("two");
-        Check.That(value3).IsEqualTo("three");
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_GetBoolValue()
-    {
-        // Assign
-        _parser.Parse(new[] { "'--test1", "false'", "--test2 true" });
-
-        // Act
-        bool value1 = _parser.GetBoolValue("test1");
-        bool value2 = _parser.GetBoolValue("test2");
-        bool value3 = _parser.GetBoolValue("test3", true);
-
-        // Assert
-        Check.That(value1).IsEqualTo(false);
-        Check.That(value2).IsEqualTo(true);
-        Check.That(value3).IsEqualTo(true);
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_Environment_GetBoolValue()
-    {
-        // Assign
-        var env = new Dictionary<string, string>
-        {
-            { "WireMockServerSettings__test1", "false" },
-            { "WireMockServerSettings__test2", "true" }
-        };
-        _parser.Parse(new string[0], env);
-
-        // Act
-        bool value1 = _parser.GetBoolValue("test1");
-        bool value2 = _parser.GetBoolValue("test2");
-        bool value3 = _parser.GetBoolValue("test3", true);
-
-        // Assert
-        Check.That(value1).IsEqualTo(false);
-        Check.That(value2).IsEqualTo(true);
-        Check.That(value3).IsEqualTo(true);
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_GetIntValue()
-    {
-        // Assign
-        _parser.Parse(new[] { "--test1", "42", "--test2 55" });
-
-        // Act
-        int? value1 = _parser.GetIntValue("test1");
-        int? value2 = _parser.GetIntValue("test2");
-        int? value3 = _parser.GetIntValue("test3", 100);
-        int? value4 = _parser.GetIntValue("test4");
-
-        // Assert
-        Check.That(value1).IsEqualTo(42);
-        Check.That(value2).IsEqualTo(55);
-        Check.That(value3).IsEqualTo(100);
-        Check.That(value4).IsNull();
-    }
-
-    [Fact]
-    public void SimpleCommandLineParser_Parse_Environment_GetIntValue()
-    {
-        // Assign
-        var env = new Dictionary<string, string>
-        {
-            { "WireMockServerSettings__test1", "42" },
-            { "WireMockServerSETTINGS__TEST2", "55" }
-        };
-        _parser.Parse(new string[0], env);
-
-        // Act
-        int? value1 = _parser.GetIntValue("test1");
-        int? value2 = _parser.GetIntValue("test2");
-        int? value3 = _parser.GetIntValue("test3", 100);
-        int? value4 = _parser.GetIntValue("test4");
-
-        // Assert
-        Check.That(value1).IsEqualTo(42);
-        Check.That(value2).IsEqualTo(55);
-        Check.That(value3).IsEqualTo(100);
-        Check.That(value4).IsNull();
-    }
-}
--- a/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs
+++ b/test/WireMock.Net.Tests/WireMockServer.AdminFiles.cs
@@ -1,210 +1,215 @@
+using Moq;
+using NFluent;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
-using FluentAssertions;
-using Moq;
 using WireMock.Handlers;
 using WireMock.Server;
 using WireMock.Settings;
 using Xunit;

-namespace WireMock.Net.Tests;
-
-public class WireMockServerAdminFilesTests
+namespace WireMock.Net.Tests
 {
-    private readonly HttpClient _client = new HttpClient();
-
-    [Fact]
-    public async Task WireMockServer_Admin_Files_Post_Ascii()
+    public class WireMockServerAdminFilesTests
    {
-        // Arrange
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.GetMappingFolder()).Returns("__admin/mappings");
-        filesystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(true);
-        filesystemHandlerMock.Setup(fs => fs.WriteFile(It.IsAny<string>(), It.IsAny<byte[]>()));
+        private readonly HttpClient _client = new HttpClient();

-        var server = WireMockServer.Start(new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_Admin_Files_Post_Ascii()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.GetMappingFolder()).Returns("__admin/mappings");
+            filesystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(true);
+            filesystemHandlerMock.Setup(fs => fs.WriteFile(It.IsAny<string>(), It.IsAny<byte[]>()));

-        var multipartFormDataContent = new MultipartFormDataContent();
-        multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
-        multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Act
-        var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);
+            var multipartFormDataContent = new MultipartFormDataContent();
+            multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
+            multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));

-        // Assert
-        httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.OK);
+            // Act
+            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.FolderExists(It.IsAny<string>()), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.WriteFile(It.Is<string>(p => p == "filename.txt"), It.IsAny<byte[]>()), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
-    }
+            // Assert
+            Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);
+            Check.That(server.LogEntries.Count().Equals(1));

-    [Fact]
-    public async Task WireMockServer_Admin_Files_Post_MappingFolderDoesNotExistsButWillBeCreated()
-    {
-        // Arrange
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.GetMappingFolder()).Returns("x");
-        filesystemHandlerMock.Setup(fs => fs.CreateFolder(It.IsAny<string>()));
-        filesystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(false);
-        filesystemHandlerMock.Setup(fs => fs.WriteFile(It.IsAny<string>(), It.IsAny<byte[]>()));
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.FolderExists(It.IsAny<string>()), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.WriteFile(It.Is<string>(p => p == "filename.txt"), It.IsAny<byte[]>()), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }

-        var server = WireMockServer.Start(new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_Admin_Files_Post_MappingFolderDoesNotExistsButWillBeCreated()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.GetMappingFolder()).Returns("x");
+            filesystemHandlerMock.Setup(fs => fs.CreateFolder(It.IsAny<string>()));
+            filesystemHandlerMock.Setup(fs => fs.FolderExists(It.IsAny<string>())).Returns(false);
+            filesystemHandlerMock.Setup(fs => fs.WriteFile(It.IsAny<string>(), It.IsAny<byte[]>()));

-        var multipartFormDataContent = new MultipartFormDataContent();
-        multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
-        multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Act
-        var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);
+            var multipartFormDataContent = new MultipartFormDataContent();
+            multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
+            multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));

-        // Assert
-        httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.OK);
+            // Act
+            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.FolderExists(It.IsAny<string>()), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.CreateFolder(It.Is<string>(p => p == "x")), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.WriteFile(It.Is<string>(p => p == "filename.txt"), It.IsAny<byte[]>()), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
-    }
+            // Assert
+            Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);

-    [Fact]
-    public async Task WireMockServer_Admin_Files_GetAscii()
-    {
-        // Arrange
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
-        filesystemHandlerMock.Setup(fs => fs.ReadFile(It.IsAny<string>())).Returns(Encoding.ASCII.GetBytes("Here's a string."));
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.FolderExists(It.IsAny<string>()), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.CreateFolder(It.Is<string>(p => p == "x")), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.WriteFile(It.Is<string>(p => p == "filename.txt"), It.IsAny<byte[]>()), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }

-        var server = WireMockServer.Start(new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_Admin_Files_GetAscii()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
+            filesystemHandlerMock.Setup(fs => fs.ReadFile(It.IsAny<string>())).Returns(Encoding.ASCII.GetBytes("Here's a string."));

-        var multipartFormDataContent = new MultipartFormDataContent();
-        multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
-        multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Act
-        var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt").ConfigureAwait(false);
+            var multipartFormDataContent = new MultipartFormDataContent();
+            multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
+            multipartFormDataContent.Add(new StreamContent(new MemoryStream()));

-        // Assert
-        httpResponseMessageGet.StatusCode.Should().Be(HttpStatusCode.OK);
+            // Act
+            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt").ConfigureAwait(false);

-        var result = await httpResponseMessageGet.Content.ReadAsStringAsync().ConfigureAwait(false);
-        result.Should().Be("Here's a string.");
+            // Assert
+            Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.ReadFile(It.Is<string>(p => p == "filename.txt")), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.txt")), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
-    }
+            Check.That(httpResponseMessageGet.Content.ReadAsStringAsync().Result).Equals("Here's a string.");

-    [Fact]
-    public async Task WireMockServer_Admin_Files_GetUTF16()
-    {
-        // Arrange
-        byte[] symbol = Encoding.UTF32.GetBytes(char.ConvertFromUtf32(0x1D161));
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
-        filesystemHandlerMock.Setup(fs => fs.ReadFile(It.IsAny<string>())).Returns(symbol);
+            Check.That(server.LogEntries.Count().Equals(2));

-        var server = WireMockServer.Start(new WireMockServerSettings
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.ReadFile(It.Is<string>(p => p == "filename.txt")), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.txt")), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }
+
+        [Fact]
+        public async Task WireMockServer_Admin_Files_GetUTF16()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            byte[] symbol = Encoding.UTF32.GetBytes(char.ConvertFromUtf32(0x1D161));
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
+            filesystemHandlerMock.Setup(fs => fs.ReadFile(It.IsAny<string>())).Returns(symbol);

-        var multipartFormDataContent = new MultipartFormDataContent();
-        multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
-        multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Act
-        var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin").ConfigureAwait(false);
+            var multipartFormDataContent = new MultipartFormDataContent();
+            multipartFormDataContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
+            multipartFormDataContent.Add(new StreamContent(new MemoryStream()));

-        // Assert
-        httpResponseMessageGet.StatusCode.Should().Be(HttpStatusCode.OK);
+            // Act
+            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin").ConfigureAwait(false);

-        var result = await httpResponseMessageGet.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
-        result.Should().BeEquivalentTo(symbol);
+            // Assert
+            Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);
+            Check.That(httpResponseMessageGet.Content.ReadAsByteArrayAsync().Result).Equals(symbol);
+            Check.That(server.LogEntries.Count().Equals(2));

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.ReadFile(It.Is<string>(p => p == "filename.bin")), Times.Once);
-        filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.bin")), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
-    }
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.ReadFile(It.Is<string>(p => p == "filename.bin")), Times.Once);
+            filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.bin")), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }

-    [Fact]
-    public async Task WireMockServer_Admin_Files_Head()
-    {
-        // Arrange
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);
-
-        var server = WireMockServer.Start(new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_Admin_Files_Head()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(true);

-        // Act
-        var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
-        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
-        var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Assert
-        httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.NoContent);
+            // Act
+            var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
+            var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.FileExists(It.IsAny<string>()), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
-    }
+            // Assert
+            Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NoContent);
+            Check.That(server.LogEntries.Count().Equals(1));

-    [Fact]
-    public async Task WireMockServer_Admin_Files_Head_FileDoesNotExistsReturns404()
-    {
-        // Arrange
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(false);
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.FileExists(It.IsAny<string>()), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }

-        var server = WireMockServer.Start(new WireMockServerSettings
+        [Fact]
+        public async Task WireMockServer_Admin_Files_Head_FileDoesNotExistsReturns404()
        {
-            UseSSL = false,
-            StartAdminInterface = true,
-            FileSystemHandler = filesystemHandlerMock.Object
-        });
+            // Arrange
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            filesystemHandlerMock.Setup(fs => fs.FileExists(It.IsAny<string>())).Returns(false);

-        // Act
-        var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
-        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
-        var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                UseSSL = false,
+                StartAdminInterface = true,
+                FileSystemHandler = filesystemHandlerMock.Object
+            });

-        // Assert
-        httpResponseMessage.StatusCode.Should().Be(HttpStatusCode.NotFound);
+            // Act
+            var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
+            var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
+            var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);

-        // Verify
-        filesystemHandlerMock.Verify(fs => fs.FileExists(It.IsAny<string>()), Times.Once);
-        filesystemHandlerMock.VerifyNoOtherCalls();
+            // Assert
+            Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NotFound);
+            Check.That(server.LogEntries.Count().Equals(1));
+
+            // Verify
+            filesystemHandlerMock.Verify(fs => fs.FileExists(It.IsAny<string>()), Times.Once);
+            filesystemHandlerMock.VerifyNoOtherCalls();
+        }
    }
 }
Author	SHA1	Message	Date
Stef Heyenrath	dabe3a2a10	Merge branch 'master' into stef-IgnoreOpenApiErrors	2023-06-03 17:01:15 +02:00
Stef Heyenrath	b609191095	.	2023-06-01 21:14:13 +02:00
Stef Heyenrath	b1ae9aaf46	Merge branch 'master' into stef-IgnoreOpenApiErrors	2023-06-01 21:04:21 +02:00
Stef Heyenrath	ad3ef83c5e	.	2023-05-30 21:41:30 +02:00
Stef Heyenrath	35ffbbc7d9	RegexExampleValueGenerator	2023-05-28 23:10:09 +02:00