diff --git a/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs b/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs index 2aa5d69b..d8ba6a63 100644 --- a/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs +++ b/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs @@ -6,7 +6,7 @@ namespace CustomSerializer { - internal class AzureDevOpsEventsConsumer : IEventBusConsumer + internal class AzureDevOpsEventsConsumer : IEventConsumer { private readonly ILogger logger; diff --git a/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs b/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs index 2ecf7b5d..cf644cf0 100644 --- a/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs +++ b/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs @@ -6,7 +6,7 @@ namespace InMemoryBackgroundProcessing { - public class VideoUploadedConsumer : IEventBusConsumer + public class VideoUploadedConsumer : IEventConsumer { private static readonly TimeSpan SimulationDuration = TimeSpan.FromSeconds(3); diff --git a/examples/MultiEventsConsumer/MultiEventsConsumer.cs b/examples/MultiEventsConsumer/MultiEventsConsumer.cs index ca97845f..e3773f67 100644 --- a/examples/MultiEventsConsumer/MultiEventsConsumer.cs +++ b/examples/MultiEventsConsumer/MultiEventsConsumer.cs @@ -7,7 +7,7 @@ namespace MultiEventsConsumer { - public class MultiEventsConsumer : IEventBusConsumer, IEventBusConsumer + public class MultiEventsConsumer : IEventConsumer, IEventConsumer { private static readonly TimeSpan SimulationDuration = TimeSpan.FromSeconds(3); diff --git a/examples/SimpleConsumer/SampleEventConsumer.cs b/examples/SimpleConsumer/SampleEventConsumer.cs index e922e5a1..3def07d1 100644 --- a/examples/SimpleConsumer/SampleEventConsumer.cs +++ b/examples/SimpleConsumer/SampleEventConsumer.cs @@ -6,7 +6,7 @@ namespace SimpleConsumer { - public class SampleEventConsumer : IEventBusConsumer + public class SampleEventConsumer : IEventConsumer { private readonly EventCounter counter; private readonly ILogger logger; diff --git a/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsTransport.cs b/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsTransport.cs index a72bc55d..499e486d 100644 --- a/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsTransport.cs +++ b/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsTransport.cs @@ -349,7 +349,7 @@ private async Task OnMessageReceivedAsync(ConsumerRegistratio Message message, CancellationToken cancellationToken) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var messageId = message.MessageId; message.TryGetAttribute(AttributeNames.CorrelationId, out var correlationId); diff --git a/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsTransport.cs b/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsTransport.cs index 965f4f27..b9b28760 100644 --- a/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsTransport.cs +++ b/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsTransport.cs @@ -328,7 +328,7 @@ private async Task GetProcessorAsync(ConsumerRegistration private async Task OnEventReceivedAsync(ConsumerRegistration reg, EventProcessorClient processor, ProcessEventArgs args) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { if (!args.HasEvent) { diff --git a/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageTransport.cs b/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageTransport.cs index 51a2c016..a20833ed 100644 --- a/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageTransport.cs +++ b/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageTransport.cs @@ -310,7 +310,7 @@ private async Task OnMessageReceivedAsync(ConsumerRegistratio IServiceScope scope, CancellationToken cancellationToken) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var messageId = message.MessageId; using var log_scope = Logger.BeginScopeForConsume(id: messageId, diff --git a/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusTransport.cs b/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusTransport.cs index 5017eb4a..0584c127 100644 --- a/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusTransport.cs +++ b/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusTransport.cs @@ -497,7 +497,7 @@ private async Task CreateSubscriptionIfNotExistsAsync(string topicName, string s private async Task OnMessageReceivedAsync(ConsumerRegistration reg, ProcessMessageEventArgs args) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var message = args.Message; var messageId = message.MessageId; diff --git a/src/Tingle.EventBus.Transports.Kafka/KafkaTransport.cs b/src/Tingle.EventBus.Transports.Kafka/KafkaTransport.cs index 6e31d33f..fddcd722 100644 --- a/src/Tingle.EventBus.Transports.Kafka/KafkaTransport.cs +++ b/src/Tingle.EventBus.Transports.Kafka/KafkaTransport.cs @@ -254,7 +254,7 @@ private async Task OnEventReceivedAsync(ConsumerRegistration Message message, CancellationToken cancellationToken) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var messageKey = message.Key; message.Headers.TryGetValue(AttributeNames.CorrelationId, out var correlationId); diff --git a/src/Tingle.EventBus.Transports.Kafka/KafkaTransportOptions.cs b/src/Tingle.EventBus.Transports.Kafka/KafkaTransportOptions.cs index 19be8ff4..7ff75929 100644 --- a/src/Tingle.EventBus.Transports.Kafka/KafkaTransportOptions.cs +++ b/src/Tingle.EventBus.Transports.Kafka/KafkaTransportOptions.cs @@ -31,7 +31,7 @@ public class KafkaTransportOptions: EventBusTransportOptionsBase /// /// The number of events consumed after which to checkpoint. /// For values other than 1, the implementations of - /// for Kafka events must + /// for Kafka events must /// handle duplicate detection. /// /// diff --git a/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqTransport.cs b/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqTransport.cs index cc352648..a7e7d9f2 100644 --- a/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqTransport.cs +++ b/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqTransport.cs @@ -295,7 +295,7 @@ private async Task ConnectConsumersAsync(CancellationToken cancellationToken) private async Task OnMessageReceivedAsync(ConsumerRegistration reg, IModel channel, BasicDeliverEventArgs args, CancellationToken cancellationToken) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var messageId = args.BasicProperties?.MessageId; using var log_scope = Logger.BeginScopeForConsume(id: messageId, diff --git a/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs b/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs index 40f3efaf..9bc3576c 100644 --- a/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs +++ b/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs @@ -119,7 +119,7 @@ public EventBusBuilder UseDefaultSerializer() where TEventSeri /// design of . /// /// - public EventBusBuilder AddConsumer(ServiceLifetime lifetime = ServiceLifetime.Scoped) where TConsumer : class, IEventBusConsumer + public EventBusBuilder AddConsumer(ServiceLifetime lifetime = ServiceLifetime.Scoped) where TConsumer : class, IEventConsumer { var consumerType = typeof(TConsumer); if (consumerType.IsAbstract) @@ -130,7 +130,7 @@ public EventBusBuilder AddConsumer(ServiceLifetime lifetime = Service // register the consumer for resolution Services.Add(ServiceDescriptor.Describe(consumerType, consumerType, lifetime)); - var genericConsumerType = typeof(IEventBusConsumer<>); + var genericConsumerType = typeof(IEventConsumer<>); var eventTypes = new List(); // get events from each implementation of IEventConsumer @@ -152,7 +152,7 @@ public EventBusBuilder AddConsumer(ServiceLifetime lifetime = Service // we must have at least one implemented event if (eventTypes.Count <= 0) { - throw new InvalidOperationException($"{consumerType.FullName} must implement '{nameof(IEventBusConsumer)}' at least once."); + throw new InvalidOperationException($"{consumerType.FullName} must implement '{nameof(IEventConsumer)}' at least once."); } // add the event types to the registrations @@ -177,7 +177,7 @@ public EventBusBuilder AddConsumer(ServiceLifetime lifetime = Service /// /// /// - public EventBusBuilder RemoveConsumer() where TConsumer : class, IEventBusConsumer + public EventBusBuilder RemoveConsumer() where TConsumer : class, IEventConsumer { // Deregister from services collection Services.RemoveAll(); diff --git a/src/Tingle.EventBus/IEventBusConsumer.cs b/src/Tingle.EventBus/IEventConsumer.cs similarity index 86% rename from src/Tingle.EventBus/IEventBusConsumer.cs rename to src/Tingle.EventBus/IEventConsumer.cs index f07d9a23..2665daf5 100644 --- a/src/Tingle.EventBus/IEventBusConsumer.cs +++ b/src/Tingle.EventBus/IEventConsumer.cs @@ -6,7 +6,7 @@ namespace Tingle.EventBus /// /// Contract describing a consumer of one or more events. /// - public interface IEventBusConsumer + public interface IEventConsumer { // Intentionally left blank } @@ -14,7 +14,7 @@ public interface IEventBusConsumer /// /// Contract describing a consumer of an event. /// - public interface IEventBusConsumer : IEventBusConsumer + public interface IEventConsumer : IEventConsumer { /// /// Consume an event of the provided type. diff --git a/src/Tingle.EventBus/Transports/EventBusTransportBase.cs b/src/Tingle.EventBus/Transports/EventBusTransportBase.cs index e9b326de..670ec170 100644 --- a/src/Tingle.EventBus/Transports/EventBusTransportBase.cs +++ b/src/Tingle.EventBus/Transports/EventBusTransportBase.cs @@ -170,7 +170,7 @@ protected async Task SerializeAsync(Stream body, protected async Task ConsumeAsync(EventContext @event, IServiceScope scope, CancellationToken cancellationToken) - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { // Resolve the consumer var consumer = scope.ServiceProvider.GetRequiredService(); diff --git a/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs b/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs index e70b6983..1ef7d497 100644 --- a/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs +++ b/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs @@ -317,7 +317,7 @@ private async Task OnMessageReceivedAsync(ConsumerRegistratio IServiceScope scope, CancellationToken cancellationToken) where TEvent : class - where TConsumer : IEventBusConsumer + where TConsumer : IEventConsumer { var messageId = message.MessageId; diff --git a/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs b/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs index 648f81c7..fb87cc97 100644 --- a/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs +++ b/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs @@ -201,7 +201,7 @@ public Task SerializeAsync(Stream stream, EventContext context, HostInfo h class DummyEventSerializer2 { } // should not implement IEventSerializer - class TestConsumer1 : IEventBusConsumer + class TestConsumer1 : IEventConsumer { public Task ConsumeAsync(EventContext context, CancellationToken cancellationToken = default) { @@ -210,7 +210,7 @@ public Task ConsumeAsync(EventContext context, CancellationToken can } [ConsumerName("sample-consumer")] - class TestConsumer2 : IEventBusConsumer + class TestConsumer2 : IEventConsumer { public Task ConsumeAsync(EventContext context, CancellationToken cancellationToken = default) {