using validating model in all places

Particular · Jul 8, 2020 · b5d93fc · b5d93fc
1 parent 4cf8f7a
commit b5d93fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/NServiceBus.Transport.RabbitMQ/Administration/QueueCreator.cs b/src/NServiceBus.Transport.RabbitMQ/Administration/QueueCreator.cs
@@ -16,7 +16,7 @@ public QueueCreator(ConnectionFactory connectionFactory, IRoutingTopology routin
         public Task CreateQueueIfNecessary(QueueBindings queueBindings, string identity)
         {
             using (var connection = connectionFactory.CreateAdministrationConnection())
-            using (var channel = connection.CreateModel())
+            using (var channel = new ModelWithValidation(connection.CreateModel()))
             {
                 DelayInfrastructure.Build(channel);
 

diff --git a/src/NServiceBus.Transport.RabbitMQ/Administration/QueuePurger.cs b/src/NServiceBus.Transport.RabbitMQ/Administration/QueuePurger.cs
@@ -12,7 +12,7 @@ public QueuePurger(ConnectionFactory connectionFactory)
         public void Purge(string queue)
         {
             using (var connection = connectionFactory.CreateAdministrationConnection())
-            using (var channel = connection.CreateModel())
+            using (var channel = new ModelWithValidation(connection.CreateModel()))
             {
                 channel.QueuePurge(queue);
             }

diff --git a/src/NServiceBus.Transport.RabbitMQ/Administration/SubscriptionManager.cs b/src/NServiceBus.Transport.RabbitMQ/Administration/SubscriptionManager.cs
@@ -20,7 +20,7 @@ public SubscriptionManager(ConnectionFactory connectionFactory, IRoutingTopology
         public Task Subscribe(Type eventType, ContextBag context)
         {
             using (var connection = connectionFactory.CreateAdministrationConnection())
-            using (var channel = connection.CreateModel())
+            using (var channel = new ModelWithValidation(connection.CreateModel()))
             {
                 routingTopology.SetupSubscription(channel, eventType, localQueue);
             }
@@ -31,7 +31,7 @@ public Task Subscribe(Type eventType, ContextBag context)
         public Task Unsubscribe(Type eventType, ContextBag context)
         {
             using (var connection = connectionFactory.CreateAdministrationConnection())
-            using (var channel = connection.CreateModel())
+            using (var channel = new ModelWithValidation(connection.CreateModel()))
             {
                 routingTopology.TeardownSubscription(channel, eventType, localQueue);
             }

diff --git a/src/NServiceBus.Transport.RabbitMQ/Receiving/MessagePump.cs b/src/NServiceBus.Transport.RabbitMQ/Receiving/MessagePump.cs
@@ -81,7 +81,7 @@ public void Start(PushRuntimeSettings limitations)
 
             connection = connectionFactory.CreateConnection($"{settings.InputQueue} MessagePump");
 
-            var channel = connection.CreateModel();
+            var channel = new ModelWithValidation(connection.CreateModel());
 
             long prefetchCount;