Merge pull request #41 from LuccaSA/Simplify-quorum-creation

OlivierLePichon · web-flow · commit 0ebf680c8cce · 2025-02-13T18:31:34.000+01:00
Queues quorum helper implementation + tests update
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -18,12 +18,12 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.7
       with:
-          versionSpec: '5.10.1'
+        versionSpec: '5.10.1'
 
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
diff --git a/MerQure.sln b/MerQure.sln
@@ -16,6 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build_local.ps1 = build_local.ps1
 		Directory.Build.props = Directory.Build.props
 		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
+		CHANGELOG.md = CHANGELOG.md
+		GitVersion.yml = GitVersion.yml
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MerQure.Tools", "src\MerQure.Tools\MerQure.Tools.csproj", "{46469C09-4E46-4C96-8588-49D121B4E4C0}"
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
-  "sdk" : {
-    "version": "6.0.100",
+  "sdk": {
+    "version": "8.0.203",
     "rollForward": "latestFeature"
   }
-}
+}
diff --git a/samples/MerQure.Samples/DeadLetterExample.cs b/samples/MerQure.Samples/DeadLetterExample.cs
@@ -1,5 +1,4 @@
-﻿using MerQure.RbMQ;
-using MerQure.RbMQ.Content;
+﻿using MerQure.RbMQ.Content;
 using System;
 using System.Collections.Generic;
 
