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.Abstractions/Admin/Mappings/CookieModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs

@@ -1,26 +1,25 @@
 // Copyright © WireMock.Net
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// EncodingModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class EncodingModel
 {
     /// <summary>
-    /// EncodingModel
+    /// Encoding CodePage
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class EncodingModel
-    {
-        /// <summary>
-        /// Encoding CodePage
-        /// </summary>
-        public int CodePage { get; set; }
+    public int CodePage { get; set; }
 
-        /// <summary>
-        /// Encoding EncodingName
-        /// </summary>
-        public string EncodingName { get; set; }
+    /// <summary>
+    /// Encoding EncodingName
+    /// </summary>
+    public required string EncodingName { get; set; }
 
-        /// <summary>
-        /// Encoding WebName
-        /// </summary>
-        public string WebName { get; set; }
-    }
+    /// <summary>
+    /// Encoding WebName
+    /// </summary>
+    public required string WebName { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
 using WireMock.Models;
 
 namespace WireMock.Admin.Mappings;
@@ -65,12 +64,12 @@ public class MappingModel
     /// <summary>
     /// The request model.
     /// </summary>
-    public RequestModel Request { get; set; }
+    public required RequestModel Request { get; set; }
 
     /// <summary>
     /// The response model.
     /// </summary>
-    public ResponseModel Response { get; set; }
+    public required ResponseModel Response { get; set; }
 
     /// <summary>
     /// Saves this mapping as a static mapping file.

src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs

@@ -1,8 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-using System;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using WireMock.Admin.Settings;
 
 namespace WireMock.Admin.Mappings;

src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/TimeSettingsModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-
 namespace WireMock.Models
 {
     /// <summary>

src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
-
 namespace WireMock.Admin.Mappings;
 
 /// <summary>

src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-
 namespace WireMock.Admin.Requests;
 
 /// <summary>
@@ -17,12 +15,12 @@ public class LogEntryModel
     /// <summary>
     /// The request.
     /// </summary>
-    public required LogRequestModel Request { get; init; }
+    public LogRequestModel? Request { get; init; }
 
     /// <summary>
     /// The response.
     /// </summary>
-    public required LogResponseModel Response { get; init; }
+    public LogResponseModel? Response { get; init; }
 
     /// <summary>
     /// The mapping unique identifier.

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using WireMock.Matchers.Request;
 
 namespace WireMock.Admin.Requests;

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using WireMock.Admin.Mappings;
 using WireMock.Types;
 
@@ -15,32 +13,32 @@ public class LogRequestModel
     /// <summary>
     /// The Client IP Address.
     /// </summary>
-    public string ClientIP { get; set; }
+    public required string ClientIP { get; set; }
 
     /// <summary>
     /// The DateTime.
     /// </summary>
-    public DateTime DateTime { get; set; }
+    public required DateTime DateTime { get; set; }
 
     /// <summary>
     /// The Path.
     /// </summary>
-    public string Path { get; set; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// The Absolute Path.
     /// </summary>
-    public string AbsolutePath { get; set; }
+    public required string AbsolutePath { get; set; }
 
     /// <summary>
     /// Gets the url (relative).
     /// </summary>
-    public string Url { get; set; }
+    public required string Url { get; set; }
 
     /// <summary>
     /// The absolute URL.
     /// </summary>
-    public string AbsoluteUrl { get; set; }
+    public required string AbsoluteUrl { get; set; }
 
     /// <summary>
     /// The ProxyUrl (if a proxy is used).
@@ -55,12 +53,12 @@ public class LogRequestModel
     /// <summary>
     /// The method.
     /// </summary>
-    public string Method { get; set; }
+    public required string Method { get; set; }
 
     /// <summary>
     /// The HTTP Version.
     /// </summary>
-    public string HttpVersion { get; set; } = null!;
+    public string? HttpVersion { get; set; }
 
     /// <summary>
     /// The Headers.

src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using WireMock.Admin.Mappings;
 using WireMock.Types;
 
@@ -64,12 +63,12 @@ public class LogResponseModel
     /// <summary>
     /// The detected body type (detection based on body content).
     /// </summary>
-    public BodyType? DetectedBodyType { get; set; }
+    public string? DetectedBodyType { get; set; }
 
     /// <summary>
     /// The detected body type (detection based on Content-Type).
     /// </summary>
-    public BodyType? DetectedBodyTypeFromContentType { get; set; }
+    public string? DetectedBodyTypeFromContentType { get; set; }
 
     /// <summary>
     /// The FaultType.
@@ -80,4 +79,14 @@ public class LogResponseModel
     /// Gets or sets the Fault percentage.
     /// </summary>
     public double? FaultPercentage { get; set; }
+
+    /// <summary>
+    /// The DateTime.
+    /// </summary>
+    public required DateTime DateTime { get; set; }
+
+    /// <summary>
+    /// The method.
+    /// </summary>
+    public string? Method { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs

@@ -1,36 +1,35 @@
 // Copyright © WireMock.Net
 
-namespace WireMock.Admin.Scenarios
+namespace WireMock.Admin.Scenarios;
+
+/// <summary>
+/// ScenarioStateModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ScenarioStateModel
 {
     /// <summary>
-    /// ScenarioStateModel
+    /// Gets or sets the name.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class ScenarioStateModel
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
+    public required string Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the NextState.
-        /// </summary>
-        public string? NextState { get; set; }
+    /// <summary>
+    /// Gets or sets the NextState.
+    /// </summary>
+    public string? NextState { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is started.
-        /// </summary>
-        public bool Started { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is started.
+    /// </summary>
+    public bool Started { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is finished.
-        /// </summary>
-        public bool Finished { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is finished.
+    /// </summary>
+    public bool Finished { get; set; }
 
-        /// <summary>
-        /// Gets or sets the state counter.
-        /// </summary>
-        public int Counter { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the state counter.
+    /// </summary>
+    public int Counter { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs

@@ -45,12 +45,12 @@ public class ProxyAndRecordSettingsModel
     /// <summary>
     /// Defines a list from headers which will be excluded from the saved mappings.
     /// </summary>
-    public string[] ExcludedHeaders { get; set; }
+    public string[] ExcludedHeaders { get; set; } = [];
 
     /// <summary>
     /// Defines a list of cookies which will be excluded from the saved mappings.
     /// </summary>
-    public string[] ExcludedCookies { get; set; }
+    public string[] ExcludedCookies { get; set; } = [];
 
     /// <summary>
     /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).

src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs

@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Types;
 
@@ -123,7 +121,6 @@ public class SettingsModel
     /// </summary>
     public Dictionary<string, string[]>? ProtoDefinitions { get; set; }
 
-#if NETSTANDARD1_3_OR_GREATER || NET461
     /// <summary>
     /// Server client certificate mode
     /// </summary>
@@ -133,5 +130,9 @@ public class SettingsModel
     /// Whether to accept any client certificate
     /// </summary>
     public bool AcceptAnyClientCertificate { get; set; }
-#endif
+
+    /// <summary>
+    /// Gets or sets the WebSocket settings.
+    /// </summary>
+    public WebSocketSettingsModel? WebSocketSettings { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Settings/WebSocketSettingsModel.cs

@@ -0,0 +1,40 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// WebSocket Settings Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class WebSocketSettingsModel
+{
+    /// <summary>
+    /// Maximum number of concurrent WebSocket connections (default: 100)
+    /// </summary>
+    public int MaxConnections { get; set; } = 100;
+
+    /// <summary>
+    /// Default receive buffer size in bytes (default: 4096)
+    /// </summary>
+    public int ReceiveBufferSize { get; set; } = 4096;
+
+    /// <summary>
+    /// Default keep-alive interval in seconds (default: 30)
+    /// </summary>
+    public int KeepAliveIntervalSeconds { get; set; } = 30;
+
+    /// <summary>
+    /// Maximum message size in bytes (default: 1048576 - 1 MB)
+    /// </summary>
+    public int MaxMessageSize { get; set; } = 1048576;
+
+    /// <summary>
+    /// Enable WebSocket compression (default: true)
+    /// </summary>
+    public bool EnableCompression { get; set; } = true;
+
+    /// <summary>
+    /// Default close timeout in minutes (default: 10)
+    /// </summary>
+    public int CloseTimeoutMinutes { get; set; } = 10;
+}