Rename IEventBusConsumer and IEventBusConsumer<T> to IEventConsumer a…

…nd IEventConsumer<T>
tinglesoftware · Jan 10, 2021 · 9b7c214 · 9b7c214
1 parent 966d3e9
commit 9b7c214
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 21 deletions.
diff --git a/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs b/examples/CustomSerializer/AzureDevOpsEventsConsumer.cs
@@ -6,7 +6,7 @@
 
 namespace CustomSerializer
 {
-    internal class AzureDevOpsEventsConsumer : IEventBusConsumer<AzureDevOpsCodePushed>
+    internal class AzureDevOpsEventsConsumer : IEventConsumer<AzureDevOpsCodePushed>
     {
         private readonly ILogger logger;
 

diff --git a/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs b/examples/InMemoryBackgroundProcessing/VideoUploadedConsumer.cs
@@ -6,7 +6,7 @@
 
 namespace InMemoryBackgroundProcessing
 {
-    public class VideoUploadedConsumer : IEventBusConsumer<VideoUploaded>
+    public class VideoUploadedConsumer : IEventConsumer<VideoUploaded>
     {
         private static readonly TimeSpan SimulationDuration = TimeSpan.FromSeconds(3);
 

diff --git a/examples/MultiEventsConsumer/MultiEventsConsumer.cs b/examples/MultiEventsConsumer/MultiEventsConsumer.cs
@@ -7,7 +7,7 @@
 
 namespace MultiEventsConsumer
 {
-    public class MultiEventsConsumer : IEventBusConsumer<DoorClosed>, IEventBusConsumer<DoorOpened>
+    public class MultiEventsConsumer : IEventConsumer<DoorClosed>, IEventConsumer<DoorOpened>
     {
         private static readonly TimeSpan SimulationDuration = TimeSpan.FromSeconds(3);
 

diff --git a/examples/SimpleConsumer/SampleEventConsumer.cs b/examples/SimpleConsumer/SampleEventConsumer.cs
@@ -6,7 +6,7 @@
 
 namespace SimpleConsumer
 {
-    public class SampleEventConsumer : IEventBusConsumer<SampleEvent>
+    public class SampleEventConsumer : IEventConsumer<SampleEvent>
     {
         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
@@ -349,7 +349,7 @@ private async Task OnMessageReceivedAsync<TEvent, TConsumer>(ConsumerRegistratio
                                                                      Message message,
                                                                      CancellationToken cancellationToken)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             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
@@ -328,7 +328,7 @@ private async Task<EventProcessorClient> GetProcessorAsync(ConsumerRegistration
 
         private async Task OnEventReceivedAsync<TEvent, TConsumer>(ConsumerRegistration reg, EventProcessorClient processor, ProcessEventArgs args)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             if (!args.HasEvent)
             {

diff --git 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<TEvent, TConsumer>(ConsumerRegistratio
                                                                      IServiceScope scope,
                                                                      CancellationToken cancellationToken)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             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
@@ -497,7 +497,7 @@ private async Task CreateSubscriptionIfNotExistsAsync(string topicName, string s
 
         private async Task OnMessageReceivedAsync<TEvent, TConsumer>(ConsumerRegistration reg, ProcessMessageEventArgs args)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             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
@@ -254,7 +254,7 @@ private async Task OnEventReceivedAsync<TEvent, TConsumer>(ConsumerRegistration
                                                                    Message<string, byte[]> message,
                                                                    CancellationToken cancellationToken)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             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
@@ -31,7 +31,7 @@ public class KafkaTransportOptions: EventBusTransportOptionsBase
         /// <summary>
         /// The number of events consumed after which to checkpoint.
         /// For values other than <c>1</c>, the implementations of
-        /// <see cref="IEventBusConsumer{T}"/> for Kafka events must
+        /// <see cref="IEventConsumer{T}"/> for Kafka events must
         /// handle duplicate detection.
         /// </summary>
         /// <remarks>

diff --git 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<TEvent, TConsumer>(ConsumerRegistration reg, IModel channel, BasicDeliverEventArgs args, CancellationToken cancellationToken)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             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
@@ -119,7 +119,7 @@ public EventBusBuilder UseDefaultSerializer<TEventSerializer>() where TEventSeri
         /// design of <typeparamref name="TConsumer"/>.
         /// </param>
         /// <returns></returns>
-        public EventBusBuilder AddConsumer<TConsumer>(ServiceLifetime lifetime = ServiceLifetime.Scoped) where TConsumer : class, IEventBusConsumer
+        public EventBusBuilder AddConsumer<TConsumer>(ServiceLifetime lifetime = ServiceLifetime.Scoped) where TConsumer : class, IEventConsumer
         {
             var consumerType = typeof(TConsumer);
             if (consumerType.IsAbstract)
@@ -130,7 +130,7 @@ public EventBusBuilder AddConsumer<TConsumer>(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<Type>();
 
             // get events from each implementation of IEventConsumer<TEvent>
@@ -152,7 +152,7 @@ public EventBusBuilder AddConsumer<TConsumer>(ServiceLifetime lifetime = Service
             // we must have at least one implemented event
             if (eventTypes.Count <= 0)
             {
-                throw new InvalidOperationException($"{consumerType.FullName} must implement '{nameof(IEventBusConsumer)}<TEvent>' at least once.");
+                throw new InvalidOperationException($"{consumerType.FullName} must implement '{nameof(IEventConsumer)}<TEvent>' at least once.");
             }
 
             // add the event types to the registrations
@@ -177,7 +177,7 @@ public EventBusBuilder AddConsumer<TConsumer>(ServiceLifetime lifetime = Service
         /// </summary>
         /// <typeparam name="TConsumer"></typeparam>
         /// <returns></returns>
-        public EventBusBuilder RemoveConsumer<TConsumer>() where TConsumer : class, IEventBusConsumer
+        public EventBusBuilder RemoveConsumer<TConsumer>() where TConsumer : class, IEventConsumer
         {
             // Deregister from services collection
             Services.RemoveAll<TConsumer>();

diff --git a/src/Tingle.EventBus/IEventBusConsumer.cs → src/Tingle.EventBus/IEventConsumer.cs b/src/Tingle.EventBus/IEventBusConsumer.cs → src/Tingle.EventBus/IEventConsumer.cs
@@ -6,15 +6,15 @@ namespace Tingle.EventBus
     /// <summary>
     /// Contract describing a consumer of one or more events.
     /// </summary>
-    public interface IEventBusConsumer
+    public interface IEventConsumer
     {
         // Intentionally left blank
     }
 
     /// <summary>
     /// Contract describing a consumer of an event.
     /// </summary>
-    public interface IEventBusConsumer<T> : IEventBusConsumer
+    public interface IEventConsumer<T> : IEventConsumer
     {
         /// <summary>
         /// Consume an event of the provided type.

diff --git a/src/Tingle.EventBus/Transports/EventBusTransportBase.cs b/src/Tingle.EventBus/Transports/EventBusTransportBase.cs
@@ -170,7 +170,7 @@ protected async Task SerializeAsync<TEvent>(Stream body,
         protected async Task ConsumeAsync<TEvent, TConsumer>(EventContext<TEvent> @event,
                                                              IServiceScope scope,
                                                              CancellationToken cancellationToken)
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             // Resolve the consumer
             var consumer = scope.ServiceProvider.GetRequiredService<TConsumer>();

diff --git a/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs b/src/Tingle.EventBus/Transports/InMemory/InMemoryTransport.cs
@@ -317,7 +317,7 @@ private async Task OnMessageReceivedAsync<TEvent, TConsumer>(ConsumerRegistratio
                                                                      IServiceScope scope,
                                                                      CancellationToken cancellationToken)
             where TEvent : class
-            where TConsumer : IEventBusConsumer<TEvent>
+            where TConsumer : IEventConsumer<TEvent>
         {
             var messageId = message.MessageId;
 

diff --git a/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs b/tests/Tingle.EventBus.Tests/RegistrationExtensionsTests.cs
@@ -201,7 +201,7 @@ public Task SerializeAsync<T>(Stream stream, EventContext<T> context, HostInfo h
 
         class DummyEventSerializer2 { } // should not implement IEventSerializer
 
-        class TestConsumer1 : IEventBusConsumer<TestEvent1>
+        class TestConsumer1 : IEventConsumer<TestEvent1>
         {
             public Task ConsumeAsync(EventContext<TestEvent1> context, CancellationToken cancellationToken = default)
             {
@@ -210,7 +210,7 @@ public Task ConsumeAsync(EventContext<TestEvent1> context, CancellationToken can
         }
 
         [ConsumerName("sample-consumer")]
-        class TestConsumer2 : IEventBusConsumer<TestEvent2>
+        class TestConsumer2 : IEventConsumer<TestEvent2>
         {
             public Task ConsumeAsync(EventContext<TestEvent2> context, CancellationToken cancellationToken = default)
             {