ExactMatcher : IgnoreCase (#817)

* ... * mm * fix some null warnings * fx
2026-03-12 21:35:55 +01:00 · 2022-10-15 08:23:58 +02:00
parent b523ab9125
commit 55afc8041f
20 changed files with 849 additions and 735 deletions
--- a/src/WireMock.Net.Abstractions/Models/IBodyData.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyData.cs
@@ -13,12 +13,12 @@ public interface IBodyData
    /// <summary>
    /// The body (as bytearray).
    /// </summary>
-    byte[] BodyAsBytes { get; set; }
+    byte[]? BodyAsBytes { get; set; }

    /// <summary>
    /// Gets or sets the body as a file.
    /// </summary>
-    string BodyAsFile { get; set; }
+    string? BodyAsFile { get; set; }

    /// <summary>
    /// Is the body as file cached?
@@ -38,7 +38,7 @@ public interface IBodyData
    /// <summary>
    /// The body as string, this is defined when BodyAsString or BodyAsJson are not null.
    /// </summary>
-    string BodyAsString { get; set; }
+    string? BodyAsString { get; set; }

    /// <summary>
    /// The detected body type (detection based on body content).
--- a/src/WireMock.Net/Matchers/ExactMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactMatcher.cs
@@ -1,7 +1,7 @@
+using System;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
-using WireMock.Extensions;
 using WireMock.Models;

 namespace WireMock.Matchers;
@@ -9,8 +9,8 @@ namespace WireMock.Matchers;
 /// <summary>
 /// ExactMatcher
 /// </summary>
-/// <seealso cref="IStringMatcher" />
-public class ExactMatcher : IStringMatcher
+/// <seealso cref="IStringMatcher" /> and <seealso cref="IIgnoreCaseMatcher" />
+public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
 {
    private readonly AnyOf<string, StringPattern>[] _values;

@@ -24,7 +24,16 @@ public class ExactMatcher : IStringMatcher
    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
    /// </summary>
    /// <param name="values">The values.</param>
-    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, values)
+    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, false, MatchOperator.Or, values)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(bool ignoreCase, params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, ignoreCase, false, MatchOperator.Or, values)
    {
    }

@@ -32,11 +41,13 @@ public class ExactMatcher : IStringMatcher
    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
    /// </summary>
    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
    /// <param name="values">The values.</param>
    public ExactMatcher(
        MatchBehaviour matchBehaviour,
+        bool ignoreCase = false,
        bool throwException = false,
        MatchOperator matchOperator = MatchOperator.Or,
        params AnyOf<string, StringPattern>[] values)
@@ -45,13 +56,18 @@ public class ExactMatcher : IStringMatcher

        MatchBehaviour = matchBehaviour;
        ThrowException = throwException;
+        IgnoreCase = ignoreCase;
        MatchOperator = matchOperator;
    }

    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
    public double IsMatch(string? input)
    {
-        double score = MatchScores.ToScore(_values.Select(v => v.GetPattern() == input).ToArray(), MatchOperator);
+        Func<string?, bool> equals = IgnoreCase
+            ? pattern => string.Equals(pattern, input, StringComparison.OrdinalIgnoreCase)
+            : pattern => pattern == input;
+
+        double score = MatchScores.ToScore(_values.Select(v => equals(v)).ToArray(), MatchOperator);
        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
    }

@@ -66,4 +82,7 @@ public class ExactMatcher : IStringMatcher

    /// <inheritdoc cref="IMatcher.Name"/>
    public string Name => "ExactMatcher";
+
+    /// <inheritdoc />
+    public bool IgnoreCase { get; }
 }
--- a/src/WireMock.Net/Matchers/JsonPartialMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonPartialMatcher.cs
@@ -29,7 +29,7 @@ public class JsonPartialMatcher : AbstractJsonPartialMatcher
    /// <inheritdoc />
    protected override bool IsMatch(string value, string input)
    {
-        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, ThrowException, MatchOperator.Or, value);
+        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, IgnoreCase, ThrowException, MatchOperator.Or, value);
        return MatchScores.IsPerfect(exactStringMatcher.IsMatch(input));
    }
 }
--- a/src/WireMock.Net/Matchers/MatchOperator.cs
+++ b/src/WireMock.Net/Matchers/MatchOperator.cs
@@ -18,5 +18,5 @@ public enum MatchOperator
    /// <summary>
    /// The average value from all patterns.
    /// </summary>
-    Average,
+    Average
 }
--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -16,22 +16,22 @@ public class RequestMessageBodyMatcher : IRequestMatcher
    /// <summary>
    /// The body function
    /// </summary>
