[Host.RabbitMQ] Improve Validation and Default Exchange Handling

Signed-off-by: Max Nau <[email protected]>
Signed-off-by: governor <[email protected]>

Author: MaxNau

src/SlimMessageBus.Host.RabbitMQ/RabbitMqMessageBusSettingsValidationService.cs

@@ -20,8 +20,6 @@ public override void AssertSettings()
 
     protected override void AssertProducer(ProducerSettings producerSettings)
     {
-        base.AssertProducer(producerSettings);
-
         var exchangeName = producerSettings.DefaultPath;
         if (exchangeName == null)
         {
@@ -42,7 +40,20 @@ protected override void AssertProducer(ProducerSettings producerSettings)
 
     protected override void AssertConsumer(ConsumerSettings consumerSettings)
     {
-        base.AssertConsumer(consumerSettings);
+        if (consumerSettings == null) throw new ArgumentNullException(nameof(consumerSettings));
+
+        if (consumerSettings.MessageType == null)
+        {
+            ThrowConsumerFieldNotSet(consumerSettings, nameof(consumerSettings.MessageType));
+        }
+        if (consumerSettings.ConsumerType == null)
+        {
+            ThrowConsumerFieldNotSet(consumerSettings, nameof(consumerSettings.ConsumerType));
+        }
+        if (consumerSettings.ConsumerMethod == null)
+        {
+            ThrowConsumerFieldNotSet(consumerSettings, nameof(consumerSettings.ConsumerMethod));
+        }
 
         var exchangeName = consumerSettings.Path;
         if (exchangeName == null)

src/SlimMessageBus.Host.RabbitMQ/RabbitMqTopologyService.cs

@@ -80,6 +80,12 @@ private void DeclareQueueBinding(AbstractConsumerSettings settings, string bindi
     {
         var bindingRoutingKey = settings.GetBindingRoutingKey(_providerSettings) ?? string.Empty;
 
+        if (string.IsNullOrEmpty(bindingExchangeName))
+        {
+            _logger.LogInformation("Skipping binding for queue {QueueName} because exchange is default (empty string)", queueName);
+            return;
+        }
+
         _logger.LogInformation("Binding queue {QueueName} to exchange {ExchangeName} using routing key {RoutingKey}", queueName, bindingExchangeName, bindingRoutingKey);
         try
         {
@@ -136,6 +142,12 @@ private string DeclareQueue(HasProviderExtensions settings, string queueName, Ac
 
     private void DeclareExchange(HasProviderExtensions settings, string exchangeName)
     {
+        if (string.IsNullOrEmpty(exchangeName))
+        {
+            _logger.LogInformation("Skipping exchange declaration because exchange name is default (empty string)");
+            return;
+        }
+
         var exchangeType = settings.GetOrDefault(RabbitMqProperties.ExchangeType, _providerSettings, global::RabbitMQ.Client.ExchangeType.Fanout);
         var durable = settings.GetOrDefault(RabbitMqProperties.ExchangeDurable, _providerSettings, false);
         var autoDelete = settings.GetOrDefault(RabbitMqProperties.ExchangeAutoDelete, _providerSettings, false);
@@ -146,6 +158,12 @@ private void DeclareExchange(HasProviderExtensions settings, string exchangeName
 
     private void DeclareExchange(string exchangeName, string exchangeType, bool durable, bool autoDelete, IDictionary<string, object> arguments = null)
     {
+        if (string.IsNullOrEmpty(exchangeName))
+        {
+            _logger.LogInformation("Skipping exchange declaration because exchange name is default (empty string)");
+            return;
+        }
+
         _logger.LogInformation("Declaring exchange {ExchangeName}, ExchangeType: {ExchangeType}, Durable: {Durable}, AutoDelete: {AutoDelete}", exchangeName, exchangeType, durable, autoDelete);
         try
         {