Merge pull request #253 from Particular/release-4.1.0

Release 4.1.0

Author: bording

README.md

@@ -18,7 +18,7 @@ Before doing anything else, make sure you have RabbitMQ up and running in your e
 
 ## Samples
 
-See https://github.com/Particular/NServiceBus.RabbitMQ.Samples
+See http://docs.particular.net/samples/rabbitmq/
 
 ## Maintainers
 The following team is responsible for this repository: @Particular/rabbitmq-transport-maintainers

src/NServiceBus.RabbitMQ.Tests/APIApprovals.Approve.approved.txt

@@ -26,6 +26,11 @@ namespace NServiceBus
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> UseConnectionManager<T>(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> UseDirectRoutingTopology(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, System.Func<System.Type, string> routingKeyConvention = null, System.Func<string, System.Type, string> exchangeNameConvention = null) { }
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> UsePublisherConfirms(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, bool usePublisherConfirms) { }
+        public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> UseRoutingTopology(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions, System.Func<bool, NServiceBus.Transport.RabbitMQ.IRoutingTopology> topologyFactory) { }
+        [System.ObsoleteAttribute("Use `RabbitMQTransportSettingsExtensions.UseRoutingTopology(TransportExtensions<R" +
+            "abbitMQTransport> transportExtensions, Func<bool, IRoutingTopology>)` instead. W" +
+            "ill be treated as an error from version 5.0.0. Will be removed in version 6.0.0." +
+            "", false)]
         public static NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> UseRoutingTopology<T>(this NServiceBus.TransportExtensions<NServiceBus.RabbitMQTransport> transportExtensions)
             where T : NServiceBus.Transport.RabbitMQ.IRoutingTopology, new () { }
     }

src/NServiceBus.RabbitMQ/Administration/QueueCreator.cs

