Read Guid MessageId as string if possible

Havret · Jun 12, 2024 · ff0baab · ff0baab
1 parent 746f82e
commit ff0baab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/ArtemisNetClient/Message/Message.cs b/src/ArtemisNetClient/Message/Message.cs
@@ -66,7 +66,14 @@ private static RestrictedDescribed GetBodySection(object body)
 
         public string MessageId
         {
-            get => Properties.MessageId;
+            get
+            {
+                if (Properties.ObjectMessageId is string stringMessageId)
+                {
+                    return stringMessageId;
+                }
+                return Properties.ObjectMessageId?.ToString();
+            }
             set => Properties.MessageId = value;
         }
 

diff --git a/test/ArtemisNetClient.UnitTests/MessageSpec.cs b/test/ArtemisNetClient.UnitTests/MessageSpec.cs
@@ -525,5 +525,15 @@ public async Task Should_send_message_without_ContentType()
 
             Assert.Null(messageProcessor.Dequeue(ShortTimeout).ContentType);
         }
+
+        [Fact]
+        public void Should_read_guid_MessageId_as_string_if_possible()
+        {
+            var messageId = Guid.NewGuid();
+            var message = new Message("foo");
+            message.SetMessageId(messageId);
+
+            Assert.Equal(messageId.ToString(), message.MessageId);
+        }
     }
 }