From 989709eb45db3c29ddc6c0b20af41ca15698a042 Mon Sep 17 00:00:00 2001 From: Dario Griffo Date: Sun, 17 Feb 2019 22:18:06 +0100 Subject: [PATCH 1/2] Add CancellationToken to IRequestPostProcessor --- samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs | 3 ++- samples/MediatR.Examples/GenericRequestPostProcessor.cs | 3 ++- src/MediatR/Pipeline/IRequestPostProcessor.cs | 6 ++++-- src/MediatR/Pipeline/RequestPostProcessorBehavior.cs | 2 +- test/MediatR.Tests/Pipeline/RequestPostProcessorTests.cs | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs b/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs index 81face7d..0808165a 100644 --- a/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs +++ b/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs @@ -1,4 +1,5 @@ using System.IO; +using System.Threading; using System.Threading.Tasks; using MediatR.Pipeline; @@ -15,7 +16,7 @@ public ConstrainedRequestPostProcessor(TextWriter writer) _writer = writer; } - public Task Process(TRequest request, TResponse response) + public Task Process(TRequest request, TResponse response, CancellationToken cancellationToken) { return _writer.WriteLineAsync("- All Done with Ping"); } diff --git a/samples/MediatR.Examples/GenericRequestPostProcessor.cs b/samples/MediatR.Examples/GenericRequestPostProcessor.cs index a3216ac7..e839d6b3 100644 --- a/samples/MediatR.Examples/GenericRequestPostProcessor.cs +++ b/samples/MediatR.Examples/GenericRequestPostProcessor.cs @@ -1,4 +1,5 @@ using System.IO; +using System.Threading; using System.Threading.Tasks; using MediatR.Pipeline; @@ -13,7 +14,7 @@ public GenericRequestPostProcessor(TextWriter writer) _writer = writer; } - public Task Process(TRequest request, TResponse response) + public Task Process(TRequest request, TResponse response, CancellationToken cancellationToken) { return _writer.WriteLineAsync("- All Done"); } diff --git a/src/MediatR/Pipeline/IRequestPostProcessor.cs b/src/MediatR/Pipeline/IRequestPostProcessor.cs index 72229168..64447954 100644 --- a/src/MediatR/Pipeline/IRequestPostProcessor.cs +++ b/src/MediatR/Pipeline/IRequestPostProcessor.cs @@ -1,5 +1,6 @@ -namespace MediatR.Pipeline +namespace MediatR.Pipeline { + using System.Threading; using System.Threading.Tasks; /// @@ -14,7 +15,8 @@ public interface IRequestPostProcessor /// /// Request instance /// Response instance + /// Cancellation token /// An awaitable task - Task Process(TRequest request, TResponse response); + Task Process(TRequest request, TResponse response, CancellationToken cancellationToken); } } \ No newline at end of file diff --git a/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs b/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs index bed800d9..e12c8e84 100644 --- a/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs +++ b/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs @@ -24,7 +24,7 @@ public async Task Handle(TRequest request, CancellationToken cancella foreach (var processor in _postProcessors) { - await processor.Process(request, response).ConfigureAwait(false); + await processor.Process(request, response, cancellationToken).ConfigureAwait(false); } return response; diff --git a/test/MediatR.Tests/Pipeline/RequestPostProcessorTests.cs b/test/MediatR.Tests/Pipeline/RequestPostProcessorTests.cs index 04e4d3e4..2b5f32ee 100644 --- a/test/MediatR.Tests/Pipeline/RequestPostProcessorTests.cs +++ b/test/MediatR.Tests/Pipeline/RequestPostProcessorTests.cs @@ -30,7 +30,7 @@ public Task Handle(Ping request, CancellationToken cancellationToken) public class PingPongPostProcessor : IRequestPostProcessor { - public Task Process(Ping request, Pong response) + public Task Process(Ping request, Pong response, CancellationToken cancellationToken) { response.Message = response.Message + " " + request.Message; From 8e3502489c77167886e505e6a63b3e06ed69d9cf Mon Sep 17 00:00:00 2001 From: Dario Griffo Date: Sun, 24 Feb 2019 19:39:12 +0100 Subject: [PATCH 2/2] Marking 7.0.0 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6f10bf8a..f40defb5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,6 +2,6 @@ Jimmy Bogard latest - 6.1.0 + 7.0.0