feat: vNext

src/MockHttp.Json/Extensions/MockHttpRequestContextExtensions.cs

@@ -1,4 +1,4 @@
-using MockHttp.Responses;
+using MockHttp.Response;
 
 // ReSharper disable once CheckNamespace : BREAKING - change namespace with next release. (remove Extensions)
 namespace MockHttp.Json.Extensions;

src/MockHttp.Json/Extensions/ResponseBuilderExtensions.cs

@@ -4,7 +4,7 @@
 using MockHttp.Json.Extensions;
 using MockHttp.Language.Flow.Response;
 using MockHttp.Language.Response;
-using MockHttp.Responses;
+using MockHttp.Response;
 
 namespace MockHttp.Json;
 
@@ -71,7 +71,12 @@ internal JsonContentBehavior
             _adapter = adapter;
         }
 
-        public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+        public Task HandleAsync(
+            MockHttpRequestContext requestContext,
+            HttpResponseMessage responseMessage,
+            ResponseHandler nextHandler,
+            CancellationToken cancellationToken
+        )
         {
             IJsonAdapter jsonSerializerAdapter = _adapter ?? requestContext.GetAdapter();
             object? value = _jsonContentFactory();
@@ -84,7 +89,7 @@ public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessa
                 }
             };
 
-            return next(requestContext, responseMessage, cancellationToken);
+            return nextHandler(requestContext, responseMessage, cancellationToken);
         }
     }
 }

src/MockHttp.Json/JsonContentMatcher.cs

@@ -1,7 +1,7 @@
 using MockHttp.Json.Extensions;
 using MockHttp.Json.SystemTextJson;
 using MockHttp.Matchers;
-using MockHttp.Responses;
+using MockHttp.Response;
 
 namespace MockHttp.Json;
 

src/MockHttp.Server/MockHttpServer.cs

@@ -32,18 +32,8 @@ public sealed class MockHttpServer
     private IWebHost? _host;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to listen on specified <paramref name="hostUrl" />.
-    /// </summary>
-    /// <param name="mockHttpHandler">The mock http handler.</param>
-    /// <param name="hostUrl">The host URL the mock HTTP server will listen on.</param>
-    [Obsolete("Use the overload accepting an System.Uri.")]
-    public MockHttpServer(MockHttpHandler mockHttpHandler, string hostUrl)
-        : this(mockHttpHandler, GetHostUrl(hostUrl))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to listen on specified <paramref name="hostUri" />.
+    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to
+    /// listen on specified <paramref name="hostUri" />.
     /// </summary>
     /// <param name="mockHttpHandler">The mock http handler.</param>
     /// <param name="hostUri">The host URI the mock HTTP server will listen on.</param>
@@ -53,25 +43,19 @@ public MockHttpServer(MockHttpHandler mockHttpHandler, Uri hostUri)
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to listen on specified <paramref name="hostUrl" />.
-    /// </summary>
-    /// <param name="mockHttpHandler">The mock http handler.</param>
-    /// <param name="loggerFactory">The logger factory to use to log pipeline requests to.</param>
-    /// <param name="hostUrl">The host URL the mock HTTP server will listen on.</param>
-    [Obsolete("Use the overload accepting an System.Uri.")]
-    public MockHttpServer(MockHttpHandler mockHttpHandler, ILoggerFactory? loggerFactory, string hostUrl)
-        : this(mockHttpHandler, loggerFactory, GetHostUrl(hostUrl))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to listen on specified <paramref name="hostUri" />.
+    /// Initializes a new instance of the <see cref="MockHttpServer" /> using specified <paramref name="mockHttpHandler" /> and configures it to
+    /// listen on specified <paramref name="hostUri" />.
     /// </summary>
     /// <param name="mockHttpHandler">The mock http handler.</param>
     /// <param name="loggerFactory">The logger factory to use to log pipeline requests to.</param>
     /// <param name="hostUri">The host URI the mock HTTP server will listen on.</param>
     public MockHttpServer(MockHttpHandler mockHttpHandler, ILoggerFactory? loggerFactory, Uri hostUri)
     {
+        if (hostUri is null)
+        {
+            throw new ArgumentNullException(nameof(hostUri));
+        }
+
         Handler = mockHttpHandler ?? throw new ArgumentNullException(nameof(mockHttpHandler));
         _webHostBuilder = CreateWebHostBuilder(loggerFactory);
         _hostUri = new Uri(hostUri, "/"); // Ensure base URL.
@@ -102,14 +86,6 @@ public async ValueTask DisposeAsync()
     /// </summary>
     public MockHttpHandler Handler { get; }
 
-    /// <summary>
-    /// Gets the host URL the mock HTTP server will listen on.
-    /// </summary>
-    [Obsolete("Use the HostUri instead.")]
-#pragma warning disable CA1056 // URI-like properties should not be strings
-    public string HostUrl => HostUri.ToString().TrimEnd('/');
-#pragma warning restore CA1056 // URI-like properties should not be strings
-
     /// <summary>
     /// Gets the host URI the mock HTTP server will listen on.
     /// </summary>
@@ -237,18 +213,6 @@ internal void Configure(Action<IApplicationBuilder> configureAppBuilder)
         _configureAppBuilder = configureAppBuilder;
     }
 