@@ -1,6 +1,7 @@
 namespace NServiceBus.Transport.RabbitMQ
 {
     using System.Threading.Tasks;
+    using global::RabbitMQ.Client;
 
     class QueueCreator : ICreateQueues
     {
@@ -17,28 +18,28 @@ public QueueCreator(ConnectionFactory connectionFactory, IRoutingTopology routin
 
         public Task CreateQueueIfNecessary(QueueBindings queueBindings, string identity)
         {
-            foreach (var receivingAddress in queueBindings.ReceivingAddresses)
+            using (var connection = connectionFactory.CreateAdministrationConnection())
+            using (var channel = connection.CreateModel())
             {
-                CreateQueueIfNecessary(receivingAddress);
-            }
+                foreach (var receivingAddress in queueBindings.ReceivingAddresses)
+                {
+                    CreateQueueIfNecessary(channel, receivingAddress);
+                }
 
-            foreach (var sendingAddress in queueBindings.SendingAddresses)
-            {
-                CreateQueueIfNecessary(sendingAddress);
+                foreach (var sendingAddress in queueBindings.SendingAddresses)
+                {
+                    CreateQueueIfNecessary(channel, sendingAddress);
+                }
             }
 
             return TaskEx.CompletedTask;
         }
 
-        void CreateQueueIfNecessary(string receivingAddress)
+        void CreateQueueIfNecessary(IModel channel, string receivingAddress)
         {
-            using (var connection = connectionFactory.CreateAdministrationConnection())
-            using (var channel = connection.CreateModel())
-            {
-                channel.QueueDeclare(receivingAddress, durableMessagesEnabled, false, false, null);
+            channel.QueueDeclare(receivingAddress, durableMessagesEnabled, false, false, null);
 
-                routingTopology.Initialize(channel, receivingAddress);
-            }
+            routingTopology.Initialize(channel, receivingAddress);
         }
     }
 }

src/NServiceBus.RabbitMQ/Configuration/RabbitMQTransportSettingsExtensions.cs

@@ -10,6 +10,17 @@
     /// </summary>
     public static partial class RabbitMQTransportSettingsExtensions
     {
+        /// <summary>
+        /// Registers a custom routing topology.
+        /// </summary>
+        /// <param name="transportExtensions"></param>
+        /// <param name="topologyFactory">The function used to create the routing topology instance. The parameter of the function indicates whether exchanges and queues declared by the routing topology should be durable.</param>
+        public static TransportExtensions<RabbitMQTransport> UseRoutingTopology(this TransportExtensions<RabbitMQTransport> transportExtensions, Func<bool, IRoutingTopology> topologyFactory)
+        {
+            transportExtensions.GetSettings().Set<Func<bool, IRoutingTopology>>(topologyFactory);
+            return transportExtensions;
+        }
+
         /// <summary>
         /// Uses the direct routing topology with the specified conventions.
         /// </summary>
@@ -28,17 +39,18 @@ public static TransportExtensions<RabbitMQTransport> UseDirectRoutingTopology(th
                 exchangeNameConvention = (address, eventType) => "amq.topic";
             }
 
-            transportExtensions.GetSettings().Set<DirectRoutingTopology.Conventions>(new DirectRoutingTopology.Conventions(exchangeNameConvention, routingKeyConvention));
+            transportExtensions.UseRoutingTopology(durable => new DirectRoutingTopology(new DirectRoutingTopology.Conventions(exchangeNameConvention, routingKeyConvention), durable));
 
             return transportExtensions;
         }
 
         /// <summary>
         /// Registers a custom routing topology.
         /// </summary>
+        [ObsoleteEx(RemoveInVersion = "6.0", TreatAsErrorFromVersion = "5.0", ReplacementTypeOrMember = "RabbitMQTransportSettingsExtensions.UseRoutingTopology(TransportExtensions<RabbitMQTransport> transportExtensions, Func<bool, IRoutingTopology>)")]
         public static TransportExtensions<RabbitMQTransport> UseRoutingTopology<T>(this TransportExtensions<RabbitMQTransport> transportExtensions) where T : IRoutingTopology, new()
         {
-            transportExtensions.GetSettings().Set<IRoutingTopology>(new T());
+            transportExtensions.UseRoutingTopology(durable => new T());
             return transportExtensions;
         }
 

src/NServiceBus.RabbitMQ/RabbitMQTransportInfrastructure.cs

@@ -25,7 +25,7 @@ public RabbitMQTransportInfrastructure(SettingsHolder settings, string connectio
             var connectionConfiguration = new ConnectionStringParser(settings).Parse(connectionString);
             connectionFactory = new ConnectionFactory(connectionConfiguration);
 
-            CreateTopology();
+            routingTopology = CreateRoutingTopology();
 
             bool usePublisherConfirms;
             if (!settings.TryGet(SettingsKeys.UsePublisherConfirms, out usePublisherConfirms))
@@ -88,27 +88,17 @@ public void Dispose()
             channelProvider.Dispose();
         }
 
-        void CreateTopology()
+        IRoutingTopology CreateRoutingTopology()
         {
-            if (settings.HasSetting<IRoutingTopology>())
-            {
-                routingTopology = settings.Get<IRoutingTopology>();
-            }
-            else
+            var durable = settings.DurableMessagesEnabled();
+            Func<bool, IRoutingTopology> topologyFactory;
+
+            if (!settings.TryGet(out topologyFactory))
             {
-                var durable = settings.DurableMessagesEnabled();
-
-                DirectRoutingTopology.Conventions conventions;
-
-                if (settings.TryGet(out conventions))
-                {
-                    routingTopology = new DirectRoutingTopology(conventions, durable);
-                }
-                else
-                {
-                    routingTopology = new ConventionalRoutingTopology(durable);
-                }
+                topologyFactory = d => new ConventionalRoutingTopology(d);
             }
+
+            return topologyFactory(durable);
         }
 
         IPushMessages CreateMessagePump()