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-04-25 02:09:06 +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/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
@@ -1,29 +1,21 @@
 // Copyright © WireMock.Net

-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;
+using Stef.Validation;
 using WireMock.Http;
 using WireMock.ResponseBuilders;
+using WireMock.ResponseProviders;
 using WireMock.Types;
-using Stef.Validation;
 using WireMock.Util;

-#if !USE_ASPNETCORE
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using Microsoft.AspNetCore.Http;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif
-
 namespace WireMock.Owin.Mappers
 {
    /// <summary>
@@ -37,8 +29,8 @@ namespace WireMock.Owin.Mappers
        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);

        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-        private static readonly IDictionary<string, Action<IResponse, bool, WireMockList<string>>> ResponseHeadersToFix =
-            new Dictionary<string, Action<IResponse, bool, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase)
+        private static readonly IDictionary<string, Action<HttpResponse, bool, WireMockList<string>>> ResponseHeadersToFix =
+            new Dictionary<string, Action<HttpResponse, bool, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase)
            {
                { HttpKnownHeaderNames.ContentType, (r, _, v) => r.ContentType = v.FirstOrDefault() },
                { HttpKnownHeaderNames.ContentLength, (r, hasBody, v) =>
@@ -62,9 +54,9 @@ namespace WireMock.Owin.Mappers
        }

        /// <inheritdoc />
-        public async Task MapAsync(IResponseMessage? responseMessage, IResponse response)
+        public async Task MapAsync(IResponseMessage? responseMessage, HttpResponse response)
        {
-            if (responseMessage == null)
+            if (responseMessage == null || responseMessage is WebSocketHandledResponse)
            {
                return;
            }
@@ -128,7 +120,7 @@ namespace WireMock.Owin.Mappers
            SetResponseTrailingHeaders(responseMessage, response);
        }

-        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, IResponse response, IBodyData bodyData)
+        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, HttpResponse response, IBodyData bodyData)
        {
            if (bodyData.SseStringQueue == null)
            {
@@ -202,7 +194,7 @@ namespace WireMock.Owin.Mappers
            return null;
        }

-        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, IResponse response)
+        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, HttpResponse response)
        {
            // Force setting the Date header (#577)
            AppendResponseHeader(
@@ -218,7 +210,7 @@ namespace WireMock.Owin.Mappers
                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, hasBody, value);
+                    action.Invoke(response, hasBody, value);
                }
                else
                {
@@ -231,7 +223,7 @@ namespace WireMock.Owin.Mappers
            }
        }

-        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, IResponse response)
+        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, HttpResponse response)
        {
            if (responseMessage.TrailingHeaders == null)
            {
@@ -239,13 +231,11 @@ namespace WireMock.Owin.Mappers
            }

 #if TRAILINGHEADERS
-            foreach (var item in responseMessage.TrailingHeaders)
+            foreach (var (headerName, value) in responseMessage.TrailingHeaders)
            {
-                var headerName = item.Key;
-                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, false, value);
+                    action.Invoke(response, false, value);
                }
                else
                {
@@ -259,13 +249,9 @@ namespace WireMock.Owin.Mappers
 #endif
        }

-        private static void AppendResponseHeader(IResponse response, string headerName, string[] values)
+        private static void AppendResponseHeader(HttpResponse response, string headerName, string[] values)
        {
-#if !USE_ASPNETCORE
-            response.Headers.AppendValues(headerName, values);
-#else
            response.Headers.Append(headerName, values);
-#endif
        }
    }
 }