-    private static Uri GetHostUrl(string hostUrl)
-    {
-        if (hostUrl is null)
-        {
-            throw new ArgumentNullException(nameof(hostUrl));
-        }
-
-        return Uri.TryCreate(hostUrl, UriKind.Absolute, out Uri? uri)
-            ? uri
-            : throw new ArgumentException(Resources.Error_HostUrlIsNotValid, nameof(hostUrl));
-    }
-
     private void AddMockHttpServerHeader(IApplicationBuilder applicationBuilder)
     {
         applicationBuilder.Use(async (context, next) =>

src/MockHttp.Server/Resources.resx

@@ -129,9 +129,6 @@
   <data name="Debug_HandlingRequest" xml:space="preserve">
     <value>MockHttpServer received request.</value>
   </data>
-  <data name="Error_HostUrlIsNotValid" xml:space="preserve">
-    <value>Specify a host URL.</value>
-  </data>
   <data name="MissingHttpResponseFeature" xml:space="preserve">
     <value>HTTP response feature missing.</value>
   </data>

src/MockHttp/Extensions/IRespondsExtensions.cs

@@ -2,7 +2,6 @@
 using MockHttp.Language.Flow;
 using MockHttp.Language.Flow.Response;
 using MockHttp.Response;
-using MockHttp.Responses;
 
 namespace MockHttp;
 

src/MockHttp/IInvokedHttpRequestCollection.cs

@@ -1,11 +1,9 @@
-using MockHttp.Threading;
-
-namespace MockHttp;
+namespace MockHttp;
 
 /// <summary>
 /// Represents a collection of invoked HTTP requests.
 /// </summary>
-public interface IInvokedHttpRequestCollection : IConcurrentReadOnlyCollection<IInvokedHttpRequest>
+public interface IInvokedHttpRequestCollection : IReadOnlyList<IInvokedHttpRequest>
 {
     /// <summary>
     /// Clears the invoked requests collection.

src/MockHttp/Internal/Extensions/HttpRequestMatcherExtensions.cs

@@ -1,5 +1,5 @@
 using MockHttp.Matchers;
-using MockHttp.Responses;
+using MockHttp.Response;
 
 namespace MockHttp.Extensions;
 

src/MockHttp/Internal/HttpCall.cs

@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Text;
 using MockHttp.Matchers;
-using MockHttp.Responses;
+using MockHttp.Response;
 
 namespace MockHttp;
 
@@ -11,7 +11,7 @@
 internal class HttpCall
 {
     private IResponseStrategy? _responseStrategy;
     private string? _verifiableBecause;
     private IReadOnlyCollection<IAsyncHttpRequestMatcher>? _matchers;
 
     public IReadOnlyCollection<IAsyncHttpRequestMatcher> Matchers

src/MockHttp/Internal/HttpCallSequence.cs

@@ -1,4 +1,4 @@
-using MockHttp.Responses;
+using MockHttp.Response;
 
 namespace MockHttp;
 

src/MockHttp/Internal/Response/Behaviors/HttpContentBehavior.cs

@@ -1,6 +1,4 @@
-using MockHttp.Responses;
-
-namespace MockHttp.Response.Behaviors;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class HttpContentBehavior
     : IResponseBehavior
@@ -12,9 +10,14 @@ public HttpContentBehavior(Func<CancellationToken, Task<HttpContent>> httpConten
         _httpContentFactory = httpContentFactory ?? throw new ArgumentNullException(nameof(httpContentFactory));
     }
 
-    public async Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public async Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
         responseMessage.Content = await _httpContentFactory(cancellationToken).ConfigureAwait(false);
-        await next(requestContext, responseMessage, cancellationToken).ConfigureAwait(false);
+        await nextHandler(requestContext, responseMessage, cancellationToken).ConfigureAwait(false);
     }
 }

src/MockHttp/Internal/Response/Behaviors/HttpHeaderBehavior.cs

@@ -1,5 +1,4 @@
 using MockHttp.Http;
-using MockHttp.Responses;
 
 namespace MockHttp.Response.Behaviors;
 
@@ -37,15 +36,20 @@ public HttpHeaderBehavior(IEnumerable<KeyValuePair<string, IEnumerable<string?>>
         _headers = headers?.ToList() ?? throw new ArgumentNullException(nameof(headers));
     }
 
-    public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
         // ReSharper disable once UseDeconstruction
         foreach (KeyValuePair<string, IEnumerable<string?>> header in _headers)
         {
             Add(header, responseMessage);
         }
 
-        return next(requestContext, responseMessage, cancellationToken);
+        return nextHandler(requestContext, responseMessage, cancellationToken);
     }
 
     /// <summary>

src/MockHttp/Internal/Response/Behaviors/NetworkLatencyBehavior.cs

@@ -1,6 +1,4 @@
-using MockHttp.Responses;
-
-namespace MockHttp.Response.Behaviors;
+namespace MockHttp.Response.Behaviors;
 
 internal sealed class NetworkLatencyBehavior
     : IResponseBehavior
@@ -12,8 +10,13 @@ public NetworkLatencyBehavior(NetworkLatency networkLatency)
         _networkLatency = networkLatency ?? throw new ArgumentNullException(nameof(networkLatency));
     }
 
