removed possibility to publish on multiple exchanges at the same time

rebus-org · Nov 26, 2018 · f6e3256 · f6e3256
1 parent 2048906
commit f6e3256
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/Rebus.RabbitMq.Tests/RabbitMqCustomExchangeNamesTest.cs b/Rebus.RabbitMq.Tests/RabbitMqCustomExchangeNamesTest.cs
@@ -61,8 +61,10 @@ public async Task CanUseAlternateCustomExchangeName()
             const string connectionString = RabbitMqTransportFactory.ConnectionString;
 
             var rabbitMqTransport = new RabbitMqTransport(connectionString, "inputQueue", new ConsoleLoggerFactory(false));
-
+
+            var defaultTopicExchange = "defaultTopicExchange";
             rabbitMqTransport.AllowPublishOnAlternateExchanges();
+            rabbitMqTransport.SetTopicExchangeName(defaultTopicExchange);
 
             var topic = "myTopic";
             var alternateExchange = "alternateExchange";
@@ -71,14 +73,12 @@ public async Task CanUseAlternateCustomExchangeName()
 
             var subscriberAddresses = await rabbitMqTransport.GetSubscriberAddresses(topicWithAlternateExchange);
             Assert.That(subscriberAddresses[0], Is.EqualTo(topicWithAlternateExchange));
-
-            var topicWithMultipleAlternateExchanges = $"{topic}@{alternateExchange}@{alternateExchange}@{alternateExchange}";
 
-            subscriberAddresses = await rabbitMqTransport.GetSubscriberAddresses(topicWithMultipleAlternateExchanges);
-            foreach (var subscriberAddress in subscriberAddresses)
-            {
-                Assert.That(subscriberAddress, Is.EqualTo(topicWithAlternateExchange));
-            }
+            subscriberAddresses = await rabbitMqTransport.GetSubscriberAddresses(topic);
+            Assert.That(subscriberAddresses[0], Is.EqualTo($"{topic}@{defaultTopicExchange}"));
+
+            subscriberAddresses = await rabbitMqTransport.GetSubscriberAddresses(topic + '@');
+            Assert.That(subscriberAddresses[0], Is.EqualTo($"{topic}@@{defaultTopicExchange}"));
         }
     }
 }
diff --git a/Rebus.RabbitMq/Config/RabbitMqOptionsBuilder.cs b/Rebus.RabbitMq/Config/RabbitMqOptionsBuilder.cs
@@ -189,10 +189,9 @@ public RabbitMqOptionsBuilder EnablePublisherConfirms(bool value = true)
         }
 
         /// <summary>
-        /// Publish a topic on a single or multiple alternate exchanges.
+        /// Publish a topic on an alternate exchange.
         /// Use the following syntax to publish a topic on an alternate exchange called "alternateExchange":
         ///     "topic@alternateExchange"
-        /// Publish on multiple exchanges by appending more exchanges separated with '@'.
         /// </summary>
         public RabbitMqOptionsBuilder AllowPublishOnAlternateExchanges(bool value = true)
         {

diff --git a/Rebus.RabbitMq/RabbitMq/RabbitMqTransport.cs b/Rebus.RabbitMq/RabbitMq/RabbitMqTransport.cs
@@ -140,10 +140,9 @@ public void EnablePublisherConfirms(bool value = true)
         }
 
         /// <summary>
-        /// Publish a topic on a single or multiple alternate exchanges.
+        /// Publish a topic on an alternate exchange.
         /// Use the following syntax to publish a topic on an alternate exchange called "alternateExchange":
         ///     "topic@alternateExchange"
-        /// Publish on multiple exchanges by appending more exchanges separated with '@'.
         /// </summary>
         public void AllowPublishOnAlternateExchanges(bool value = true)
         {
@@ -764,17 +763,11 @@ public async Task<string[]> GetSubscriberAddresses(string topic)
         {
             if (topic.Contains('@') && _allowPublishOnAlternateExchanges)
             {
-                var subscriberAddresses = new List<string>();
                 var tokens = topic.Split('@');
-                topic = tokens[0];
-                for (var i = 1; i < tokens.Length; i++)
+                if (tokens.Last() != string.Empty)
                 {
-                    subscriberAddresses.Add(tokens[i] == string.Empty
-                        ? $"{topic}@{_topicExchangeName}"
-                        : $"{topic}@{tokens[i]}");
+                    return new[] {topic};
                 }
-
-                return subscriberAddresses.ToArray();
             }
             return new[] { $"{topic}@{_topicExchangeName}" };
         }