Flatten Message Structure

src/ArtemisNetCoreClient/Framing/Outgoing/SessionSendMessage.cs

@@ -20,8 +20,8 @@ public int GetRequiredBufferSize()
         byteCount += sizeof(int); // Message body length
         byteCount += Message.Body.Length; // Actual message body length
         byteCount += sizeof(long); // MessageId
-        byteCount += ArtemisBinaryConverter.GetNullableSimpleStringByteCount(Message.Headers.Address);
-        byteCount += ArtemisBinaryConverter.GetNullableGuidByteCount(Message.Headers.UserId);
+        byteCount += ArtemisBinaryConverter.GetNullableSimpleStringByteCount(Message.Address);
+        byteCount += ArtemisBinaryConverter.GetNullableGuidByteCount(Message.UserId);
         byteCount += sizeof(byte); // Type
         byteCount += sizeof(bool); // Durable
         byteCount += sizeof(long); // Expiration
@@ -83,14 +83,14 @@ private int EncodeHeaders(Span<byte> buffer)
     {
         var offset = 0;
 
-        offset += ArtemisBinaryConverter.WriteInt64(ref buffer.GetReference(), Message.Headers.MessageId);
-        offset += ArtemisBinaryConverter.WriteNullableSimpleString(ref buffer.GetOffset(offset), Message.Headers.Address);
-        offset += ArtemisBinaryConverter.WriteNullableGuid(ref buffer.GetOffset(offset), Message.Headers.UserId);
-        offset += ArtemisBinaryConverter.WriteByte(ref buffer.GetOffset(offset), Message.Headers.Type);
-        offset += ArtemisBinaryConverter.WriteBool(ref buffer.GetOffset(offset), Message.Headers.Durable);
-        offset += ArtemisBinaryConverter.WriteDateTimeOffset(ref buffer.GetOffset(offset), Message.Headers.Expiration);
-        offset += ArtemisBinaryConverter.WriteDateTimeOffset(ref buffer.GetOffset(offset), Message.Headers.Timestamp);
-        offset += ArtemisBinaryConverter.WriteByte(ref buffer.GetOffset(offset), Message.Headers.Priority);
+        offset += ArtemisBinaryConverter.WriteInt64(ref buffer.GetReference(), Message.MessageId);
+        offset += ArtemisBinaryConverter.WriteNullableSimpleString(ref buffer.GetOffset(offset), Message.Address);
+        offset += ArtemisBinaryConverter.WriteNullableGuid(ref buffer.GetOffset(offset), Message.UserId);
+        offset += ArtemisBinaryConverter.WriteByte(ref buffer.GetOffset(offset), Message.Type);
+        offset += ArtemisBinaryConverter.WriteBool(ref buffer.GetOffset(offset), Message.Durable);
+        offset += ArtemisBinaryConverter.WriteDateTimeOffset(ref buffer.GetOffset(offset), Message.Expiration);
+        offset += ArtemisBinaryConverter.WriteDateTimeOffset(ref buffer.GetOffset(offset), Message.Timestamp);
+        offset += ArtemisBinaryConverter.WriteByte(ref buffer.GetOffset(offset), Message.Priority);
 
         return offset;
     }

src/ArtemisNetCoreClient/Message.cs