-    public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
-        return _networkLatency.SimulateAsync(() => next(requestContext, responseMessage, cancellationToken), cancellationToken);
+        return _networkLatency.SimulateAsync(() => nextHandler(requestContext, responseMessage, cancellationToken), cancellationToken);
     }
 }

src/MockHttp/Internal/Response/Behaviors/StatusCodeBehavior.cs

@@ -1,5 +1,4 @@
 using System.Net;
-using MockHttp.Responses;
 
 namespace MockHttp.Response.Behaviors;
 
@@ -20,14 +19,19 @@ public StatusCodeBehavior(HttpStatusCode statusCode, string? reasonPhrase)
         _reasonPhrase = reasonPhrase;
     }
 
-    public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
         responseMessage.StatusCode = _statusCode;
         if (_reasonPhrase is not null)
         {
             responseMessage.ReasonPhrase = _reasonPhrase;
         }
 
-        return next(requestContext, responseMessage, cancellationToken);
+        return nextHandler(requestContext, responseMessage, cancellationToken);
     }
 }

src/MockHttp/Internal/Response/Behaviors/TimeoutBehavior.cs

@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using MockHttp.Responses;
 using MockHttp.Threading;
 
 namespace MockHttp.Response.Behaviors;
@@ -19,7 +18,12 @@
         _timeoutAfter = timeoutAfter;
     }
 
-    public Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
         // It is somewhat unintuitive to throw TaskCanceledException but this is what HttpClient does,
         // so we simulate same behavior.
@@ -36,7 +40,7 @@
                     isNotNet5OrGreater = RuntimeInformation.FrameworkDescription.StartsWith(".NET Core 3", StringComparison.OrdinalIgnoreCase); // Shim for .NET 5 being EOL and no longer producing an assembly for it.
 #endif
 
                     if (cancellationToken.IsCancellationRequested || isNotNet5OrGreater)
                     {
                         tcs.TrySetCanceled();
                     }

src/MockHttp/Internal/Response/Behaviors/TransferRateBehavior.cs

@@ -1,6 +1,5 @@
 using System.Net;
 using MockHttp.IO;
-using MockHttp.Responses;
 
 namespace MockHttp.Response.Behaviors;
 
@@ -18,9 +17,14 @@ public TransferRateBehavior(int bitRate)
         _bitRate = bitRate;
     }
 
-    public async Task HandleAsync(MockHttpRequestContext requestContext, HttpResponseMessage responseMessage, ResponseHandlerDelegate next, CancellationToken cancellationToken)
+    public async Task HandleAsync(
+        MockHttpRequestContext requestContext,
+        HttpResponseMessage responseMessage,
+        ResponseHandler nextHandler,
+        CancellationToken cancellationToken
+    )
     {
-        await next(requestContext, responseMessage, cancellationToken).ConfigureAwait(false);
+        await nextHandler(requestContext, responseMessage, cancellationToken).ConfigureAwait(false);
         responseMessage.Content = new RateLimitedHttpContent(responseMessage.Content, _bitRate);
     }
 

src/MockHttp/Internal/Response/ExceptionStrategy.cs

@@ -1,6 +1,4 @@
-using MockHttp.Responses;
-
-namespace MockHttp.Response;
+namespace MockHttp.Response;
 
 internal sealed class ExceptionStrategy : IResponseStrategy
 {

src/MockHttp/Internal/Response/ResponseFuncStrategy.cs

@@ -1,6 +1,4 @@
-using MockHttp.Responses;
-
-namespace MockHttp.Response;
+namespace MockHttp.Response;
 
 internal sealed class ResponseFuncStrategy : IResponseStrategy
 {

src/MockHttp/Internal/Threading/ConcurrentCollection.cs

@@ -3,7 +3,7 @@
 
 namespace MockHttp.Threading;
 
-internal class ConcurrentCollection<T> : IConcurrentReadOnlyCollection<T>
+internal class ConcurrentCollection<T> : IReadOnlyList<T>
 {
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     private readonly object _syncLock = new();