From 966d3e95c2681f7879f09bcfe770b49968d82e70 Mon Sep 17 00:00:00 2001 From: Maxwell Weru Date: Sun, 10 Jan 2021 12:36:57 +0300 Subject: [PATCH] Rename EventBusBuilder.RegisterTransport(...) to AddTransport(...) --- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../EventBusBuilderExtensions.cs | 2 +- .../DependencyInjection/EventBusBuilder.cs | 9 ++++++--- .../Transports/InMemory/EventBusBuilderExtensions.cs | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs index 55050a94..57ed5149 100644 --- a/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs @@ -59,7 +59,7 @@ public static EventBusBuilder AddAmazonKinesisTransport(this EventBusBuilder bui }); // Register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs index 291682d8..16c3aae9 100644 --- a/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs @@ -56,7 +56,7 @@ public static EventBusBuilder AddAmazonSqsTransport(this EventBusBuilder builder }); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs index 8e5b05a8..274c9c77 100644 --- a/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs @@ -27,7 +27,7 @@ public static EventBusBuilder AddAzureEventHubsTransport(this EventBusBuilder bu services.AddSingleton, AzureEventHubsPostConfigureOptions>(); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs index d99d940e..ddb6fead 100644 --- a/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs @@ -33,7 +33,7 @@ public static EventBusBuilder AddAzureQueueStorageTransport(this EventBusBuilder }); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs index 638dd845..f0be9718 100644 --- a/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs @@ -33,7 +33,7 @@ public static EventBusBuilder AddAzureServiceBusTransport(this EventBusBuilder b }); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs index af3b3b2f..bec48adc 100644 --- a/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs @@ -53,7 +53,7 @@ public static EventBusBuilder AddKafkaTransport(this EventBusBuilder builder, Ac }); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs index 84b3091d..42558321 100644 --- a/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs @@ -27,7 +27,7 @@ public static EventBusBuilder AddRabbitMqTransport(this EventBusBuilder builder, services.AddSingleton, RabbitMqPostConfigureOptions>(); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; } diff --git a/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs b/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs index d70fab8c..40f3efaf 100644 --- a/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs +++ b/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs @@ -23,8 +23,7 @@ public EventBusBuilder(IServiceCollection services) { Services = services ?? throw new ArgumentNullException(nameof(services)); - Services.TryAddEnumerable( - ServiceDescriptor.Singleton, EventBusPostConfigureOptions>()); + Services.AddSingleton, EventBusPostConfigureOptions>(); } /// @@ -39,6 +38,8 @@ public EventBusBuilder(IServiceCollection services) /// public EventBusBuilder Configure(Action configure) { + if (configure is null) throw new ArgumentNullException(nameof(configure)); + Services.Configure(configure); return this; } @@ -49,7 +50,7 @@ public EventBusBuilder Configure(Action configure) /// /// /// - public EventBusBuilder RegisterTransport() + public EventBusBuilder AddTransport() where TTransport : class, IEventBusTransport where TOptions : EventBusTransportOptionsBase { @@ -233,6 +234,8 @@ public EventBusBuilder ConfigureEvent(Action configur internal static string GetTransportName(Type type) { + if (type is null) throw new ArgumentNullException(nameof(type)); + // Ensure the type implements IEventBusTransport if (!(typeof(IEventBusTransport).IsAssignableFrom(type))) { diff --git a/src/Tingle.EventBus/Transports/InMemory/EventBusBuilderExtensions.cs b/src/Tingle.EventBus/Transports/InMemory/EventBusBuilderExtensions.cs index b3f22943..cfd0f673 100644 --- a/src/Tingle.EventBus/Transports/InMemory/EventBusBuilderExtensions.cs +++ b/src/Tingle.EventBus/Transports/InMemory/EventBusBuilderExtensions.cs @@ -31,7 +31,7 @@ public static EventBusBuilder AddInMemoryTransport(this EventBusBuilder builder, services.AddSingleton(); // register the transport - builder.RegisterTransport(); + builder.AddTransport(); return builder; }