Do not auto discover generic event handlers

framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs

@@ -49,6 +49,11 @@ private static void AddEventHandlers(IServiceCollection services)
 
  services.OnRegistered(context =>
  {
+ if (context.ImplementationType.IsGenericTypeDefinition)
+ {
+ return;
+ }
+
  if (ReflectionHelper.IsAssignableToGenericType(context.ImplementationType, typeof(ILocalEventHandler<>)))
  {
  localHandlers.Add(context.ImplementationType);

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/MyGenericDistributedEventHandler.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.EventBus.Distributed;
+
+public class MyGenericDistributedEventHandler<TEvent> : IDistributedEventHandler<TEvent>
+{
+ private readonly ICurrentTenant _currentTenant;
+
+ public MyGenericDistributedEventHandler(ICurrentTenant currentTenant)
+ {
+ _currentTenant = currentTenant;
+ }
+
+ public static Guid? TenantId { get; set; }
+
+ public Task HandleEventAsync(TEvent eventData)
+ {
+ TenantId = _currentTenant.Id;
+ return Task.CompletedTask;
+ }
+}

framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/EventBusTestModule.cs

@@ -1,8 +1,25 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.EventBus;
 
 [DependsOn(typeof(AbpEventBusModule))]
 public class EventBusTestModule : AbpModule
 {
+ public override void ConfigureServices(ServiceConfigurationContext context)
+ {
+ context.Services.TryAddTransient(typeof(MyGenericDistributedEventHandler<>));
+ }
+
+ public override void OnApplicationInitialization(ApplicationInitializationContext context)
+ {
+ var distributedEventBus = context.ServiceProvider.GetRequiredService<IDistributedEventBus>();
+ var scopeFactory = context.ServiceProvider.GetRequiredService<IServiceScopeFactory>();
+
+ var eventType = typeof(MySimpleEventData);
+ var myHandlerType = typeof(MyGenericDistributedEventHandler<>).MakeGenericType(eventType);
+ distributedEventBus.Subscribe(eventType, new IocEventHandlerFactory(scopeFactory, myHandlerType));
+ }
 }