Change arguments in IServiceBusPublisher to use a System.Object for messageBody and make sessionId optional

Author: christianhelle

src/Atc.Azure.Messaging/ServiceBus/IServiceBusPublisher.cs

@@ -4,8 +4,8 @@ public interface IServiceBusPublisher
 {
     Task PublishAsync(
         string topicOrQueue,
-        string sessionId,
-        string messageBody,
+        object message,
+        string? sessionId = null,
         IDictionary<string, string>? properties = null,
         TimeSpan? timeToLive = null,
         CancellationToken cancellationToken = default);

src/Atc.Azure.Messaging/ServiceBus/ServiceBusPublisher.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Azure.Messaging.ServiceBus;
 
 namespace Atc.Azure.Messaging.ServiceBus;
@@ -13,50 +14,33 @@ public ServiceBusPublisher(IServiceBusSenderProvider clientProvider)
 
     public Task PublishAsync(
         string topicOrQueue,
-        string sessionId,
-        string messageBody,
+        object message,
+        string? sessionId = null,
         IDictionary<string, string>? properties = null,
         TimeSpan? timeToLive = null,
         CancellationToken cancellationToken = default)
     {
-        return PerformPublishAsync(
-            topicOrQueue,
-            sessionId,
-            messageBody,
-            properties,
-            timeToLive,
-            cancellationToken);
-    }
-
-    private Task PerformPublishAsync(
-        string topicOrQueue,
-        string sessionId,
-        string messageBody,
-        IDictionary<string, string>? properties,
-        TimeSpan? timeToLive,
-        CancellationToken cancellationToken)
-    {
-        var message = CreateServiceBusMessage(
-            sessionId,
-            messageBody,
-            properties,
-            timeToLive);
-
         return clientProvider
             .GetSender(topicOrQueue)
-            .SendMessageAsync(message, cancellationToken);
+            .SendMessageAsync(
+                CreateServiceBusMessage(
+                    sessionId,
+                    JsonSerializer.Serialize(message),
+                    properties,
+                    timeToLive),
+                cancellationToken);
     }
 
     private static ServiceBusMessage CreateServiceBusMessage(
-        string sessionId,
+        string? sessionId,
         string messageBody,
         IDictionary<string, string>? properties,
         TimeSpan? timeToLive)
     {
         var message = new ServiceBusMessage(messageBody)
         {
             MessageId = Guid.NewGuid().ToString(),
-            SessionId = sessionId,
+            SessionId = sessionId ?? Guid.NewGuid().ToString(),
         };
 
         if (timeToLive != null)

test/Atc.Azure.Messaging.Tests/ServiceBus/ServiceBusPublisherTests.cs

@@ -1,6 +1,7 @@
 using Atc.Azure.Messaging.ServiceBus;
 using AutoFixture.AutoNSubstitute;
 using Azure.Messaging.ServiceBus;
+using System.Text.Json;
 
 namespace Atc.Azure.Messaging.Tests.ServiceBus
 {
@@ -12,7 +13,7 @@ public async Task Should_Get_ServiceBusSender_For_Topic(
             ServiceBusPublisher sut,
             [Substitute] ServiceBusSender sender,
             string topicName,
-            string messageBody,
+            object messageBody,
             IDictionary<string, string> properties,
             TimeSpan timeToLive,
             string sessionId,
@@ -24,8 +25,8 @@ public async Task Should_Get_ServiceBusSender_For_Topic(
 
             await sut.PublishAsync(
                 topicName,
-                sessionId,
                 messageBody,
+                sessionId,
                 properties,
                 timeToLive,
                 cancellationToken);
@@ -41,7 +42,7 @@ public async Task Should_Send_Message_On_ServiceBusSender(
             ServiceBusPublisher sut,
             [Substitute] ServiceBusSender sender,
             string topicName,
-            string messageBody,
+            object messageBody,
             IDictionary<string, string> properties,
             TimeSpan timeToLive,
             string sessionId,
@@ -53,8 +54,8 @@ public async Task Should_Send_Message_On_ServiceBusSender(
 
             await sut.PublishAsync(
                 topicName,
-                sessionId,
                 messageBody,
+                sessionId,
                 properties,
                 timeToLive,
                 cancellationToken);
@@ -74,7 +75,7 @@ await sut.PublishAsync(
             message.Body
                 .ToString()
                 .Should()
-                .BeEquivalentTo(messageBody);
+                .BeEquivalentTo(JsonSerializer.Serialize(messageBody));
             message.ApplicationProperties
                 .Should()
                 .BeEquivalentTo(properties);
@@ -89,7 +90,7 @@ public async Task Should_Handle_Default_Parameters(
             ServiceBusPublisher sut,
             [Substitute] ServiceBusSender sender,
             string topicName,
-            string messageBody,
+            object messageBody,
             string sessionId)
         {
             provider
@@ -98,8 +99,8 @@ public async Task Should_Handle_Default_Parameters(
 
             await sut.PublishAsync(
                 topicName,
-                sessionId,
-                messageBody);
+                messageBody,
+                sessionId);
 
             _ = sender
                 .Received(1)
@@ -119,7 +120,7 @@ await sut.PublishAsync(
             message.Body
                 .ToString()
                 .Should()
-                .BeEquivalentTo(messageBody);
+                .BeEquivalentTo(JsonSerializer.Serialize(messageBody));
             message.ApplicationProperties
                 .Should()
                 .BeEmpty();