From e0e659ae09b2b88a7fea3eda921c41fac65aca55 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Wed, 28 Apr 2021 17:34:29 +0800
Subject: [PATCH] Update KafkaDistributedEventBus

---
 .../Abp/EventBus/Kafka/KafkaDistributedEventBus.cs   |  8 +++++---
 .../EventBus/Rebus/AbpEventBusRebusOptionsSetup.cs   | 12 ------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptionsSetup.cs

diff --git a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
index 0ca0eaebbd..88a28e0641 100644
--- a/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
+++ b/framework/src/Volo.Abp.EventBus.Kafka/Volo/Abp/EventBus/Kafka/KafkaDistributedEventBus.cs
@@ -76,10 +76,12 @@ namespace Volo.Abp.EventBus.Kafka
                 return;
             }
 
-            var eventMessage = Serializer.Deserialize(message.Value, eventType);
+            var eventData = Serializer.Deserialize(message.Value, eventType);
 
-            await TriggerHandlersAsync(eventType, eventMessage,
-                context => { context.SetProperty(KafkaEventErrorHandler.HeadersKey, message.Headers); });
+            await TriggerHandlersAsync(eventType, eventData, errorContext =>
+            {
+                errorContext.SetProperty(KafkaEventErrorHandler.HeadersKey, message.Headers);
+            });
         }
 
         public IDisposable Subscribe<TEvent>(IDistributedEventHandler<TEvent> handler) where TEvent : class
diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptionsSetup.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptionsSetup.cs
deleted file mode 100644
index 7d26f174fe..0000000000
--- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptionsSetup.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.Extensions.Options;
-
-namespace Volo.Abp.EventBus.Rebus
-{
-    public class AbpEventBusRebusOptionsSetup : IConfigureOptions<AbpEventBusOptions>
-    {
-        public void Configure(AbpEventBusOptions options)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}