-    public Func<string, bool>? Func { get; }
+    public Func<string?, bool>? Func { get; }

    /// <summary>
    /// The body data function for byte[]
    /// </summary>
-    public Func<byte[], bool>? DataFunc { get; }
+    public Func<byte[]?, bool>? DataFunc { get; }

    /// <summary>
    /// The body data function for json
    /// </summary>
-    public Func<object, bool>? JsonFunc { get; }
+    public Func<object?, bool>? JsonFunc { get; }

    /// <summary>
    /// The body data function for BodyData
    /// </summary>
-    public Func<IBodyData, bool>? BodyDataFunc { get; }
+    public Func<IBodyData?, bool>? BodyDataFunc { get; }

    /// <summary>
    /// The matchers.
@@ -77,7 +77,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
    /// </summary>
    /// <param name="func">The function.</param>
-    public RequestMessageBodyMatcher(Func<string, bool> func)
+    public RequestMessageBodyMatcher(Func<string?, bool> func)
    {
        Func = Guard.NotNull(func);
    }
@@ -86,7 +86,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
    /// </summary>
    /// <param name="func">The function.</param>
-    public RequestMessageBodyMatcher(Func<byte[], bool> func)
+    public RequestMessageBodyMatcher(Func<byte[]?, bool> func)
    {
        DataFunc = Guard.NotNull(func);
    }
@@ -95,7 +95,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
    /// </summary>
    /// <param name="func">The function.</param>
-    public RequestMessageBodyMatcher(Func<object, bool> func)
+    public RequestMessageBodyMatcher(Func<object?, bool> func)
    {
        JsonFunc = Guard.NotNull(func);
    }
@@ -158,9 +158,9 @@ public class RequestMessageBodyMatcher : IRequestMatcher
        {
            // If the body is a byte array, try to match.
            var detectedBodyType = requestMessage.BodyData?.DetectedBodyType;
-            if (detectedBodyType == BodyType.Bytes || detectedBodyType == BodyType.String)
+            if (detectedBodyType is BodyType.Bytes or BodyType.String)
            {
-                return exactObjectMatcher.IsMatch(requestMessage.BodyData.BodyAsBytes);
+                return exactObjectMatcher.IsMatch(requestMessage.BodyData?.BodyAsBytes);
            }
        }

--- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
@@ -53,7 +53,7 @@ public class RequestMessageParamMatcher : IRequestMatcher
    /// <param name="key">The key.</param>
    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
    /// <param name="values">The values.</param>
-    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, string[]? values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, false, MatchOperator.And, value)).Cast<IStringMatcher>().ToArray())
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, string[]? values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, ignoreCase, false, MatchOperator.And, value)).Cast<IStringMatcher>().ToArray())
    {
    }

--- a/src/WireMock.Net/Models/BodyData.cs
+++ b/src/WireMock.Net/Models/BodyData.cs
@@ -11,7 +11,7 @@ namespace WireMock.Util
        /// <inheritdoc cref="IBodyData.Encoding" />
        public Encoding? Encoding { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsBytes" />
+        /// <inheritdoc />
        public string? BodyAsString { get; set; }

        /// <inheritdoc cref="IBodyData.BodyAsJson" />
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -107,7 +107,7 @@ namespace WireMock.Owin
        {
            try
            {
-                var appLifetime = (IApplicationLifetime)_host.Services.GetService(typeof(IApplicationLifetime));
+                var appLifetime = _host.Services.GetRequiredService<IApplicationLifetime>();
                appLifetime.ApplicationStarted.Register(() =>
                {
                    var addresses = _host.ServerFeatures
--- a/src/WireMock.Net/Proxy/ProxyHelper.cs
+++ b/src/WireMock.Net/Proxy/ProxyHelper.cs
@@ -1,10 +1,17 @@
 using Stef.Validation;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using WireMock.Constants;
 using WireMock.Http;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Settings;
+using WireMock.Types;
 using WireMock.Util;

 namespace WireMock.Proxy;
@@ -55,4 +62,69 @@ internal class ProxyHelper

        return (responseMessage, newMapping);
    }
+
+    private IMapping ToMapping(ProxyAndRecordSettings proxyAndRecordSettings, IRequestMessage requestMessage, ResponseMessage responseMessage)
+    {
+        var excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
+        var excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };
+
+        var request = Request.Create();
+        request.WithPath(requestMessage.Path);
+        request.UsingMethod(requestMessage.Method);
+
+        requestMessage.Query?.Loop((key, value) => request.WithParam(key, false, value.ToArray()));
+        requestMessage.Cookies?.Loop((key, value) =>
+        {
+            if (!excludedCookies.Contains(key, StringComparer.OrdinalIgnoreCase))
+            {
+                request.WithCookie(key, value);
+            }
+        });
+
+        var allExcludedHeaders = new List<string>(excludedHeaders) { "Cookie" };
+        requestMessage.Headers?.Loop((key, value) =>
+        {
+            if (!allExcludedHeaders.Contains(key, StringComparer.OrdinalIgnoreCase))
+            {
+                request.WithHeader(key, value.ToArray());
+            }
+        });
+
+        bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+        switch (requestMessage.BodyData?.DetectedBodyType)
+        {
+            case BodyType.Json:
+                request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson!, true, throwExceptionWhenMatcherFails));
+                break;
+
+            case BodyType.String:
+                request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, false, throwExceptionWhenMatcherFails, MatchOperator.Or, requestMessage.BodyData.BodyAsString));
+                break;
+
+            case BodyType.Bytes:
+                request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
+                break;
+        }
+
+        var response = Response.Create(responseMessage);
+
+        return new Mapping
+        (
+            guid: Guid.NewGuid(),
+            title: $"Proxy Mapping for {requestMessage.Method} {requestMessage.Path}",
+            description: string.Empty,
+            path: null,
+            settings: _settings,
+            request,
+            response,
+            priority: WireMockConstants.ProxyPriority, // This was 0
+            scenario: null,
+            executionConditionState: null,
+            nextState: null,
+            stateTimes: null,
+            webhooks: null,
+            useWebhooksFireAndForget: null,
+            timeSettings: null
+        );
+    }
 }
