From 86d89ebba52b99927f37ef9a592ed01d2b80d8e5 Mon Sep 17 00:00:00 2001
From: Necati Meral <necati_meral@yahoo.de>
Date: Sat, 19 Mar 2022 20:44:44 +0100
Subject: [PATCH] Allow the exchange type to be specified

---
 .../RabbitMq/AbpRabbitMqEventBusOptions.cs    | 20 ++++++++++++++++++-
 .../RabbitMq/RabbitMqDistributedEventBus.cs   |  2 +-
 .../Volo/Abp/RabbitMQ/RabbitMqConsts.cs       | 11 ++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs
index ad09223f05..dd451d2127 100644
--- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs
+++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs
@@ -1,10 +1,28 @@
-namespace Volo.Abp.EventBus.RabbitMq;
+using Volo.Abp.RabbitMQ;
+
+namespace Volo.Abp.EventBus.RabbitMq;
 
 public class AbpRabbitMqEventBusOptions
 {
+    public const string DefaultExchangeType = RabbitMqConsts.ExchangeTypes.Direct;
+
     public string ConnectionName { get; set; }
 
     public string ClientName { get; set; }
 
     public string ExchangeName { get; set; }
+
+    public string ExchangeType { get; set; }
+
+    public AbpRabbitMqEventBusOptions()
+    {
+        ExchangeType = "direct";
+    }
+
+    public string GetExchangeTypeOrDefault()
+    {
+        return string.IsNullOrEmpty(ExchangeType)
+            ? DefaultExchangeType
+            : ExchangeType;
+    }
 }
diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs
index c57d9e9417..38070ae7ce 100644
--- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs
@@ -69,7 +69,7 @@ public class RabbitMqDistributedEventBus : DistributedEventBusBase, ISingletonDe
         Consumer = MessageConsumerFactory.Create(
             new ExchangeDeclareConfiguration(
                 AbpRabbitMqEventBusOptions.ExchangeName,
-                type: "direct",
+                type: AbpRabbitMqEventBusOptions.ExchangeType,
                 durable: true
             ),
             new QueueDeclareConfiguration(
diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqConsts.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqConsts.cs
index 19b8ddb573..996e88959b 100644
--- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqConsts.cs
+++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqConsts.cs
@@ -8,4 +8,15 @@ public static class RabbitMqConsts
 
         public const int Persistent = 2;
     }
+
+    public static class ExchangeTypes
+    {
+        public const string Direct = "direct";
+
+        public const string Topic = "topic";
+
+        public const string Fanout = "fanout";
+
+        public const string Headers = "headers";
+    }
 }