@@ -18,12 +17,12 @@ public void Run()
         {
             // RabbitMQ init
             _messagingService.DeclareExchange("deadletter.exchange", Constants.ExchangeTypeFanout);
-            _messagingService.DeclareQueue("deadletter.queue");
+            _messagingService.DeclareQueue("deadletter.queue", isQuorum: true);
             _messagingService.DeclareBinding("deadletter.exchange", "deadletter.queue", "#");
 
             _messagingService.DeclareExchange("delay.exchange", Constants.ExchangeTypeHeaders);
-            _messagingService.DeclareQueueWithDeadLetterPolicy("deadletter.queue.5", "deadletter.exchange", 5000, null);
-            _messagingService.DeclareQueueWithDeadLetterPolicy("deadletter.queue.30", "deadletter.exchange", 30000, null);
+            _messagingService.DeclareQueueWithDeadLetterPolicy("deadletter.queue.5", "deadletter.exchange", 5000, null, isQuorum: true);
+            _messagingService.DeclareQueueWithDeadLetterPolicy("deadletter.queue.30", "deadletter.exchange", 30000, null, isQuorum: true);
 
             _messagingService.DeclareBinding("delay.exchange", "deadletter.queue.5", "#", new Dictionary<string, object> { { "delay", 5 } });
             _messagingService.DeclareBinding("delay.exchange", "deadletter.queue.30", "#", new Dictionary<string, object> { { "delay", 30 } });
diff --git a/samples/MerQure.Samples/MerQure.Samples.csproj b/samples/MerQure.Samples/MerQure.Samples.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/MerQure.Samples/SimpleExample.cs b/samples/MerQure.Samples/SimpleExample.cs
@@ -16,7 +16,7 @@ public void Run()
         {
             // RabbitMQ init
             _messagingService.DeclareExchange("simple.exchange");
-            _messagingService.DeclareQueue("simple.queue");
+            _messagingService.DeclareQueue("simple.queue", isQuorum: true);
             _messagingService.DeclareBinding("simple.exchange", "simple.queue", "simple.message.*");
 
             // Get the publisher and declare Exhange where publish messages
diff --git a/samples/MerQure.Samples/StopExample.cs b/samples/MerQure.Samples/StopExample.cs
@@ -1,5 +1,4 @@
-﻿using MerQure.RbMQ;
-using MerQure.RbMQ.Content;
+﻿using MerQure.RbMQ.Content;
 using System;
 
 namespace MerQure.Samples
@@ -17,7 +16,7 @@ public void Run()
         {
             // RabbitMQ init
             _messagingService.DeclareExchange("stop.exchange");
-            _messagingService.DeclareQueue("stop.queue");
+            _messagingService.DeclareQueue("stop.queue", isQuorum: true);
             _messagingService.DeclareBinding("stop.exchange", "stop.queue", "stop.message.* ");
 
             // Get the publisher and declare Exhange where publish messages
diff --git a/samples/MerQure.Tools.Samples/MerQure.Tools.Samples.csproj b/samples/MerQure.Tools.Samples/MerQure.Tools.Samples.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/MerQure.Tools.Samples/RetryBusExample/Domain/Sample.cs b/samples/MerQure.Tools.Samples/RetryBusExample/Domain/Sample.cs
@@ -1,6 +1,5 @@
 ﻿
 using MerQure.Messages;
-using MerQure.Tools.Messages;
 
 namespace MerQure.Tools.Samples.RetryBusExample.Domain
 {
diff --git a/samples/MerQure.Tools.Samples/RetryBusExample/Domain/SampleException.cs b/samples/MerQure.Tools.Samples/RetryBusExample/Domain/SampleException.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MerQure.Tools.Samples.RetryBusExample.Domain
 {
diff --git a/samples/MerQure.Tools.Samples/RetryBusExample/Infra/SampleService.cs b/samples/MerQure.Tools.Samples/RetryBusExample/Infra/SampleService.cs
@@ -33,7 +33,7 @@ public SampleService(IRetryBusService retryBusService)
                 DeliveryDelayInMilliseconds = 1000
             };
 
-            SampleBus = _retryBusService.CreateNewBus<Sample>(sampleConfiguration);
+            SampleBus = _retryBusService.CreateNewBus<Sample>(sampleConfiguration, isQuorum: true);
         }
 
         public void Send(Sample sample)
diff --git a/src/MerQure.RbMQ/Clients/Publisher.cs b/src/MerQure.RbMQ/Clients/Publisher.cs
@@ -3,7 +3,6 @@
 using MerQure.RbMQ.Helpers;
 using MerQure.RbMQ.Content;
 using System.Collections.Generic;
-using System.Threading;
 
 namespace MerQure.RbMQ.Clients
 {
diff --git a/src/MerQure.RbMQ/Constants.cs b/src/MerQure.RbMQ/Constants.cs
@@ -59,5 +59,8 @@ public static class Constants
         /// Routing Dead-Lettered Messages
         /// </summary>
         public const string QueueDeadLetterRoutingKey = "x-dead-letter-routing-key";
+        
+        public const string HeaderQueueType = "x-queue-type";
+        public const string HeaderQueueTypeQuorumValue = "quorum";
     }
 }
diff --git a/src/MerQure.RbMQ/MessagingService.cs b/src/MerQure.RbMQ/MessagingService.cs
@@ -18,21 +18,19 @@ public class MessagingService : IMessagingService
         protected IConnection CurrentConnection => _sharedConnection.CurrentConnection;
 
         private readonly SharedConnection _sharedConnection;
-        private readonly IOptions<MerQureConfiguration> _merQureConfiguration;
 
         public MessagingService(IOptions<MerQureConfiguration> merQureConfiguration, SharedConnection sharedConnection)
         {
-            _merQureConfiguration = merQureConfiguration;
             _sharedConnection = sharedConnection;
 
-            if (_merQureConfiguration == null)
+            if (merQureConfiguration == null)
             {
                 return;
             }
-            Durable = _merQureConfiguration.Value.Durable;
-            AutoDeleteQueue = _merQureConfiguration.Value.AutoDeleteQueue;
-            DefaultPrefetchCount = _merQureConfiguration.Value.DefaultPrefetchCount;
-            PublisherAcknowledgementsTimeoutInMilliseconds = _merQureConfiguration.Value.PublisherAcknowledgementsTimeoutInMilliseconds;
+            Durable = merQureConfiguration.Value.Durable;
+            AutoDeleteQueue = merQureConfiguration.Value.AutoDeleteQueue;
+            DefaultPrefetchCount = merQureConfiguration.Value.DefaultPrefetchCount;
+            PublisherAcknowledgementsTimeoutInMilliseconds = merQureConfiguration.Value.PublisherAcknowledgementsTimeoutInMilliseconds;
         }
 
         public void DeclareExchange(string exchangeName)
@@ -50,20 +48,20 @@ public void DeclareExchange(string exchangeName, string exchangeType)
             }
         }
 