--- a/src/WireMock.Net/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net/Serialization/MatcherMapper.cs
@@ -66,7 +66,7 @@ internal class MatcherMapper
                return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);

            case nameof(ExactMatcher):
-                return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);
+                return new ExactMatcher(matchBehaviour, ignoreCase, throwExceptionWhenMatcherFails, matchOperator, stringPatterns);

            case nameof(ExactObjectMatcher):
                return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
--- a/src/WireMock.Net/Serialization/ProxyMappingConverter.cs
+++ b/src/WireMock.Net/Serialization/ProxyMappingConverter.cs
@@ -140,11 +140,11 @@ internal class ProxyMappingConverter
                    break;

                case BodyType.String:
-                    newRequest.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, MatchOperator.Or, requestMessage.BodyData.BodyAsString));
+                    newRequest.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, true, throwExceptionWhenMatcherFails, MatchOperator.Or, requestMessage.BodyData.BodyAsString!));
                    break;

                case BodyType.Bytes:
-                    newRequest.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
+                    newRequest.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes!, throwExceptionWhenMatcherFails));
                    break;
            }
        }
--- a/src/WireMock.Net/Server/IRespondWithAProvider.cs
+++ b/src/WireMock.Net/Server/IRespondWithAProvider.cs
@@ -1,171 +1,169 @@
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Types;