@@ -6,15 +6,36 @@
 /// </summary>
 public class Message
 {
+    public long MessageId { get; set; }
+
+    public string? Address { get; set; }
+
+    public Guid? UserId { get; set; }
+
+    public byte Type { get; set; }
+
+    public bool Durable { get; set; }
+
     /// <summary>
-    /// The message headers
+    /// Gets or sets the date and time when this message expires. If set to <see cref="DateTimeOffset.MinValue"/>,
+    /// the message is considered to never expire.
+    /// Note that when setting this property, any time precision finer than milliseconds will be lost.
     /// </summary>
-    public Headers Headers { get; set; }
+    public DateTimeOffset Expiration { get; set; }
+
+    /// <summary>
+    /// Gets or sets the date and time when this message was created.
+    /// Note that when setting this property, any time precision finer than milliseconds will be lost.
+    /// </summary>
+    public DateTimeOffset Timestamp { get; set; }
+
+    // TODO: Enum?
+    public byte Priority { get; set; }
 
     /// <summary>
     /// The message properties
     /// </summary>
     public IDictionary<string, object?> Properties { get; set; }
 
     /// <summary>
     /// The message body (payload)

test/ArtemisNetCoreClient.Tests/ConsumerSpec.cs

@@ -30,10 +30,7 @@ public async Task Should_receive_message()
 
         await producer.SendMessageAsync(new Message
         {
-            Headers = new Headers
-            {
-                Address = addressName,
-            },
+            Address = addressName,
             Body = "test_payload"u8.ToArray()
         }, testFixture.CancellationToken);
 

test/ArtemisNetCoreClient.Tests/MessageExpirationSpec.cs

@@ -31,13 +31,10 @@ public async Task Should_send_and_receive_message_with_expiration_header()
         var expiration = DateTimeOffset.UtcNow.Add(TimeSpan.FromHours(10));
         await producer.SendMessageAsync(new Message
         {
+            Address = addressName,
+            Expiration = expiration,
+            Durable = true,
             Body = "expiry_message"u8.ToArray(),
-            Headers = new Headers
-            {
-                Address = addressName,
-                Expiration = expiration,
-                Durable = true
-            },
         }, testFixture.CancellationToken);
 
         var receivedMessage = await consumer.ReceiveMessageAsync(testFixture.CancellationToken);
@@ -75,11 +72,8 @@ public async Task Should_deliver_expired_message_to_expiry_queue()
         await producer.SendMessageAsync(new Message
         {
             Body = "expiry_message"u8.ToArray(),
-            Headers = new Headers
-            {
-                Address = addressName,
-                Expiration = expiration,
-            }
+            Address = addressName,
+            Expiration = expiration,
         }, testFixture.CancellationToken);
 
         var receivedMessage = await RetryUtil.RetryUntil(

test/ArtemisNetCoreClient.Tests/MessageFlowSpec.cs

@@ -51,10 +51,7 @@ public async Task Should_receive_messages_in_the_same_order_as_they_were_sent()
             {
                 tasks.Add(producer.SendMessageAsync(new Message
                 {
-                    Headers = new Headers
-                    {
-                        Address = addressName,
-                    },
+                    Address = addressName,
                     Properties = new Dictionary<string, object?>
                     {
                         ["index"] = i

test/ArtemisNetCoreClient.Tests/MessagePropertiesSpec.cs

@@ -38,10 +38,7 @@ await session.CreateQueueAsync(new QueueConfiguration
         await producer.SendMessageAsync(new Message
         {
             Body = "test_payload"u8.ToArray(),
-            Headers = new Headers
-            {
-                Address = addressName,
-            },
+            Address = addressName,
             Properties = new Dictionary<string, object?>
             {
                 ["null_property"] = null,

test/ArtemisNetCoreClient.Tests/MessageTimestampSpec.cs

@@ -32,11 +32,8 @@ public async Task Should_send_and_receive_message_with_timestamp_header()
         await producer.SendMessageAsync(new Message
         {
             Body = "test_msg"u8.ToArray(),
-            Headers = new Headers
-            {
-                Address = addressName,
-                Timestamp = timestamp,
-            },
+            Address = addressName,
+            Timestamp = timestamp,
         }, testFixture.CancellationToken);
 
         var receivedMessage = await consumer.ReceiveMessageAsync(testFixture.CancellationToken);

test/ArtemisNetCoreClient.Tests/ProducerSpec.cs

@@ -41,10 +41,7 @@ await scenario.Step("Send a message", async () =>
             await producer.SendMessageAsync(new Message
             {
                 Body = "msg_1"u8.ToArray(),
-                Headers = new Headers
-                {
-                    Address = addressName,
-                }
+                Address = addressName,
             }, testFixture.CancellationToken);
         });
 
@@ -92,18 +89,12 @@ await scenario.Step("Send two messages", async () =>
             await producer.SendMessageAsync(new Message
             {
                 Body = "msg_1"u8.ToArray(),
-                Headers = new Headers
-                {
-                    Address = addressName,
-                }
+                Address = addressName,
             }, testFixture.CancellationToken);
             await producer.SendMessageAsync(new Message
             {
                 Body = "msg_2"u8.ToArray(),
-                Headers = new Headers
-                {
-                    Address = addressName,
-                }
+                Address = addressName,
             }, testFixture.CancellationToken);
         });
 

test/ArtemisNetCoreClient.Tests/Utils/TestFixture.cs

@@ -63,10 +63,7 @@ public async Task SendMessageAsync(string addressName, ReadOnlyMemory<byte> mess
         await producer.SendMessageAsync(new Message
         {
             Body = messagePayload,
-            Headers = new Headers
-            {
-                Address = addressName
-            }
+            Address = addressName
         }, CancellationToken);
     }