Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-05-04 14:44:36 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
--- a/src/WireMock.Net.Minimal/Matchers/AbstractJsonPartialMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/AbstractJsonPartialMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using WireMock.Util;
--- a/src/WireMock.Net.Minimal/Matchers/CompositeMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/CompositeMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-
 namespace WireMock.Matchers;

 /// <summary>
--- a/src/WireMock.Net.Minimal/Matchers/ExactMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/ExactMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/FormUrlEncodedMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/FormUrlEncodedMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs
@@ -0,0 +1,85 @@
+// Copyright © WireMock.Net
+
+using Stef.Validation;
+using WireMock.Extensions;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// FuncMatcher - matches using a custom function
+/// </summary>
+/// <inheritdoc cref="IFuncMatcher"/>
+public class FuncMatcher : IFuncMatcher
+{
+    private readonly Func<string?, bool>? _stringFunc;
+    private readonly Func<byte[]?, bool>? _bytesFunc;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FuncMatcher"/> class for string matching.
+    /// </summary>
+    /// <param name="func">The function to check if a string is a match.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    public FuncMatcher(Func<string?, bool> func, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _stringFunc = Guard.NotNull(func);
+        MatchBehaviour = matchBehaviour;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FuncMatcher"/> class for byte array matching.
+    /// </summary>
+    /// <param name="func">The function to check if a byte[] is a match.</param>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    public FuncMatcher(Func<byte[]?, bool> func, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        _bytesFunc = Guard.NotNull(func);
+        MatchBehaviour = matchBehaviour;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? value)
+    {
+        if (value is string stringValue && _stringFunc != null)
+        {
+            try
+            {
+                return MatchResult.From(Name, MatchBehaviour, _stringFunc(stringValue));
+            }
+            catch (Exception ex)
+            {
+                return MatchResult.From(Name, ex);
+            }
+        }
+
+        if (value is byte[] bytesValue && _bytesFunc != null)
+        {
+            try
+            {
+                return MatchResult.From(Name, MatchBehaviour, _bytesFunc(bytesValue));
+            }
+            catch (Exception ex)
+            {
+                return MatchResult.From(Name, ex);
+            }
+        }
+
+        return MatchResult.From(Name, MatchScores.Mismatch);
+    }
+
+    /// <inheritdoc />
+    public string Name => nameof(FuncMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        var funcType = _stringFunc != null ? "Func<string?, bool>" : "Func<byte[]?, bool>";
+        return $"new {Name}" +
+               $"(" +
+               $"/* {funcType} function */, " +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
+}
--- a/src/WireMock.Net.Minimal/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/JSONPathMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using AnyOfTypes;
 using Newtonsoft.Json.Linq;
@@ -71,7 +70,7 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
        {
            try
            {
-                var jToken = JToken.Parse(input);
+                var jToken = JToken.Parse(input!);
                score = IsMatch(jToken);
            }
            catch (Exception ex)
--- a/src/WireMock.Net.Minimal/Matchers/JmesPathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/JmesPathMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using AnyOfTypes;
 using DevLab.JmesPath;
--- a/src/WireMock.Net.Minimal/Matchers/JsonMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/JsonMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMatchResult.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMatchResult.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;

 namespace WireMock.Matchers.Request;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Matchers.Helpers;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;

--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageClientIPMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageClientIPMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCompositeMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCompositeMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;

--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCookieMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCookieMatcher.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net

 using Stef.Validation;
-using System;
-using System.Collections.Generic;
 using System.Linq;

 namespace WireMock.Matchers.Request;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHeaderMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHeaderMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Types;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHttpVersionMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHttpVersionMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using Stef.Validation;

--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMethodMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMethodMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using Stef.Validation;

--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-using System;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Util;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageParamMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Types;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessagePathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessagePathMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageUrlMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageUrlMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
--- a/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
 using System.Xml.XPath;
@@ -11,9 +9,7 @@ using WireMock.Models;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Util;
-#if !NETSTANDARD1_3
 using Wmhelp.XPath2;
-#endif

 namespace WireMock.Matchers;

@@ -135,7 +131,7 @@ public class XPathMatcher : IStringMatcher
            }
            catch
            {
-                _xmlDocument = default;
+                _xmlDocument = null;
            }
        }

@@ -151,25 +147,17 @@ public class XPathMatcher : IStringMatcher
            var xmlNamespaceManager = GetXmlNamespaceManager(xmlNamespaceMap);
            if (xmlNamespaceManager == null)
            {
-#if NETSTANDARD1_3
-                return navigator.Evaluate(xpath);
-#else
                return navigator.XPath2Evaluate(xpath);
-#endif
            }

-#if NETSTANDARD1_3
-            return navigator.Evaluate(xpath, xmlNamespaceManager);
-#else
            return navigator.XPath2Evaluate(xpath, xmlNamespaceManager);
-#endif
        }

        private XmlNamespaceManager? GetXmlNamespaceManager(IEnumerable<XmlNamespace>? xmlNamespaceMap)
        {
            if (_xpathNavigator == null || xmlNamespaceMap == null)
            {
-                return default;
+                return null;
            }

            var nsManager = new XmlNamespaceManager(_xpathNavigator.NameTable);