From 47f3ae636f4e4dc307145e776e56078fc486eceb Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sun, 8 Mar 2026 09:31:03 +0100 Subject: [PATCH] ws --- .../WebSockets/WebSocketConnectionRegistry.cs | 1 - .../WebSocketMessageConditionBuilder.cs | 17 ++++------------- .../WebSockets/WireMockWebSocketContext.cs | 3 --- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs index 83b540be..ca7ba781 100644 --- a/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs +++ b/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs @@ -2,7 +2,6 @@ using System.Collections.Concurrent; using System.Diagnostics.CodeAnalysis; -using System.Linq; using System.Net.WebSockets; namespace WireMock.WebSockets; diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageConditionBuilder.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageConditionBuilder.cs index 51166299..6e646fe7 100644 --- a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageConditionBuilder.cs +++ b/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageConditionBuilder.cs @@ -5,24 +5,15 @@ using Stef.Validation; namespace WireMock.WebSockets; -internal class WebSocketMessageConditionBuilder : IWebSocketMessageConditionBuilder +internal class WebSocketMessageConditionBuilder(WebSocketBuilder parent, IMatcher matcher) : IWebSocketMessageConditionBuilder { - private readonly WebSocketBuilder _parent; - private readonly IMatcher _matcher; - - public WebSocketMessageConditionBuilder(WebSocketBuilder parent, IMatcher matcher) - { - _parent = Guard.NotNull(parent); - _matcher = Guard.NotNull(matcher); - } - public IWebSocketBuilder ThenSendMessage(Action configure) { Guard.NotNull(configure); var messageBuilder = new WebSocketMessageBuilder(); configure(messageBuilder); - return _parent.AddConditionalMessage(_matcher, messageBuilder); + return parent.AddConditionalMessage(matcher, messageBuilder); } public IWebSocketBuilder SendMessages(Action configure) @@ -31,6 +22,6 @@ internal class WebSocketMessageConditionBuilder : IWebSocketMessageConditionBuil var messagesBuilder = new WebSocketMessagesBuilder(); configure(messagesBuilder); - return _parent.AddConditionalMessages(_matcher, messagesBuilder.Messages); + return parent.AddConditionalMessages(matcher, messagesBuilder.Messages); } -} +} \ No newline at end of file diff --git a/src/WireMock.Net.Minimal/WebSockets/WireMockWebSocketContext.cs b/src/WireMock.Net.Minimal/WebSockets/WireMockWebSocketContext.cs index 9ec71db5..5486c292 100644 --- a/src/WireMock.Net.Minimal/WebSockets/WireMockWebSocketContext.cs +++ b/src/WireMock.Net.Minimal/WebSockets/WireMockWebSocketContext.cs @@ -41,9 +41,6 @@ public class WireMockWebSocketContext : IWebSocketContext internal IWireMockMiddlewareLogger Logger { get; } - /// - /// Creates a new WebSocketContext - /// internal WireMockWebSocketContext( HttpContext httpContext, WebSocket webSocket,