-        public void DeclareQueue(string queueName, byte maxPriority)
+        public string DeclareQueue(string queueName, byte maxPriority, bool isQuorum)
         {
             var queueArgs = new Dictionary<string, object> {
                 { Constants.QueueMaxPriority, maxPriority }
             };
-            DeclareQueue(queueName, queueArgs);
+            return DeclareQueue(queueName, queueArgs, isQuorum);
         }
 
-        public void DeclareQueue(string queueName)
+        public string DeclareQueue(string queueName, bool isQuorum)
         {
-            DeclareQueue(queueName, new Dictionary<string, object>());
+            return DeclareQueue(queueName, new Dictionary<string, object>(), isQuorum);
         }
 
-        public void DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetterExchange, int messageTimeToLive, string deadLetterRoutingKey)
+        public string DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetterExchange, int messageTimeToLive, string deadLetterRoutingKey, bool isQuorum)
         {
             if (string.IsNullOrWhiteSpace(deadLetterExchange)) throw new ArgumentNullException(nameof(deadLetterExchange));
             if (messageTimeToLive <= 0) throw new ArgumentOutOfRangeException(nameof(messageTimeToLive));
@@ -76,18 +74,41 @@ public void DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetter
             {
                 queueArgs.Add(Constants.QueueDeadLetterRoutingKey, deadLetterRoutingKey);
             }
-            DeclareQueue(queueName, queueArgs);
+            return DeclareQueue(queueName, queueArgs, isQuorum);
         }
+        private const string QuorumQueueNameSuffix ="-q";
 
-        public void DeclareQueue(string queueName, Dictionary<string, object> queueArgs)
+        public string DeclareQueue(string queueName, Dictionary<string, object> queueArgs, bool isQuorum)
         {
             if (string.IsNullOrWhiteSpace(queueName)) throw new ArgumentNullException(nameof(queueName));
             if (queueArgs == null) throw new ArgumentNullException(nameof(queueArgs));
 
+            Dictionary<string, object> effectiveQueueArgs;
+            string effectiveQueueName;
+            if(isQuorum)
+            {
+                if(!Durable || AutoDeleteQueue)
+                {
+                    throw new ArgumentException("Quorum queues must be durable and non-auto-delete");
+                }
+                effectiveQueueArgs = new Dictionary<string, object>(queueArgs)
+                {
+                    { Constants.HeaderQueueType, Constants.HeaderQueueTypeQuorumValue }
+                };
+                effectiveQueueName = $"{queueName}{QuorumQueueNameSuffix}";
+            }
+            else
+            {
+                effectiveQueueArgs = queueArgs;
+                effectiveQueueName = queueName;
+            }
+
             using (var channel = CurrentConnection.CreateModel())
             {
-                channel.QueueDeclare(queueName.ToLowerInvariant(), this.Durable, false, this.AutoDeleteQueue, queueArgs);
+                channel.QueueDeclare(effectiveQueueName.ToLowerInvariant(), this.Durable, false, this.AutoDeleteQueue, effectiveQueueArgs);
             }
+
+            return effectiveQueueName;
         }
 
         public void DeclareBinding(string exchangeName, string queueName, string routingKey)
diff --git a/src/MerQure.Tools/Buses/Bus.cs b/src/MerQure.Tools/Buses/Bus.cs
@@ -1,9 +1,7 @@
 ﻿using MerQure.Messages;
 using MerQure.Tools.Configurations;
