Scaling back generic constraints

jbogard · Feb 7, 2023 · e611b1b · e611b1b
1 parent caff80e
commit e611b1b
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 31 deletions.
diff --git a/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs b/samples/MediatR.Examples/ConstrainedRequestPostProcessor.cs
@@ -7,7 +7,7 @@ namespace MediatR.Examples;
 
 public class ConstrainedRequestPostProcessor<TRequest, TResponse>
     : IRequestPostProcessor<TRequest, TResponse>
-    where TRequest : Ping, IRequest<TResponse>
+    where TRequest : Ping
 {
     private readonly TextWriter _writer;
 

diff --git a/samples/MediatR.Examples/ExceptionHandler/LogExceptionAction.cs b/samples/MediatR.Examples/ExceptionHandler/LogExceptionAction.cs
@@ -1,17 +1,17 @@
 using MediatR.Pipeline;
 using System;
 using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MediatR.Examples.ExceptionHandler;
 
-public class LogExceptionAction : RequestExceptionAction<Ping>
+public class LogExceptionAction : IRequestExceptionAction<Ping>
 {
     private readonly TextWriter _writer;
 
     public LogExceptionAction(TextWriter writer) => _writer = writer;
 
-    protected override void Execute(Ping request, Exception exception)
-    {
-        _writer.WriteLineAsync($"--- Exception: '{exception.GetType().FullName}'");
-    }
+    public Task Execute(Ping request, Exception exception, CancellationToken cancellationToken) 
+        => _writer.WriteLineAsync($"--- Exception: '{exception.GetType().FullName}'");
 }
diff --git a/samples/MediatR.Examples/GenericPipelineBehavior.cs b/samples/MediatR.Examples/GenericPipelineBehavior.cs
@@ -5,7 +5,6 @@
 namespace MediatR.Examples;
 
 public class GenericPipelineBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
 {
     private readonly TextWriter _writer;
 

diff --git a/samples/MediatR.Examples/GenericRequestPostProcessor.cs b/samples/MediatR.Examples/GenericRequestPostProcessor.cs
@@ -6,7 +6,6 @@
 namespace MediatR.Examples;
 
 public class GenericRequestPostProcessor<TRequest, TResponse> : IRequestPostProcessor<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
 {
     private readonly TextWriter _writer;
 

diff --git a/samples/MediatR.Examples/Streams/GenericStreamPipelineBehavior.cs b/samples/MediatR.Examples/Streams/GenericStreamPipelineBehavior.cs
@@ -7,7 +7,6 @@
 namespace MediatR.Examples;
 
 public class GenericStreamPipelineBehavior<TRequest, TResponse> : IStreamPipelineBehavior<TRequest, TResponse>
-    where TRequest : IStreamRequest<TResponse>
 {
     private readonly TextWriter _writer;
 

diff --git a/src/MediatR/IPipelineBehavior.cs b/src/MediatR/IPipelineBehavior.cs
@@ -17,7 +17,7 @@ namespace MediatR;
 /// </summary>
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
-public interface IPipelineBehavior<in TRequest, TResponse> where TRequest : IBaseRequest
+public interface IPipelineBehavior<in TRequest, TResponse> where TRequest : notnull
 {
     /// <summary>
     /// Pipeline handler. Perform any additional behavior and await the <paramref name="next"/> delegate as necessary

diff --git a/src/MediatR/IStreamPipelineBehavior.cs b/src/MediatR/IStreamPipelineBehavior.cs
@@ -17,8 +17,7 @@ namespace MediatR;
 /// </summary>
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
-public interface IStreamPipelineBehavior<in TRequest, TResponse>
-    where TRequest : IStreamRequest<TResponse>
+public interface IStreamPipelineBehavior<in TRequest, TResponse> where TRequest : notnull
 {
     /// <summary>
     /// Stream Pipeline handler. Perform any additional behavior and iterate the <paramref name="next"/> delegate as necessary

diff --git a/src/MediatR/Pipeline/IRequestExceptionHandler.cs b/src/MediatR/Pipeline/IRequestExceptionHandler.cs
@@ -11,7 +11,7 @@ namespace MediatR.Pipeline;
 /// <typeparam name="TResponse">Response type</typeparam>
 /// <typeparam name="TException">Exception type</typeparam>
 public interface IRequestExceptionHandler<in TRequest, TResponse, in TException>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
     where TException : Exception
 {
     /// <summary>
@@ -31,7 +31,7 @@ public interface IRequestExceptionHandler<in TRequest, TResponse, in TException>
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public interface IRequestExceptionHandler<in TRequest, TResponse> : IRequestExceptionHandler<TRequest, TResponse, Exception>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
 }
 
@@ -41,10 +41,12 @@ public interface IRequestExceptionHandler<in TRequest, TResponse> : IRequestExce
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public abstract class AsyncRequestExceptionHandler<TRequest, TResponse> : IRequestExceptionHandler<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
-    async Task IRequestExceptionHandler<TRequest, TResponse, Exception>.Handle(TRequest request, Exception exception, RequestExceptionHandlerState<TResponse> state, CancellationToken cancellationToken) 
-        => await Handle(request, exception, state, cancellationToken).ConfigureAwait(false);
+    async Task IRequestExceptionHandler<TRequest, TResponse, Exception>.Handle(TRequest request, Exception exception, RequestExceptionHandlerState<TResponse> state, CancellationToken cancellationToken)
+    {
+        await Handle(request, exception, state, cancellationToken).ConfigureAwait(false);
+    }
 
     /// <summary>
     /// Override in a derived class for the handler logic
@@ -63,7 +65,7 @@ async Task IRequestExceptionHandler<TRequest, TResponse, Exception>.Handle(TRequ
 /// <typeparam name="TResponse">Response type</typeparam>
 /// <typeparam name="TException">Exception type</typeparam>
 public abstract class RequestExceptionHandler<TRequest, TResponse, TException> : IRequestExceptionHandler<TRequest, TResponse, TException>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
     where TException : Exception
 {
     Task IRequestExceptionHandler<TRequest, TResponse, TException>.Handle(TRequest request, TException exception, RequestExceptionHandlerState<TResponse> state, CancellationToken cancellationToken)
@@ -87,7 +89,7 @@ Task IRequestExceptionHandler<TRequest, TResponse, TException>.Handle(TRequest r
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public abstract class RequestExceptionHandler<TRequest, TResponse> : IRequestExceptionHandler<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
     Task IRequestExceptionHandler<TRequest, TResponse, Exception>.Handle(TRequest request, Exception exception, RequestExceptionHandlerState<TResponse> state, CancellationToken cancellationToken)
     {

diff --git a/src/MediatR/Pipeline/IRequestPostProcessor.cs b/src/MediatR/Pipeline/IRequestPostProcessor.cs
@@ -8,7 +8,7 @@ namespace MediatR.Pipeline;
 /// </summary>
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
-public interface IRequestPostProcessor<in TRequest, in TResponse> where TRequest : IRequest<TResponse>
+public interface IRequestPostProcessor<in TRequest, in TResponse> where TRequest : notnull
 {
     /// <summary>
     /// Process method executes after the Handle method on your handler

diff --git a/src/MediatR/Pipeline/RequestExceptionActionProcessorBehavior.cs b/src/MediatR/Pipeline/RequestExceptionActionProcessorBehavior.cs
@@ -10,14 +10,13 @@ namespace MediatR.Pipeline;
 using System.Threading.Tasks;
 
 /// <summary>
-/// Behavior for executing all <see cref="IRequestExceptionAction{TRequest,TException}"/>
-///     or <see cref="RequestExceptionAction{TRequest,TResponse}"/> instances
+/// Behavior for executing all <see cref="IRequestExceptionAction{TRequest,TException}"/> instances
 ///     after an exception is thrown by the following pipeline steps
 /// </summary>
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public class RequestExceptionActionProcessorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
     private readonly IServiceProvider _serviceProvider;
 

diff --git a/src/MediatR/Pipeline/RequestExceptionProcessorBehavior.cs b/src/MediatR/Pipeline/RequestExceptionProcessorBehavior.cs
@@ -17,7 +17,7 @@ namespace MediatR.Pipeline;
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public class RequestExceptionProcessorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
     private readonly IServiceProvider _serviceProvider;
 

diff --git a/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs b/src/MediatR/Pipeline/RequestPostProcessorBehavior.cs
@@ -10,7 +10,7 @@ namespace MediatR.Pipeline;
 /// <typeparam name="TRequest">Request type</typeparam>
 /// <typeparam name="TResponse">Response type</typeparam>
 public class RequestPostProcessorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
     private readonly IEnumerable<IRequestPostProcessor<TRequest, TResponse>> _postProcessors;
 

diff --git a/src/MediatR/Pipeline/RequestPreProcessorBehavior.cs b/src/MediatR/Pipeline/RequestPreProcessorBehavior.cs
@@ -10,7 +10,7 @@ namespace MediatR.Pipeline;
 /// <typeparam name="TRequest"></typeparam>
 /// <typeparam name="TResponse"></typeparam>
 public class RequestPreProcessorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-    where TRequest : IRequest<TResponse>
+    where TRequest : notnull
 {
     private readonly IEnumerable<IRequestPreProcessor<TRequest>> _preProcessors;
 

diff --git a/test/MediatR.Tests/PipelineTests.cs b/test/MediatR.Tests/PipelineTests.cs
@@ -98,8 +98,8 @@ public async Task<Pong> Handle(Ping request, RequestHandlerDelegate<Pong> next,
         }
     }
 
-    public class InnerBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-        where TRequest : IRequest<TResponse>
+    public class InnerBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> 
+        where TRequest : notnull
     {
         private readonly Logger _output;
 
@@ -118,8 +118,7 @@ public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TRe
         }
     }
 
-    public class OuterBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-        where TRequest : IRequest<TResponse>
+    public class OuterBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : notnull
     {
         private readonly Logger _output;
 
@@ -139,7 +138,7 @@ public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TRe
     }
 
     public class ConstrainedBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-        where TRequest : Ping, IRequest<TResponse>
+        where TRequest : Ping
         where TResponse : Pong
     {
         private readonly Logger _output;