chore!: remove obsolete interface members

src/MockHttp/DeprecationWarnings.cs

@@ -2,5 +2,4 @@
 
 internal static class DeprecationWarnings
 {
-    public const string RespondsResult = "Obsolete, will be removed in next major release.";
 }

src/MockHttp/Extensions/IRespondsExtensions.cs

@@ -19,25 +19,20 @@ public static class IRespondsExtensions
     public static TResult Respond<TResult>(this IResponds<TResult> responds, Func<HttpResponseMessage> response)
         where TResult : IResponseResult
     {
-        if (responds is null)
-        {
-            throw new ArgumentNullException(nameof(responds));
-        }
-
         if (response is null)
         {
             throw new ArgumentNullException(nameof(response));
         }
 
-        return responds.RespondUsing(new ResponseFuncStrategy((_, _) => Task.FromResult(response())));
+        return responds.Respond((_, _) => response());
     }
 
     /// <summary>
     /// Specifies a function that returns the response for a request.
     /// </summary>
     /// <param name="responds"></param>
     /// <param name="response">The function that provides the response message to return for given request.</param>
-    public static TResult Respond<TResult>(this IResponds<TResult> responds, Func<HttpRequestMessage, HttpResponseMessage> response)
+    public static TResult Respond<TResult>(this IResponds<TResult> responds, Func<HttpRequestMessage, CancellationToken, HttpResponseMessage> response)
         where TResult : IResponseResult
     {
         if (responds is null)
@@ -50,7 +45,7 @@ public static TResult Respond<TResult>(this IResponds<TResult> responds, Func<Ht
             throw new ArgumentNullException(nameof(response));
         }
 
-        return responds.RespondUsing(new ResponseFuncStrategy((request, _) => Task.FromResult(response(request))));
+        return responds.RespondUsing(new ResponseFuncStrategy((request, ct) => Task.FromResult(response(request, ct))));
     }
 
     /// <summary>

src/MockHttp/Language/Flow/SetupPhrase.cs

@@ -18,21 +18,6 @@ protected SetupPhrase(HttpCall setup)
 
     protected HttpCall Setup { get; }
 
-    public TResponseResult Respond(Func<Task<HttpResponseMessage>> responseFunc)
-    {
-        return RespondUsing(new ResponseFuncStrategy((_, __) => responseFunc()));
-    }
-
-    public TResponseResult Respond(Func<HttpRequestMessage, Task<HttpResponseMessage>> responseFunc)
-    {
-        return RespondUsing(new ResponseFuncStrategy((r, __) => responseFunc(r)));
-    }
-
-    public TResponseResult Respond(Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> responseFunc)
-    {
-        return RespondUsing(new ResponseFuncStrategy(responseFunc));
-    }
-
     public TResponseResult RespondUsing(IResponseStrategy responseStrategy)
     {
         if (responseStrategy is null)

src/MockHttp/Language/IResponds.cs

@@ -11,27 +11,6 @@ namespace MockHttp.Language;
 public interface IResponds<out TResult> : IFluentInterface
     where TResult : IResponseResult
 {
-    /// <summary>
-    /// Specifies a function that returns the response for a request.
-    /// </summary>
-    /// <param name="responseFunc">The function returning an awaitable that when completed provides the response message to return for a request.</param>
-    [Obsolete(DeprecationWarnings.RespondsResult)]
-    TResult Respond(Func<Task<HttpResponseMessage>> responseFunc);
-
-    /// <summary>
-    /// Specifies a function that returns the response for a request.
-    /// </summary>
-    /// <param name="responseFunc">The function returning an awaitable that when completed provides the response message to return for given request.</param>
-    [Obsolete(DeprecationWarnings.RespondsResult)]
-    TResult Respond(Func<HttpRequestMessage, Task<HttpResponseMessage>> responseFunc);
-
-    /// <summary>
-    /// Specifies a function that returns the response for a request.
-    /// </summary>
-    /// <param name="responseFunc">The function returning an awaitable that when completed provides the response message to return for given request.</param>
-    [Obsolete(DeprecationWarnings.RespondsResult)]
-    TResult Respond(Func<HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> responseFunc);
-
     /// <summary>
     /// Specifies a strategy that returns the response for a request.
     /// </summary>

test/MockHttp.Server.Tests/MockHttpServerTests.cs

@@ -132,11 +132,11 @@ public static IEnumerable<object[]> RequestResponseTestCases()
                 .When(matching => matching
                     .Header(headerKey, headerValue)
                 )
-                .Respond((r) => new HttpResponseMessage
+                .Respond((req, _) => new HttpResponseMessage
                 {
                     Headers =
                     {
-                        { headerKey, r.Headers.GetValues(headerKey) }
+                        { headerKey, req.Headers.GetValues(headerKey) }
                     }
                 })
             ),

test/MockHttp.Tests/Extensions/IRespondsExtensionsTests.cs

@@ -43,7 +43,7 @@ public async Task When_responding_with_message_based_on_request_it_should_return
             var request = new HttpRequestMessage(HttpMethod.Get, "http://0.0.0.0/controller/action?query=1");
 
             // Act
-            _sut.Respond(r => new HttpResponseMessage { Headers = { { "query", r.RequestUri.Query } } });
+            _sut.Respond((req, _) => new HttpResponseMessage { Headers = { { "query", req.RequestUri.Query } } });
             HttpResponseMessage actualResponse = await _httpCall.SendAsync(new MockHttpRequestContext(request), CancellationToken.None);
 
             // Assert
@@ -207,10 +207,10 @@ public static IEnumerable<object[]> TestCases()
                     IRespondsExtensions.Respond,
                     responds,
                     () => new HttpResponseMessage()),
-                DelegateTestCase.Create<IResponds<IResponseResult>, Func<HttpRequestMessage, HttpResponseMessage>, IResponseResult>(
+                DelegateTestCase.Create<IResponds<IResponseResult>, Func<HttpRequestMessage, CancellationToken, HttpResponseMessage>, IResponseResult>(
                     IRespondsExtensions.Respond,
                     responds,
-                    _ => new HttpResponseMessage()),
+                    (_, _) => new HttpResponseMessage()),
                 DelegateTestCase.Create(
                     IRespondsExtensions.RespondUsing<FakeResponseStrategy, IResponseResult>,
                     responds),