-using MerQure.Tools.Messages;
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace MerQure.Tools.Buses
 {
diff --git a/src/MerQure.Tools/Buses/Consumer.cs b/src/MerQure.Tools/Buses/Consumer.cs
@@ -4,9 +4,6 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MerQure.Tools.Buses
 {
diff --git a/src/MerQure.Tools/Buses/ConsumerProvider.cs b/src/MerQure.Tools/Buses/ConsumerProvider.cs
@@ -1,12 +1,11 @@
 ﻿using MerQure.Tools.Configurations;
-using System;
 using System.Collections.Generic;
 
 namespace MerQure.Tools.Buses
 {
 	public class ConsumerProvider
     {
-        private static object _syncRoot = new Object();
+        private static readonly object _syncRoot = new();
 
         private readonly Dictionary<string, IConsumer> _consumers = new Dictionary<string, IConsumer>();
         private readonly IMessagingService _messagingService;
@@ -21,9 +20,9 @@ public IConsumer Get(Channel channel)
             IConsumer consumer;
             lock (_syncRoot)
             {
-                if (_consumers.ContainsKey(channel.Value))
+                if (_consumers.TryGetValue(channel.Value, out var foundConsumer))
                 {
-                    consumer = _consumers[channel.Value];
+                    consumer = foundConsumer;
                 }
                 else
                 {
diff --git a/src/MerQure.Tools/Buses/Publisher.cs b/src/MerQure.Tools/Buses/Publisher.cs
@@ -67,7 +67,7 @@ public void PublishOnRetryExchange(Channel channel, T message, RetryInformations
             }
             else
             {
-                delay = delays.Last();
+                delay = delays[delays.Count-1];
             }
             retryInformations.NumberOfRetry++;
             RetryMessage<T> retryMessage = new RetryMessage<T>
@@ -97,7 +97,7 @@ internal void PublishOnErrorExchange(Channel channel, T message, RetryInformatio
             }
         }
 
-        internal void TryPublishWithBrokerAcknowledgement(IPublisher publisher, string channelName, string message)
+        private static void TryPublishWithBrokerAcknowledgement(IPublisher publisher, string channelName, string message)
         {
             bool published = publisher.PublishWithAcknowledgement(channelName, message);
             if (!published)
@@ -106,7 +106,7 @@ internal void TryPublishWithBrokerAcknowledgement(IPublisher publisher, string c
             }
         }
 
-        internal void PublishWithTransaction(IPublisher publisher, string channelName, IEnumerable<string> messages)
+        private static void PublishWithTransaction(IPublisher publisher, string channelName, List<string> messages)
         {
             try
             {
@@ -118,7 +118,7 @@ internal void PublishWithTransaction(IPublisher publisher, string channelName, I
             }
         }
 
-        private RetryMessage<T> CreateRetryMessage(T message)
+        private static RetryMessage<T> CreateRetryMessage(T message)
         {
             return new RetryMessage<T>
             {
diff --git a/src/MerQure.Tools/Buses/RetryConsumer.cs b/src/MerQure.Tools/Buses/RetryConsumer.cs
@@ -35,7 +35,7 @@ internal void SendToErrorExchange(Channel channel, T deliveredMessage)
 
         public MessageInformations ForceRetryStrategy(Channel channel, T message, int attemptNumber)
         {
-            var retryInformations = new RetryInformations()
+            var retryInformations = new RetryInformations
             {
                 NumberOfRetry = attemptNumber > 0 ? attemptNumber - 1 : 0   
             };
diff --git a/src/MerQure.Tools/Configurations/Channel.cs b/src/MerQure.Tools/Configurations/Channel.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MerQure.Tools.Configurations
+﻿namespace MerQure.Tools.Configurations
 {
     public class Channel
     {
diff --git a/src/MerQure.Tools/Configurations/RetryStrategyConfiguration.cs b/src/MerQure.Tools/Configurations/RetryStrategyConfiguration.cs
@@ -1,9 +1,4 @@
-﻿using MerQure;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace MerQure.Tools.Configurations
 {
diff --git a/src/MerQure.Tools/IRetryBusService.cs b/src/MerQure.Tools/IRetryBusService.cs
@@ -1,16 +1,11 @@
 ﻿using MerQure.Messages;
 using MerQure.Tools.Buses;
 using MerQure.Tools.Configurations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MerQure.Tools
 {
     public interface IRetryBusService
     {
-        IBus<T> CreateNewBus<T>(RetryStrategyConfiguration configuration) where T : IDelivered;
+        IBus<T> CreateNewBus<T>(RetryStrategyConfiguration configuration, bool isQuorum) where T : IDelivered;
     }
 }
diff --git a/src/MerQure.Tools/MerQure.Tools.csproj b/src/MerQure.Tools/MerQure.Tools.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MerQure.Tools/Messages/RetryInformations.cs b/src/MerQure.Tools/Messages/RetryInformations.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MerQure.Tools.Messages
+﻿namespace MerQure.Tools.Messages
 {
     public class RetryInformations
     {
diff --git a/src/MerQure.Tools/Messages/RetryMessage.cs b/src/MerQure.Tools/Messages/RetryMessage.cs
diff --git a/src/MerQure.Tools/RetryBusService.cs b/src/MerQure.Tools/RetryBusService.cs
diff --git a/src/MerQure/Content/IDelivered.cs b/src/MerQure/Content/IDelivered.cs
diff --git a/src/MerQure/IMessagingService.cs b/src/MerQure/IMessagingService.cs
diff --git a/tests/MerQure.RbMQ.Tests/MerQure.RbMQ.Tests.csproj b/tests/MerQure.RbMQ.Tests/MerQure.RbMQ.Tests.csproj
diff --git a/tests/MerQure.RbMQ.Tests/MessagingServiceTests.cs b/tests/MerQure.RbMQ.Tests/MessagingServiceTests.cs
diff --git a/tests/MerQure.Tools.Tests/Buses/ConsumerTests.cs b/tests/MerQure.Tools.Tests/Buses/ConsumerTests.cs
diff --git a/tests/MerQure.Tools.Tests/Buses/PublisherTests.cs b/tests/MerQure.Tools.Tests/Buses/PublisherTests.cs
diff --git a/tests/MerQure.Tools.Tests/MerQure.Tools.Tests.csproj b/tests/MerQure.Tools.Tests/MerQure.Tools.Tests.csproj
diff --git a/tests/MerQure.Tools.Tests/RetryBusServiceTests.cs b/tests/MerQure.Tools.Tests/RetryBusServiceTests.cs
diff --git a/tests/MerQure.Tools.Tests/TestMessage.cs b/tests/MerQure.Tools.Tests/TestMessage.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "sdk" : {`
`3`		`- "version": "6.0.100",`
	`2`	`+ "sdk": {`
	`3`	`+ "version": "8.0.203",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public void Run()`
`16`	`16`	`{`
`17`	`17`	`// RabbitMQ init`
`18`	`18`	`_messagingService.DeclareExchange("simple.exchange");`
`19`		`- _messagingService.DeclareQueue("simple.queue");`
	`19`	`+ _messagingService.DeclareQueue("simple.queue", isQuorum: true);`
`20`	`20`	`_messagingService.DeclareBinding("simple.exchange", "simple.queue", "simple.message.*");`
`21`	`21`
`22`	`22`	`// Get the publisher and declare Exhange where publish messages`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`using MerQure.Messages;`
`3`		`-using MerQure.Tools.Messages;`
`4`	`3`
`5`	`4`	`namespace MerQure.Tools.Samples.RetryBusExample.Domain`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`	`2`
`7`	`3`	`namespace MerQure.Tools.Samples.RetryBusExample.Domain`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public SampleService(IRetryBusService retryBusService)`
`33`	`33`	`DeliveryDelayInMilliseconds = 1000`
`34`	`34`	`};`
`35`	`35`
`36`		`- SampleBus = _retryBusService.CreateNewBus<Sample>(sampleConfiguration);`
	`36`	`+ SampleBus = _retryBusService.CreateNewBus<Sample>(sampleConfiguration, isQuorum: true);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void Send(Sample sample)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using MerQure.RbMQ.Helpers;`
`4`	`4`	`using MerQure.RbMQ.Content;`
`5`	`5`	`using System.Collections.Generic;`
`6`		`-using System.Threading;`
`7`	`6`
`8`	`7`	`namespace MerQure.RbMQ.Clients`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,8 @@ public static class Constants`
`59`	`59`	`/// Routing Dead-Lettered Messages`
`60`	`60`	`/// </summary>`
`61`	`61`	`public const string QueueDeadLetterRoutingKey = "x-dead-letter-routing-key";`
	`62`	`+`
	`63`	`+ public const string HeaderQueueType = "x-queue-type";`
	`64`	`+ public const string HeaderQueueTypeQuorumValue = "quorum";`
`62`	`65`	`}`
`63`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,21 +18,19 @@ public class MessagingService : IMessagingService`
`18`	`18`	`protected IConnection CurrentConnection => _sharedConnection.CurrentConnection;`
`19`	`19`
`20`	`20`	`private readonly SharedConnection _sharedConnection;`
`21`		`- private readonly IOptions<MerQureConfiguration> _merQureConfiguration;`
`22`	`21`
`23`	`22`	`public MessagingService(IOptions<MerQureConfiguration> merQureConfiguration, SharedConnection sharedConnection)`
`24`	`23`	`{`
`25`		`- _merQureConfiguration = merQureConfiguration;`
`26`	`24`	`_sharedConnection = sharedConnection;`
`27`	`25`
`28`		`- if (_merQureConfiguration == null)`
	`26`	`+ if (merQureConfiguration == null)`
`29`	`27`	`{`
`30`	`28`	`return;`
`31`	`29`	`}`
`32`		`- Durable = _merQureConfiguration.Value.Durable;`
`33`		`- AutoDeleteQueue = _merQureConfiguration.Value.AutoDeleteQueue;`
`34`		`- DefaultPrefetchCount = _merQureConfiguration.Value.DefaultPrefetchCount;`
`35`		`- PublisherAcknowledgementsTimeoutInMilliseconds = _merQureConfiguration.Value.PublisherAcknowledgementsTimeoutInMilliseconds;`
	`30`	`+ Durable = merQureConfiguration.Value.Durable;`
	`31`	`+ AutoDeleteQueue = merQureConfiguration.Value.AutoDeleteQueue;`
	`32`	`+ DefaultPrefetchCount = merQureConfiguration.Value.DefaultPrefetchCount;`
	`33`	`+ PublisherAcknowledgementsTimeoutInMilliseconds = merQureConfiguration.Value.PublisherAcknowledgementsTimeoutInMilliseconds;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`public void DeclareExchange(string exchangeName)`
`@@ -50,20 +48,20 @@ public void DeclareExchange(string exchangeName, string exchangeType)`
`50`	`48`	`}`
`51`	`49`	`}`
`52`	`50`
`53`		`- public void DeclareQueue(string queueName, byte maxPriority)`
	`51`	`+ public string DeclareQueue(string queueName, byte maxPriority, bool isQuorum)`
`54`	`52`	`{`
`55`	`53`	`var queueArgs = new Dictionary<string, object> {`
`56`	`54`	`{ Constants.QueueMaxPriority, maxPriority }`
`57`	`55`	`};`
`58`		`- DeclareQueue(queueName, queueArgs);`
	`56`	`+ return DeclareQueue(queueName, queueArgs, isQuorum);`
`59`	`57`	`}`
`60`	`58`
`61`		`- public void DeclareQueue(string queueName)`
	`59`	`+ public string DeclareQueue(string queueName, bool isQuorum)`
`62`	`60`	`{`
`63`		`- DeclareQueue(queueName, new Dictionary<string, object>());`
	`61`	`+ return DeclareQueue(queueName, new Dictionary<string, object>(), isQuorum);`
`64`	`62`	`}`
`65`	`63`
`66`		`- public void DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetterExchange, int messageTimeToLive, string deadLetterRoutingKey)`
	`64`	`+ public string DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetterExchange, int messageTimeToLive, string deadLetterRoutingKey, bool isQuorum)`
`67`	`65`	`{`
`68`	`66`	`if (string.IsNullOrWhiteSpace(deadLetterExchange)) throw new ArgumentNullException(nameof(deadLetterExchange));`
`69`	`67`	`if (messageTimeToLive <= 0) throw new ArgumentOutOfRangeException(nameof(messageTimeToLive));`
`@@ -76,18 +74,41 @@ public void DeclareQueueWithDeadLetterPolicy(string queueName, string deadLetter`
`76`	`74`	`{`
`77`	`75`	`queueArgs.Add(Constants.QueueDeadLetterRoutingKey, deadLetterRoutingKey);`
`78`	`76`	`}`
`79`		`- DeclareQueue(queueName, queueArgs);`
	`77`	`+ return DeclareQueue(queueName, queueArgs, isQuorum);`
`80`	`78`	`}`
	`79`	`+ private const string QuorumQueueNameSuffix ="-q";`
`81`	`80`
`82`		`- public void DeclareQueue(string queueName, Dictionary<string, object> queueArgs)`
	`81`	`+ public string DeclareQueue(string queueName, Dictionary<string, object> queueArgs, bool isQuorum)`
`83`	`82`	`{`
`84`	`83`	`if (string.IsNullOrWhiteSpace(queueName)) throw new ArgumentNullException(nameof(queueName));`
`85`	`84`	`if (queueArgs == null) throw new ArgumentNullException(nameof(queueArgs));`
`86`	`85`
	`86`	`+ Dictionary<string, object> effectiveQueueArgs;`
	`87`	`+ string effectiveQueueName;`
	`88`	`+ if(isQuorum)`
	`89`	`+ {`
	`90`	`+ if(!Durable \|\| AutoDeleteQueue)`
	`91`	`+ {`
	`92`	`+ throw new ArgumentException("Quorum queues must be durable and non-auto-delete");`
	`93`	`+ }`
	`94`	`+ effectiveQueueArgs = new Dictionary<string, object>(queueArgs)`
	`95`	`+ {`
	`96`	`+ { Constants.HeaderQueueType, Constants.HeaderQueueTypeQuorumValue }`
	`97`	`+ };`
	`98`	`+ effectiveQueueName = $"{queueName}{QuorumQueueNameSuffix}";`
	`99`	`+ }`
	`100`	`+ else`
	`101`	`+ {`
	`102`	`+ effectiveQueueArgs = queueArgs;`
	`103`	`+ effectiveQueueName = queueName;`
	`104`	`+ }`
	`105`	`+`
`87`	`106`	`using (var channel = CurrentConnection.CreateModel())`
`88`	`107`	`{`
`89`		`- channel.QueueDeclare(queueName.ToLowerInvariant(), this.Durable, false, this.AutoDeleteQueue, queueArgs);`
	`108`	`+ channel.QueueDeclare(effectiveQueueName.ToLowerInvariant(), this.Durable, false, this.AutoDeleteQueue, effectiveQueueArgs);`
`90`	`109`	`}`
	`110`	`+`
	`111`	`+ return effectiveQueueName;`
`91`	`112`	`}`
`92`	`113`
`93`	`114`	`public void DeclareBinding(string exchangeName, string queueName, string routingKey)`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using MerQure.Messages;`
`2`	`2`	`using MerQure.Tools.Configurations;`
`3`		`-using MerQure.Tools.Messages;`
`4`	`3`	`using System;`
`5`	`4`	`using System.Collections.Generic;`
`6`		`-using System.Text;`
`7`	`5`
`8`	`6`	`namespace MerQure.Tools.Buses`
`9`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@`
`4`	`4`	`using Newtonsoft.Json;`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
`7`		`-using System.Linq;`
`8`		`-using System.Text;`
`9`		`-using System.Threading.Tasks;`
`10`	`7`
`11`	`8`	`namespace MerQure.Tools.Buses`
`12`	`9`	`{`