-namespace WireMock.Server
+namespace WireMock.Server;
+
+/// <summary>
+/// IRespondWithAProvider
+/// </summary>
+public interface IRespondWithAProvider
 {
    /// <summary>
-    /// IRespondWithAProvider
+    /// Gets the unique identifier for this mapping.
    /// </summary>
-    public interface IRespondWithAProvider
-    {
-        /// <summary>
-        /// Gets the unique identifier for this mapping.
-        /// </summary>
-        Guid Guid { get; }
+    Guid Guid { get; }

-        /// <summary>
-        /// Define a unique identifier for this mapping.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithGuid(Guid guid);
+    /// <summary>
+    /// Define a unique identifier for this mapping.
+    /// </summary>
+    /// <param name="guid">The unique identifier.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithGuid(Guid guid);

-        /// <summary>
-        /// Define the TimeSettings for this mapping.
-        /// </summary>
-        /// <param name="timeSettings">The TimeSettings.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithTimeSettings(ITimeSettings timeSettings);
+    /// <summary>
+    /// Define the TimeSettings for this mapping.
+    /// </summary>
+    /// <param name="timeSettings">The TimeSettings.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithTimeSettings(ITimeSettings timeSettings);

-        /// <summary>
-        /// Define a unique title for this mapping.
-        /// </summary>
-        /// <param name="title">The unique title.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithTitle(string title);
+    /// <summary>
+    /// Define a unique title for this mapping.
+    /// </summary>
+    /// <param name="title">The unique title.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithTitle(string title);

-        /// <summary>
-        /// Define a description for this mapping.
-        /// </summary>
-        /// <param name="description">The description.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithDescription(string description);
+    /// <summary>
+    /// Define a description for this mapping.
+    /// </summary>
+    /// <param name="description">The description.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithDescription(string description);

-        /// <summary>
-        /// Define the full filepath for this mapping.
-        /// </summary>
-        /// <param name="path">The full filepath.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithPath(string path);
+    /// <summary>
+    /// Define the full filepath for this mapping.
+    /// </summary>
+    /// <param name="path">The full filepath.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithPath(string path);

-        /// <summary>
-        /// Define a unique identifier for this mapping.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithGuid(string guid);
+    /// <summary>
+    /// Define a unique identifier for this mapping.
+    /// </summary>
+    /// <param name="guid">The unique identifier.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithGuid(string guid);

-        /// <summary>
-        /// Define the priority for this mapping.
-        /// </summary>
-        /// <param name="priority">The priority.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider AtPriority(int priority);
+    /// <summary>
+    /// Define the priority for this mapping.
+    /// </summary>
+    /// <param name="priority">The priority.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider AtPriority(int priority);

-        /// <summary>
-        /// The respond with.
-        /// </summary>
-        /// <param name="provider">The provider.</param>
-        void RespondWith(IResponseProvider provider);
+    /// <summary>
+    /// The respond with.
+    /// </summary>
+    /// <param name="provider">The provider.</param>
+    void RespondWith(IResponseProvider provider);

-        /// <summary>
-        /// Sets the the scenario.
-        /// </summary>
-        /// <param name="scenario">The scenario.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider InScenario(string scenario);
+    /// <summary>
+    /// Sets the the scenario.
+    /// </summary>
+    /// <param name="scenario">The scenario.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider InScenario(string scenario);

-        /// <summary>
-        /// Sets the the scenario with an integer value.
-        /// </summary>
-        /// <param name="scenario">The scenario.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider InScenario(int scenario);
+    /// <summary>
+    /// Sets the the scenario with an integer value.
+    /// </summary>
+    /// <param name="scenario">The scenario.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider InScenario(int scenario);

-        /// <summary>
-        /// Execute this respond only in case the current state is equal to specified one.
-        /// </summary>
-        /// <param name="state">Any object which identifies the current state</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WhenStateIs(string state);
+    /// <summary>
+    /// Execute this respond only in case the current state is equal to specified one.
+    /// </summary>
+    /// <param name="state">Any object which identifies the current state</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WhenStateIs(string state);

-        /// <summary>
-        /// Execute this respond only in case the current state is equal to specified one.
-        /// </summary>
-        /// <param name="state">Any object which identifies the current state</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WhenStateIs(int state);
+    /// <summary>
+    /// Execute this respond only in case the current state is equal to specified one.
+    /// </summary>
+    /// <param name="state">Any object which identifies the current state</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WhenStateIs(int state);

-        /// <summary>
-        /// Once this mapping is executed the state will be changed to specified one.
-        /// </summary>
-        /// <param name="state">Any object which identifies the new state</param>
-        /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(string state, int? times = 1);
+    /// <summary>
+    /// Once this mapping is executed the state will be changed to specified one.
+    /// </summary>
+    /// <param name="state">Any object which identifies the new state</param>
+    /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WillSetStateTo(string state, int? times = 1);

-        /// <summary>
-        /// Once this mapping is executed the state will be changed to specified one.
-        /// </summary>
-        /// <param name="state">Any object which identifies the new state</param>
-        /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(int state, int? times = 1);
+    /// <summary>
+    /// Once this mapping is executed the state will be changed to specified one.
+    /// </summary>
+    /// <param name="state">Any object which identifies the new state</param>
+    /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WillSetStateTo(int state, int? times = 1);

-        /// <summary>
-        /// Add (multiple) Webhook(s) to call after the response has been generated.
-        /// </summary>
-        /// <param name="webhooks">The Webhooks</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithWebhook(params IWebhook[] webhooks);
+    /// <summary>
+    /// Add (multiple) Webhook(s) to call after the response has been generated.
+    /// </summary>
+    /// <param name="webhooks">The Webhooks</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithWebhook(params IWebhook[] webhooks);

-        /// <summary>
-        /// Support FireAndForget for any configured Webhooks
-        /// </summary>
-        /// <param name="UseWebhooksFireAndForget"></param>
-        /// <returns></returns>
-        IRespondWithAProvider WithWebhookFireAndForget(bool UseWebhooksFireAndForget);
+    /// <summary>
+    /// Support FireAndForget for any configured Webhooks
+    /// </summary>
+    /// <param name="UseWebhooksFireAndForget"></param>
+    /// <returns></returns>
+    IRespondWithAProvider WithWebhookFireAndForget(bool UseWebhooksFireAndForget);

-        /// <summary>
-        /// Add a Webhook to call after the response has been generated.
-        /// </summary>
-        /// <param name="url">The Webhook Url</param>
-        /// <param name="method">The method to use. [optional]</param>
-        /// <param name="headers">The Headers to send. [optional]</param>
-        /// <param name="body">The body (as string) to send. [optional]</param>
-        /// <param name="useTransformer">Use Transformer. [optional]</param>
-        /// <param name="transformerType">The transformer type. [optional]</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithWebhook(
-            [NotNull] string url,
-            [CanBeNull] string method = "post",
-            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
-            [CanBeNull] string body = null,
-            bool useTransformer = true,
-            TransformerType transformerType = TransformerType.Handlebars
-        );
+    /// <summary>
+    /// Add a Webhook to call after the response has been generated.
+    /// </summary>
+    /// <param name="url">The Webhook Url</param>
+    /// <param name="method">The method to use. [optional]</param>
+    /// <param name="headers">The Headers to send. [optional]</param>
+    /// <param name="body">The body (as string) to send. [optional]</param>
+    /// <param name="useTransformer">Use Transformer. [optional]</param>
+    /// <param name="transformerType">The transformer type. [optional]</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithWebhook(
+        string url,
+        string? method = "post",
+        IDictionary<string, WireMockList<string>>? headers = null,
+        string? body = null,
+        bool useTransformer = true,
+        TransformerType transformerType = TransformerType.Handlebars
+    );

