Simplified message bus message construction, reduce work computing cl…

…r type over and over
FoundatioFx · Jun 8, 2022 · 409beb6 · 409beb6
1 parent 1475327
commit 409beb6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Foundatio.Kafka/Foundatio.Kafka.csproj b/src/Foundatio.Kafka/Foundatio.Kafka.csproj
@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Confluent.Kafka" Version="1.9.0-RC10" />
 
-    <PackageReference Include="Foundatio" Version="10.5.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio" Version="10.5.1-alpha.0.8" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/src/Foundatio.Kafka/Messaging/KafkaMessageBus.cs b/src/Foundatio.Kafka/Messaging/KafkaMessageBus.cs
@@ -141,10 +141,10 @@ protected override async Task EnsureTopicSubscriptionAsync(CancellationToken can
     }
 
     protected virtual IMessage ConvertToMessage(string messageType, byte[] data) {
-        return new Message(() => DeserializeMessageBody(messageType, data)) {
+        return new Message(DeserializeMessageBody) {
+            Data = data,
             Type = messageType,
-            ClrType = GetMappedMessageType(messageType),
-            Data = data
+            ClrType = GetMappedMessageType(messageType)
         };
     }
 

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -11,7 +11,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.0"  PrivateAssets="All" />
 
-    <PackageReference Include="Foundatio.TestHarness" Version="10.5.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
+    <PackageReference Include="Foundatio.TestHarness" Version="10.5.1-alpha.0.8" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>
diff --git a/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTests.cs b/tests/Foundatio.Kafka.Tests/Messaging/KafkaMessageBusTests.cs
@@ -14,7 +14,7 @@ namespace Foundatio.Kafka.Tests.Messaging;
 public class KafkaMessageBusTests : KafkaMessageBusTestBase {
     public KafkaMessageBusTests(ITestOutputHelper output) : base(output) { }
 
-    [Fact]
+    [Fact(Skip = "https://github.com/confluentinc/confluent-kafka-dotnet/issues/1832")]
     public override Task CanSendMessageAsync() {
         return base.CanSendMessageAsync();
     }