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

src/WireMock.Net.Minimal/Serialization/LogEntryMapper.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
-using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
@@ -12,95 +10,101 @@ using WireMock.Types;
 
 namespace WireMock.Serialization;
 
-internal class LogEntryMapper
+internal class LogEntryMapper(IWireMockMiddlewareOptions options)
 {
-    private readonly IWireMockMiddlewareOptions _options;
-
-    public LogEntryMapper(IWireMockMiddlewareOptions options)
-    {
-        _options = Guard.NotNull(options);
-    }
-
     public LogEntryModel Map(ILogEntry logEntry)
     {
-        var logRequestModel = new LogRequestModel
+        LogRequestModel? logRequestModel = null;
+        if (logEntry.RequestMessage != null)
         {
-            DateTime = logEntry.RequestMessage.DateTime,
-            ClientIP = logEntry.RequestMessage.ClientIP,
-            Path = logEntry.RequestMessage.Path,
-            AbsolutePath = logEntry.RequestMessage.AbsolutePath,
-            Url = logEntry.RequestMessage.Url,
-            AbsoluteUrl = logEntry.RequestMessage.AbsoluteUrl,
-            ProxyUrl = logEntry.RequestMessage.ProxyUrl,
-            Query = logEntry.RequestMessage.Query,
-            Method = logEntry.RequestMessage.Method,
-            HttpVersion = logEntry.RequestMessage.HttpVersion,
-            Headers = logEntry.RequestMessage.Headers,
-            Cookies = logEntry.RequestMessage.Cookies
-        };
-
-        if (logEntry.RequestMessage.BodyData != null)
-        {
-            logRequestModel.DetectedBodyType = logEntry.RequestMessage.BodyData.DetectedBodyType?.ToString();
-            logRequestModel.DetectedBodyTypeFromContentType = logEntry.RequestMessage.BodyData.DetectedBodyTypeFromContentType?.ToString();
-
-            switch (logEntry.RequestMessage.BodyData.DetectedBodyType)
+            logRequestModel = new LogRequestModel
             {
-                case BodyType.String:
-                case BodyType.FormUrlEncoded:
-                    logRequestModel.Body = logEntry.RequestMessage.BodyData.BodyAsString;
-                    break;
+                DateTime = logEntry.RequestMessage.DateTime,
+                ClientIP = logEntry.RequestMessage.ClientIP,
+                Path = logEntry.RequestMessage.Path,
+                AbsolutePath = logEntry.RequestMessage.AbsolutePath,
+                Url = logEntry.RequestMessage.Url,
+                AbsoluteUrl = logEntry.RequestMessage.AbsoluteUrl,
+                ProxyUrl = logEntry.RequestMessage.ProxyUrl,
+                Query = logEntry.RequestMessage.Query,
+                Method = logEntry.RequestMessage.Method,
+                HttpVersion = logEntry.RequestMessage.HttpVersion,
+                Headers = logEntry.RequestMessage.Headers,
+                Cookies = logEntry.RequestMessage.Cookies
+            };
 
-                case BodyType.Json:
-                    logRequestModel.Body = logEntry.RequestMessage.BodyData.BodyAsString; // In case of Json, do also save the Body as string (backwards compatible)
-                    logRequestModel.BodyAsJson = logEntry.RequestMessage.BodyData.BodyAsJson;
-                    break;
+            if (logEntry.RequestMessage.BodyData != null)
+            {
+                logRequestModel.DetectedBodyType = logEntry.RequestMessage.BodyData.DetectedBodyType?.ToString();
+                logRequestModel.DetectedBodyTypeFromContentType = logEntry.RequestMessage.BodyData.DetectedBodyTypeFromContentType?.ToString();
 
-                case BodyType.Bytes:
-                    logRequestModel.BodyAsBytes = logEntry.RequestMessage.BodyData.BodyAsBytes;
-                    break;
+                switch (logEntry.RequestMessage.BodyData.DetectedBodyType)
+                {
+                    case BodyType.String:
+                    case BodyType.FormUrlEncoded:
+                    case BodyType.WebSocketText:
+                    case BodyType.WebSocketClose:
+                        logRequestModel.Body = logEntry.RequestMessage.BodyData.BodyAsString;
+                        break;
+
+                    case BodyType.Json:
+                        logRequestModel.Body = logEntry.RequestMessage.BodyData.BodyAsString; // In case of Json, do also save the Body as string (backwards compatible)
+                        logRequestModel.BodyAsJson = logEntry.RequestMessage.BodyData.BodyAsJson;
+                        break;
+
+                    case BodyType.Bytes:
+                    case BodyType.WebSocketBinary:
+                        logRequestModel.BodyAsBytes = logEntry.RequestMessage.BodyData.BodyAsBytes;
+                        break;
+                }
+
+                logRequestModel.BodyEncoding = logEntry.RequestMessage.BodyData.Encoding != null
+                    ? new EncodingModel
+                    {
+                        EncodingName = logEntry.RequestMessage.BodyData.Encoding.EncodingName,
+                        CodePage = logEntry.RequestMessage.BodyData.Encoding.CodePage,
+                        WebName = logEntry.RequestMessage.BodyData.Encoding.WebName
+                    }
+                    : null;
+            }
+        }
+
+        LogResponseModel? logResponseModel = null;
+        if (logEntry.ResponseMessage != null)
+        {
+            logResponseModel = new LogResponseModel
+            {
+                DateTime = logEntry.ResponseMessage.DateTime,
+                Method = logEntry.ResponseMessage.Method,
+                StatusCode = logEntry.ResponseMessage.StatusCode,
+                Headers = logEntry.ResponseMessage.Headers
+            };
+
+            if (logEntry.ResponseMessage.FaultType != FaultType.NONE)
+            {
+                logResponseModel.FaultType = logEntry.ResponseMessage.FaultType.ToString();
+                logResponseModel.FaultPercentage = logEntry.ResponseMessage.FaultPercentage;
             }
 
-            logRequestModel.BodyEncoding = logEntry.RequestMessage.BodyData.Encoding != null
-                ? new EncodingModel
-                {
-                    EncodingName = logEntry.RequestMessage.BodyData.Encoding.EncodingName,
-                    CodePage = logEntry.RequestMessage.BodyData.Encoding.CodePage,
-                    WebName = logEntry.RequestMessage.BodyData.Encoding.WebName
-                }
-                : null;
-        }
+            if (logEntry.ResponseMessage.BodyData != null)
+            {
+                logResponseModel.BodyOriginal = logEntry.ResponseMessage.BodyOriginal;
+                logResponseModel.BodyDestination = logEntry.ResponseMessage.BodyDestination;
 
-        var logResponseModel = new LogResponseModel
-        {
-            StatusCode = logEntry.ResponseMessage.StatusCode,
-            Headers = logEntry.ResponseMessage.Headers
-        };
+                logResponseModel.DetectedBodyType = logEntry.ResponseMessage.BodyData.DetectedBodyType?.ToString();
+                logResponseModel.DetectedBodyTypeFromContentType = logEntry.ResponseMessage.BodyData.DetectedBodyTypeFromContentType?.ToString();
 
-        if (logEntry.ResponseMessage.FaultType != FaultType.NONE)
-        {
-            logResponseModel.FaultType = logEntry.ResponseMessage.FaultType.ToString();
-            logResponseModel.FaultPercentage = logEntry.ResponseMessage.FaultPercentage;
-        }
+                MapBody(logEntry, logResponseModel);
 
-        if (logEntry.ResponseMessage.BodyData != null)
-        {
-            logResponseModel.BodyOriginal = logEntry.ResponseMessage.BodyOriginal;
-            logResponseModel.BodyDestination = logEntry.ResponseMessage.BodyDestination;
-
-            logResponseModel.DetectedBodyType = logEntry.ResponseMessage.BodyData.DetectedBodyType;
-            logResponseModel.DetectedBodyTypeFromContentType = logEntry.ResponseMessage.BodyData.DetectedBodyTypeFromContentType;
-
-            MapBody(logEntry, logResponseModel);
-
-            logResponseModel.BodyEncoding = logEntry.ResponseMessage.BodyData.Encoding != null
-                ? new EncodingModel
-                {
-                    EncodingName = logEntry.ResponseMessage.BodyData.Encoding.EncodingName,
-                    CodePage = logEntry.ResponseMessage.BodyData.Encoding.CodePage,
-                    WebName = logEntry.ResponseMessage.BodyData.Encoding.WebName
-                }
-                : null;
+                logResponseModel.BodyEncoding = logEntry.ResponseMessage.BodyData.Encoding != null
+                    ? new EncodingModel
+                    {
+                        EncodingName = logEntry.ResponseMessage.BodyData.Encoding.EncodingName,
+                        CodePage = logEntry.ResponseMessage.BodyData.Encoding.CodePage,
+                        WebName = logEntry.ResponseMessage.BodyData.Encoding.WebName
+                    }
+                    : null;
+            }
         }
 
         return new LogEntryModel
@@ -121,11 +125,13 @@ internal class LogEntryMapper
 
     private void MapBody(ILogEntry logEntry, LogResponseModel logResponseModel)
     {
-        switch (logEntry.ResponseMessage.BodyData!.DetectedBodyType)
+        switch (logEntry.ResponseMessage?.BodyData?.DetectedBodyType)
         {
             case BodyType.String:
             case BodyType.FormUrlEncoded:
-                if (!string.IsNullOrEmpty(logEntry.ResponseMessage.BodyData.IsFuncUsed) && _options.DoNotSaveDynamicResponseInLogEntry == true)
+            case BodyType.WebSocketText:
+            case BodyType.WebSocketClose:
+                if (!string.IsNullOrEmpty(logEntry.ResponseMessage.BodyData.IsFuncUsed) && options.DoNotSaveDynamicResponseInLogEntry == true)
                 {
                     logResponseModel.Body = logEntry.ResponseMessage.BodyData.IsFuncUsed;
                 }
@@ -140,6 +146,7 @@ internal class LogEntryMapper
                 break;
 
             case BodyType.Bytes:
+            case BodyType.WebSocketBinary:
                 logResponseModel.BodyAsBytes = logEntry.ResponseMessage.BodyData.BodyAsBytes;
                 break;
 

src/WireMock.Net.Minimal/Serialization/MappingConverter.cs

@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading;
 using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;

src/WireMock.Net.Minimal/Serialization/MappingFileNameSanitizer.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.IO;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Settings;
@@ -10,7 +9,7 @@ namespace WireMock.Serialization;
 /// <summary>
 /// Creates sanitized file names for mappings
 /// </summary>
-public class MappingFileNameSanitizer
+internal class MappingFileNameSanitizer
 {
     private const char ReplaceChar = '_';
 
@@ -30,7 +29,7 @@ public class MappingFileNameSanitizer
         if (!string.IsNullOrEmpty(mapping.Title))
         {
             // remove 'Proxy Mapping for ' and an extra space character after the HTTP request method
-            name = mapping.Title.Replace(ProxyAndRecordSettings.DefaultPrefixForSavedMappingFile, "").Replace(' '.ToString(), string.Empty);
+            name = mapping.Title!.Replace(ProxyAndRecordSettings.DefaultPrefixForSavedMappingFile, "").Replace(' '.ToString(), string.Empty);
             if (_settings.ProxyAndRecordSettings?.AppendGuidToSavedMappingFile == true)
             {
                 name += $"{ReplaceChar}{mapping.Guid}";
@@ -43,7 +42,7 @@ public class MappingFileNameSanitizer
 
         if (!string.IsNullOrEmpty(_settings.ProxyAndRecordSettings?.PrefixForSavedMappingFile))
         {
-            name = $"{_settings.ProxyAndRecordSettings.PrefixForSavedMappingFile}{ReplaceChar}{name}";
+            name = $"{_settings.ProxyAndRecordSettings!.PrefixForSavedMappingFile}{ReplaceChar}{name}";
         }
         return $"{Path.GetInvalidFileNameChars().Aggregate(name, (current, c) => current.Replace(c, ReplaceChar))}.json";
     }

src/WireMock.Net.Minimal/Serialization/MappingSerializer.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
 using JsonConverter.Abstractions;
 using Newtonsoft.Json.Linq;
 #if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET6_0_OR_GREATER || NET461

src/WireMock.Net.Minimal/Serialization/MappingToFileSaver.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.IO;
 using System.Linq;
 using JsonConverter.Abstractions;
 using JsonConverter.Newtonsoft.Json;

src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using SimMetrics.Net;
@@ -218,7 +216,6 @@ internal class MatcherMapper
                 model.ContentTypeMatcher = Map(mimePartMatcher.ContentTypeMatcher);
                 break;
 
-#if PROTOBUF
             case IProtoBufMatcher protoBufMatcher:
                 protoBufMatcher.ProtoDefinition().Value(id => model.Pattern = id, texts =>
                 {
@@ -235,7 +232,6 @@ internal class MatcherMapper
                 model.ProtoBufMessageType = protoBufMatcher.MessageType;
                 model.ContentMatcher = Map(protoBufMatcher.Matcher);
                 break;
-#endif
         }
 
         afterMap?.Invoke(model);

src/WireMock.Net.Minimal/Serialization/PactMapper.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Extensions;
@@ -28,7 +26,8 @@ internal static class PactMapper
         var pact = new Pact.Models.V2.Pact
         {
             Consumer = new Pacticipant { Name = consumer },
-            Provider = new Pacticipant { Name = provider }
+            Provider = new Pacticipant { Name = provider },
+            Interactions = []
         };
 
         foreach (var mapping in server.MappingModels.OrderBy(m => m.Guid))
@@ -42,7 +41,7 @@ internal static class PactMapper
 
             var interaction = new Interaction
             {
-                Description = !string.IsNullOrWhiteSpace(mapping.Description) ? mapping.Description : mapping.Title ?? string.Empty,
+                Description = mapping.Description ?? mapping.Title ?? string.Empty,
                 Request = MapRequest(mapping.Request, path),
                 Response = MapResponse(mapping.Response)
             };
@@ -65,13 +64,8 @@ internal static class PactMapper
         };
     }
 
-    private static PactResponse MapResponse(ResponseModel? response)
+    private static PactResponse MapResponse(ResponseModel response)
     {
-        if (response == null)
-        {
-            return new PactResponse();
-        }
-
         return new PactResponse
         {
             Status = MapStatusCode(response.StatusCode),

src/WireMock.Net.Minimal/Serialization/ProxyMappingConverter.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Constants;

src/WireMock.Net.Minimal/Serialization/SwaggerMapper.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using NJsonSchema;

src/WireMock.Net.Minimal/Serialization/WebhookMapper.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Stef.Validation;
 using WireMock.Admin.Mappings;