Skip to content

Fix awaitable response type comparison in async pipelines #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hasanxdev merged 2 commits into from
Oct 8, 2025
Merged

Fix awaitable response type comparison in async pipelines #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eacf28a
Add test for request handler with async enumerable response
wassim-k Oct 6, 2025
d184999
Fix awaitable response type comparison in async pipelines
wassim-k Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/DispatchR/Configuration/ServiceRegistrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ public static void RegisterHandlers(IServiceCollection services, List<Type> allT
continue;
}

// If both are non-generic (Task vs ValueTask), then compare directly
if (!responseTypeArg.GenericTypeArguments.Any() &&
!genericHandlerResponseType.GenericTypeArguments.Any() &&
responseTypeArg != genericHandlerResponseType)
{
continue; // Task != ValueTask, so skip
}

// register async generic pipelines
if (responseTypeArg.GenericTypeArguments.Any())
{
Expand Down
3 changes: 3 additions & 0 deletions tests/DispatchR.TestCommon/Fixtures/Interfaces/INonGenericInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
namespace DispatchR.TestCommon.Fixtures.Interfaces;

public interface INonGenericInterface;
14 changes: 14 additions & 0 deletions tests/DispatchR.TestCommon/Fixtures/SendRequest/AsyncEnumerable/AsyncEnumerableHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Runtime.CompilerServices;
using DispatchR.Abstractions.Send;

namespace DispatchR.TestCommon.Fixtures.SendRequest.AsyncEnumerable;

public class AsyncEnumerableHandler : IRequestHandler<AsyncEnumerableRequest, IAsyncEnumerable<int>>
{
public async IAsyncEnumerable<int> Handle(AsyncEnumerableRequest request, [EnumeratorCancellation] CancellationToken cancellationToken)
{
yield return await System.Threading.Tasks.Task.FromResult(1);
yield return await System.Threading.Tasks.Task.FromResult(2);
yield return await System.Threading.Tasks.Task.FromResult(3);
}
}
5 changes: 5 additions & 0 deletions tests/DispatchR.TestCommon/Fixtures/SendRequest/AsyncEnumerable/AsyncEnumerableRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using DispatchR.Abstractions.Send;

namespace DispatchR.TestCommon.Fixtures.SendRequest.AsyncEnumerable;

public class AsyncEnumerableRequest : IRequest<AsyncEnumerableRequest, IAsyncEnumerable<int>>;
21 changes: 21 additions & 0 deletions tests/DispatchR.TestCommon/Fixtures/SendRequest/AsyncEnumerablePipelineBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using System.Runtime.CompilerServices;
using DispatchR.Abstractions.Send;
using DispatchR.TestCommon.Fixtures.Interfaces;

namespace DispatchR.TestCommon.Fixtures.SendRequest;

public class AsyncEnumerablePipelineBehavior<TRequest, TResponse>
: INonGenericInterface,
Copy link
Copy Markdown
Contributor Author

@wassim-k wassim-k Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This interface was added here to achieve 100% code coverage when searching for a matching pipeline interface:

pipeline.GetInterfaces().First(inter =>
    inter.IsGenericType && // <=== This branch when `false`
    inter.GetGenericTypeDefinition() == behaviorType).GenericTypeArguments[1]

IPipelineBehavior<TRequest, IAsyncEnumerable<TResponse>>
where TRequest : class, IRequest<TRequest, IAsyncEnumerable<TResponse>>, new()
{
public required IRequestHandler<TRequest, IAsyncEnumerable<TResponse>> NextPipeline { get; set; }

public async IAsyncEnumerable<TResponse> Handle(TRequest request, [EnumeratorCancellation] CancellationToken cancellationToken)
{
await foreach (var item in NextPipeline.Handle(request, cancellationToken))
{
yield return item;
}
}
}
15 changes: 15 additions & 0 deletions ...s/DispatchR.TestCommon/Fixtures/SendRequest/GenericPipelineBehaviorTaskWithoutResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using DispatchR.Abstractions.Send;

namespace DispatchR.TestCommon.Fixtures.SendRequest;

public class GenericPipelineBehaviorTaskWithoutResponse<TRequest, TResponse>()
: IPipelineBehavior<TRequest, System.Threading.Tasks.Task>
where TRequest : class, IRequest<TRequest, System.Threading.Tasks.Task>, new()
{
public System.Threading.Tasks.Task Handle(TRequest request, CancellationToken cancellationToken)
{
return NextPipeline.Handle(request, cancellationToken);
}

public required IRequestHandler<TRequest, System.Threading.Tasks.Task> NextPipeline { get; set; }
}
Loading