Skip to content

Commit 7ceecc3

Browse files
MapleWithoutWords黎明
and
黎明
authored
update: change IMiddleware to IEventMiddleware (#430)
Co-authored-by: 黎明 <liming@hymson.com>
1 parent 6b9d164 commit 7ceecc3

File tree

20 files changed

+56
-56
lines changed

20 files changed

+56
-56
lines changed

src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.Events/Middleware.cs src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.Events/EventMiddleware.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.BuildingBlocks.Dispatcher.Events;
55

6-
public abstract class Middleware<TEvent> : IMiddleware<TEvent> where TEvent : IEvent
6+
public abstract class EventMiddleware<TEvent> : IEventMiddleware<TEvent> where TEvent : IEvent
77
{
88
public virtual bool SupportRecursive => true;
99

src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.Events/IMiddleware.cs src/BuildingBlocks/Dispatcher/Masa.BuildingBlocks.Dispatcher.Events/IEventMiddleware.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ namespace Masa.BuildingBlocks.Dispatcher.Events;
66
public delegate Task EventHandlerDelegate();
77

88
/// <summary>
9-
/// Middleware is assembled into an event pipeline to handle invoke event and result
9+
/// IEventMiddleware is assembled into an event pipeline to handle invoke event and result
1010
/// </summary>
11-
public interface IMiddleware<in TEvent>
11+
public interface IEventMiddleware<in TEvent>
1212
where TEvent : IEvent
1313
{
1414
Task HandleAsync(TEvent @event, EventHandlerDelegate next);
1515

1616
/// <summary>
17-
/// If Recursive is not supported, the current Middleware only executes once
18-
/// If Recursive is supported, Middleware will be executed everytime when EventBus is nested
17+
/// If Recursive is not supported, the current IEventMiddleware only executes once
18+
/// If Recursive is supported, IEventMiddleware will be executed everytime when EventBus is nested
1919
/// </summary>
2020
bool SupportRecursive { get; }
2121
}

src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events.FluentValidation/Middleware/ValidatorMiddleware.cs src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events.FluentValidation/Middleware/ValidatorEventMiddleware.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
// ReSharper disable once CheckNamespace
55

66
namespace Masa.BuildingBlocks.Dispatcher.Events;
77

8-
public class ValidatorMiddleware<TEvent> : Middleware<TEvent>
8+
public class ValidatorEventMiddleware<TEvent> : EventMiddleware<TEvent>
99
where TEvent : IEvent
1010
{
11-
private readonly ILogger<ValidatorMiddleware<TEvent>>? _logger;
11+
private readonly ILogger<ValidatorEventMiddleware<TEvent>>? _logger;
1212
private readonly IEnumerable<IValidator<TEvent>> _validators;
1313

14-
public ValidatorMiddleware(IEnumerable<IValidator<TEvent>> validators, ILogger<ValidatorMiddleware<TEvent>>? logger = null)
14+
public ValidatorEventMiddleware(IEnumerable<IValidator<TEvent>> validators, ILogger<ValidatorEventMiddleware<TEvent>>? logger = null)
1515
{
1616
_validators = validators;
1717
_logger = logger;

src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events/EventBus.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task PublishAsync<TEvent>(TEvent @event, CancellationToken cancella
3636
ArgumentNullException.ThrowIfNull(@event, nameof(@event));
3737
var eventType = @event.GetType();
3838

39-
var middlewares = _serviceProvider.GetRequiredService<IEnumerable<IMiddleware<TEvent>>>();
39+
var middlewares = _serviceProvider.GetRequiredService<IEnumerable<IEventMiddleware<TEvent>>>();
4040
if (!_options.UnitOfWorkRelation.ContainsKey(eventType))
4141
{
4242
throw new NotSupportedException(

src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events/EventBusBuilder.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Contrib.Dispatcher.Events;
@@ -18,10 +18,10 @@ public class EventBusBuilder : IEventBusBuilder
1818
/// <exception cref="ArgumentException"></exception>
1919
public IEventBusBuilder UseMiddleware(Type middlewareType, ServiceLifetime middlewareLifetime = ServiceLifetime.Transient)
2020
{
21-
if (!typeof(IMiddleware<>).IsGenericInterfaceAssignableFrom(middlewareType))
21+
if (!typeof(IEventMiddleware<>).IsGenericInterfaceAssignableFrom(middlewareType))
2222
throw new ArgumentException($"{middlewareType.Name} doesn't implement IMiddleware<>");
2323

24-
var descriptor = new ServiceDescriptor(typeof(IMiddleware<>), middlewareType, middlewareLifetime);
24+
var descriptor = new ServiceDescriptor(typeof(IEventMiddleware<>), middlewareType, middlewareLifetime);
2525
Services.TryAddEnumerable(descriptor);
2626
return this;
2727
}

src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events/Extensions/ServiceCollectionExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static IServiceCollection AddEventBus(
2929

3030
services.AddSingleton<EventBusProvider>();
3131

32-
services.TryAddEnumerable(new ServiceDescriptor(typeof(IMiddleware<>), typeof(TransactionMiddleware<>), ServiceLifetime.Transient));
32+
services.TryAddEnumerable(new ServiceDescriptor(typeof(IEventMiddleware<>), typeof(TransactionEventMiddleware<>), ServiceLifetime.Transient));
3333

3434
var builder = new EventBusBuilder(services);
3535
eventBusBuilder?.Invoke(builder);
@@ -74,7 +74,7 @@ public static IServiceCollection AddTestEventBus(
7474
services.TryAddSingleton<IExceptionStrategyProvider, DefaultExceptionStrategyProvider>();
7575
services.TryAdd(typeof(IExecutionStrategy), typeof(ExecutionStrategy), ServiceLifetime.Singleton);
7676
services.TryAddScoped<IInitializeServiceProvider, InitializeServiceProvider>();
77-
services.AddTransient(typeof(IMiddleware<>), typeof(TransactionMiddleware<>));
77+
services.AddTransient(typeof(IEventMiddleware<>), typeof(TransactionEventMiddleware<>));
7878
services.AddScoped(typeof(IEventBus), typeof(EventBus));
7979

8080
return services;

src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events/Internal/Middleware/TransactionMiddleware.cs src/Contrib/Dispatcher/Masa.Contrib.Dispatcher.Events/Internal/Middleware/TransactionEventMiddleware.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
namespace Masa.Contrib.Dispatcher.Events.Internal.Middleware;
55

6-
internal class TransactionMiddleware<TEvent> : Middleware<TEvent>
6+
internal class TransactionEventMiddleware<TEvent> : EventMiddleware<TEvent>
77
where TEvent : IEvent
88
{
99
private readonly IInitializeServiceProvider _initializeServiceProvider;
1010
private readonly IUnitOfWork? _unitOfWork;
1111

1212
public override bool SupportRecursive => false;
1313

14-
public TransactionMiddleware(IInitializeServiceProvider initializeServiceProvider, IUnitOfWork? unitOfWork = null)
14+
public TransactionEventMiddleware(IInitializeServiceProvider initializeServiceProvider, IUnitOfWork? unitOfWork = null)
1515
{
1616
_initializeServiceProvider = initializeServiceProvider;
1717
_unitOfWork = unitOfWork;

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests.Perfs/Extensions/Middleware/LoggingMiddleware.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Masa.Contrib.Dispatcher.Events.Tests.Perfs.Extensions.Middleware;
55

6-
public class LoggingMiddleware<TEvent> : Middleware<TEvent> where TEvent : notnull, IEvent
6+
public class LoggingMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : notnull, IEvent
77
{
88
private readonly ILogger<LoggingMiddleware<TEvent>>? _logger;
99
public LoggingMiddleware(ILogger<LoggingMiddleware<TEvent>>? logger = null) => _logger = logger;

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/AssemblyResolutionTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public void TestResolveEventBus()
1111
{
1212
var services = new ServiceCollection();
1313
services
14-
.AddEventBus(eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(LoggingMiddleware<>)))
14+
.AddEventBus(eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(LoggingEventMiddleware<>)))
1515
.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
1616
var serviceProvider = services.BuildServiceProvider();
1717
var eventBus = serviceProvider.GetService<IEventBus>();
@@ -57,7 +57,7 @@ public void TestEventBus()
5757
{
5858
var services = new ServiceCollection();
5959
services.AddLogging(loggingBuilder => loggingBuilder.AddConsole());
60-
services.AddTestEventBus(AppDomain.CurrentDomain.GetAssemblies(), ServiceLifetime.Scoped,eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(LoggingMiddleware<>)));
60+
services.AddTestEventBus(AppDomain.CurrentDomain.GetAssemblies(), ServiceLifetime.Scoped,eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(LoggingEventMiddleware<>)));
6161
var serviceProvider = services.BuildServiceProvider();
6262
var eventBus = serviceProvider.GetService<IEventBus>();
6363
Assert.IsNotNull(eventBus, "Event bus injection failed");
@@ -72,7 +72,7 @@ public void TestUseEventBus()
7272
Mock<IDispatcherOptions> dispatcherOptions = new();
7373
dispatcherOptions.Setup(option => option.Assemblies).Returns(assemblies).Verifiable();
7474
dispatcherOptions.Setup(option => option.Services).Returns(services).Verifiable();
75-
dispatcherOptions.Object.UseEventBus(eventBuilder => eventBuilder.UseMiddleware(typeof(LoggingMiddleware<>)));
75+
dispatcherOptions.Object.UseEventBus(eventBuilder => eventBuilder.UseMiddleware(typeof(LoggingEventMiddleware<>)));
7676
var eventBus = services.BuildServiceProvider().GetService<IEventBus>();
7777
Assert.IsNotNull(eventBus);
7878
}

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/EventBusBuilderTest.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Contrib.Dispatcher.Events.Tests;
@@ -11,7 +11,7 @@ public void TestUseMiddleware()
1111
{
1212
var services = new ServiceCollection();
1313
var eventBuilder = new EventBusBuilder(services);
14-
eventBuilder.UseMiddleware(typeof(LoggingMiddleware<>));
14+
eventBuilder.UseMiddleware(typeof(LoggingEventMiddleware<>));
1515

1616
Assert.AreEqual(1, services.Count);
1717
}
@@ -21,7 +21,7 @@ public void TestUseMiddleware2()
2121
{
2222
var services = new ServiceCollection();
2323
var eventBuilder = new EventBusBuilder(services);
24-
eventBuilder.UseMiddleware(new[] { typeof(LoggingMiddleware<>), typeof(RequestMiddleware<>) });
24+
eventBuilder.UseMiddleware(new[] { typeof(LoggingEventMiddleware<>), typeof(RequestEventMiddleware<>) });
2525

2626
Assert.AreEqual(2, services.Count);
2727
}
@@ -30,11 +30,11 @@ public void TestUseMiddleware2()
3030
public async Task TestMiddlewareByOrderOfExecutionAsync()
3131
{
3232
var services = new ServiceCollection();
33-
services.AddEventBus(new[] { typeof(CustomMiddleware<>).Assembly }, eventBusBuilder
34-
=> eventBusBuilder.UseMiddleware(new[] { typeof(CustomMiddleware<>), typeof(Custom2Middleware<>) }));
33+
services.AddEventBus(new[] { typeof(CustomEventMiddleware<>).Assembly }, eventBusBuilder
34+
=> eventBusBuilder.UseMiddleware(new[] { typeof(CustomEventMiddleware<>), typeof(Custom2EventMiddleware<>) }));
3535
var serviceProvider = services.BuildServiceProvider();
3636

37-
var middlewares = serviceProvider.GetService<IEnumerable<IMiddleware<MiddlewareEvent>>>();
37+
var middlewares = serviceProvider.GetService<IEnumerable<IEventMiddleware<MiddlewareEvent>>>();
3838
Assert.IsNotNull(middlewares);
3939
Assert.AreEqual(3, middlewares.Count());
4040

@@ -43,15 +43,15 @@ public async Task TestMiddlewareByOrderOfExecutionAsync()
4343
await eventBus.PublishAsync(@event);
4444

4545
Assert.AreEqual(3, @event.Results.Count);
46-
Assert.AreEqual(nameof(CustomMiddleware<MiddlewareEvent>), @event.Results[0]);
47-
Assert.AreEqual(nameof(Custom2Middleware<MiddlewareEvent>), @event.Results[1]);
46+
Assert.AreEqual(nameof(CustomEventMiddleware<MiddlewareEvent>), @event.Results[0]);
47+
Assert.AreEqual(nameof(Custom2EventMiddleware<MiddlewareEvent>), @event.Results[1]);
4848
Assert.AreEqual(nameof(EventHandlers.MiddlewareEventHandler), @event.Results[2]);
4949
}
5050

51-
public class RequestMiddleware<TEvent> : Middleware<TEvent> where TEvent : IEvent
51+
public class RequestEventMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : IEvent
5252
{
53-
private readonly ILogger<RequestMiddleware<TEvent>>? _logger;
54-
public RequestMiddleware(ILogger<RequestMiddleware<TEvent>>? logger = null) => _logger = logger;
53+
private readonly ILogger<RequestEventMiddleware<TEvent>>? _logger;
54+
public RequestEventMiddleware(ILogger<RequestEventMiddleware<TEvent>>? logger = null) => _logger = logger;
5555

5656
public override async Task HandleAsync(TEvent @event, EventHandlerDelegate next)
5757
{

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/CustomMiddleware.cs src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/Custom2EventMiddleware.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Contrib.Dispatcher.Events.Tests.Middleware;
55

6-
public class CustomMiddleware<TEvent> : Middleware<TEvent> where TEvent : IEvent
6+
public class Custom2EventMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : IEvent
77
{
88
public override Task HandleAsync(TEvent @event, EventHandlerDelegate next)
99
{
1010
if (@event is MiddlewareEvent middlewareEvent)
1111
{
12-
middlewareEvent.Results.Add(nameof(CustomMiddleware<TEvent>));
12+
middlewareEvent.Results.Add(nameof(Custom2EventMiddleware<TEvent>));
1313
}
1414
return next();
1515
}

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/Custom2Middleware.cs src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/CustomEventMiddleware.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Contrib.Dispatcher.Events.Tests.Middleware;
55

6-
public class Custom2Middleware<TEvent> : Middleware<TEvent> where TEvent : IEvent
6+
public class CustomEventMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : IEvent
77
{
88
public override Task HandleAsync(TEvent @event, EventHandlerDelegate next)
99
{
1010
if (@event is MiddlewareEvent middlewareEvent)
1111
{
12-
middlewareEvent.Results.Add(nameof(Custom2Middleware<TEvent>));
12+
middlewareEvent.Results.Add(nameof(CustomEventMiddleware<TEvent>));
1313
}
1414
return next();
1515
}

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/LoggingMiddleware.cs src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/Middleware/LoggingEventMiddleware.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
namespace Masa.Contrib.Dispatcher.Events.Tests.Middleware;
55

6-
public class LoggingMiddleware<TEvent> : Middleware<TEvent> where TEvent : IEvent
6+
public class LoggingEventMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : IEvent
77
{
8-
private readonly ILogger<LoggingMiddleware<TEvent>>? _logger;
9-
public LoggingMiddleware(ILogger<LoggingMiddleware<TEvent>>? logger = null) => _logger = logger;
8+
private readonly ILogger<LoggingEventMiddleware<TEvent>>? _logger;
9+
public LoggingEventMiddleware(ILogger<LoggingEventMiddleware<TEvent>>? logger = null) => _logger = logger;
1010

1111
public override async Task HandleAsync(TEvent @event, EventHandlerDelegate next)
1212
{

src/Contrib/Dispatcher/Tests/Masa.Contrib.Dispatcher.Events.Tests/TestBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected void ResetMemoryEventBus(Func<IServiceCollection, IServiceCollection>?
3333
});
3434
}
3535

36-
_services.AddTransient(typeof(IMiddleware<>), typeof(LoggingMiddleware<>));
36+
_services.AddTransient(typeof(IEventMiddleware<>), typeof(LoggingEventMiddleware<>));
3737
func?.Invoke(_services);
3838
_services = assemblies == null ? _services.AddTestEventBus(_defaultAssemblies, ServiceLifetime.Scoped) : _services.AddTestEventBus(assemblies, ServiceLifetime.Scoped);
3939
_serviceProvider = _services.BuildServiceProvider();

src/Contrib/Isolation/Masa.Contrib.Isolation/Extensions/ServiceCollectionExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void AddIsolation(this IServiceCollection services, Action<Isolati
2929

3030
services
3131
.TryAddConfigure<IsolationDbConnectionOptions>()
32-
.AddTransient(typeof(IMiddleware<>), typeof(IsolationMiddleware<>))
32+
.AddTransient(typeof(IEventMiddleware<>), typeof(IsolationEventMiddleware<>))
3333
.TryAddSingleton<IDbConnectionStringProvider, IsolationDbContextProvider>();
3434

3535
if (services.Any(service => service.ServiceType == typeof(IConnectionStringProvider)))

src/Contrib/Isolation/Masa.Contrib.Isolation/Middleware/IsolationMiddleware.cs src/Contrib/Isolation/Masa.Contrib.Isolation/Middleware/IsolationEventMiddleware.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
namespace Masa.Contrib.Isolation.Middleware;
55

6-
public class IsolationMiddleware<TEvent> : Middleware<TEvent> where TEvent : IEvent
6+
public class IsolationEventMiddleware<TEvent> : EventMiddleware<TEvent> where TEvent : IEvent
77
{
88
private readonly IEnumerable<IIsolationMiddleware> _middlewares;
99
private readonly IHttpContextAccessor _httpContextAccessor;
1010

11-
public IsolationMiddleware(IEnumerable<IIsolationMiddleware> middlewares, IHttpContextAccessor httpContextAccessor)
11+
public IsolationEventMiddleware(IEnumerable<IIsolationMiddleware> middlewares, IHttpContextAccessor httpContextAccessor)
1212
{
1313
_middlewares = middlewares;
1414
_httpContextAccessor = httpContextAccessor;

test/Masa.Framework.IntegrationTests.EventBus/Infrastructure/Middleware/RecordMiddleware.cs test/Masa.Framework.IntegrationTests.EventBus/Infrastructure/Middleware/RecordEventMiddleware.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Framework.IntegrationTests.EventBus.Infrastructure.Middleware;
55

6-
public class RecordMiddleware<TEvent> : Middleware<TEvent>
6+
public class RecordEventMiddleware<TEvent> : EventMiddleware<TEvent>
77
where TEvent : IEvent
88
{
99
public static int Time { get; set; }

test/Masa.Framework.IntegrationTests.EventBus/Infrastructure/Middleware/ValidatorMiddleware.cs test/Masa.Framework.IntegrationTests.EventBus/Infrastructure/Middleware/ValidatorEventMiddleware.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// Copyright (c) MASA Stack All rights reserved.
1+
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
namespace Masa.Framework.IntegrationTests.EventBus.Infrastructure.Middleware;
55

6-
public class ValidatorMiddleware<TEvent> : Middleware<TEvent>
6+
public class ValidatorEventMiddleware<TEvent> : EventMiddleware<TEvent>
77
where TEvent : notnull, IEvent
88
{
99
private readonly IEnumerable<IValidator<TEvent>> _validators;
1010

11-
public ValidatorMiddleware(IEnumerable<IValidator<TEvent>> validators)
11+
public ValidatorEventMiddleware(IEnumerable<IValidator<TEvent>> validators)
1212
{
1313
_validators = validators;
1414
}

test/Masa.Framework.IntegrationTests.EventBus/TestBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Initialize()
2222
{
2323
dispatcherOptions
2424
.UseIntegrationEventBus(option => option.UseTestPub().UseEventLog<CustomDbContext>())
25-
.UseEventBus(eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(RecordMiddleware<>)).UseMiddleware(typeof(ValidatorMiddleware<>)))
25+
.UseEventBus(eventBusBuilder => eventBusBuilder.UseMiddleware(typeof(RecordEventMiddleware<>)).UseMiddleware(typeof(ValidatorEventMiddleware<>)))
2626
.UseUoW<CustomDbContext>(optionBuilder =>
2727
{
2828
optionBuilder.UseTestSqlite($"data source=disabled-soft-delete-db-{Guid.NewGuid()}").UseFilter();

test/Masa.Framework.IntegrationTests.EventBus/TestDispatcher.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public async Task TestCommandReturnUseTransacationAndTimeEqual1Async()
3434
};
3535
await eventBus.PublishAsync(command);
3636

37-
Assert.IsTrue(RecordMiddleware<RegisterUserCommand>.Time == 1);
38-
Assert.IsTrue(RecordMiddleware<CheckUserQuery>.Time == 0);
37+
Assert.IsTrue(RecordEventMiddleware<RegisterUserCommand>.Time == 1);
38+
Assert.IsTrue(RecordEventMiddleware<CheckUserQuery>.Time == 0);
3939

4040
var dbContext = serviceProvider.GetRequiredService<CustomDbContext>();
4141
Assert.IsTrue(dbContext.Set<User>().Count() == 1);
@@ -61,8 +61,8 @@ await dbContext.Set<User>().AddAsync(new User()
6161
await eventBus.PublishAsync(query);
6262
Assert.IsTrue(query.Result == default);
6363

64-
Assert.IsTrue(RecordMiddleware<UserAgeQuery>.Time == 1);
65-
Assert.IsTrue(RecordMiddleware<CheckUserQuery>.Time == 0);
64+
Assert.IsTrue(RecordEventMiddleware<UserAgeQuery>.Time == 1);
65+
Assert.IsTrue(RecordEventMiddleware<CheckUserQuery>.Time == 0);
6666
}
6767

6868
[TestMethod]

0 commit comments

Comments
 (0)