-        /// <summary>
-        /// Add a Webhook to call after the response has been generated.
-        /// </summary>
-        /// <param name="url">The Webhook Url</param>
-        /// <param name="method">The method to use. [optional]</param>
-        /// <param name="headers">The Headers to send. [optional]</param>
-        /// <param name="body">The body (as json) to send. [optional]</param>
-        /// <param name="useTransformer">Use Transformer. [optional]</param>
-        /// <param name="transformerType">The transformer type. [optional]</param>
-        /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WithWebhook(
-            [NotNull] string url,
-            [CanBeNull] string method = "post",
-            [CanBeNull] IDictionary<string, WireMockList<string>> headers = null,
-            [CanBeNull] object body = null,
-            bool useTransformer = true,
-            TransformerType transformerType = TransformerType.Handlebars
-        );
-    }
+    /// <summary>
+    /// Add a Webhook to call after the response has been generated.
+    /// </summary>
+    /// <param name="url">The Webhook Url</param>
+    /// <param name="method">The method to use. [optional]</param>
+    /// <param name="headers">The Headers to send. [optional]</param>
+    /// <param name="body">The body (as json) to send. [optional]</param>
+    /// <param name="useTransformer">Use Transformer. [optional]</param>
+    /// <param name="transformerType">The transformer type. [optional]</param>
+    /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
+    IRespondWithAProvider WithWebhook(
+        string url,
+        string? method = "post",
+        IDictionary<string, WireMockList<string>>? headers = null,
+        object? body = null,
+        bool useTransformer = true,
+        TransformerType transformerType = TransformerType.Handlebars
+    );
 }
--- a/src/WireMock.Net/Util/DictionaryExtensions.cs
+++ b/src/WireMock.Net/Util/DictionaryExtensions.cs
@@ -17,6 +17,7 @@ public static class DictionaryExtensions
    /// <param name="dictionary">The dictionary to loop (can be null).</param>
    /// <param name="action">The action.</param>
    public static void Loop<TKey, TValue>(this IDictionary<TKey, TValue>? dictionary, Action<TKey, TValue> action)
+        where TKey : notnull
    {
        Guard.NotNull(action);

--- a/src/WireMock.Net/Util/TypeBuilderUtils.cs
+++ b/src/WireMock.Net/Util/TypeBuilderUtils.cs
@@ -32,7 +32,7 @@ internal static class TypeBuilderUtils
            CreateGetSetMethods(typeBuilder, property.Key, property.Value);
        }

-        var type = typeBuilder.CreateTypeInfo().AsType();
+        var type = typeBuilder.CreateTypeInfo()!.AsType();

        Types.TryAdd(properties, type);

@@ -43,6 +43,7 @@ internal static class TypeBuilderUtils
    /// https://stackoverflow.com/questions/3804367/testing-for-equality-between-dictionaries-in-c-sharp
    /// </summary>
    private static bool Compare<TKey, TValue>(IDictionary<TKey, TValue> dict1, IDictionary<TKey, TValue> dict2)
+        where TKey : notnull
    {
        if (dict1 == dict2)
        {