Handling Content-Type and other properties

Author: afprtclr

src/NServiceBus.Transport.RabbitMQ.Tests/MessageConverterTests.cs

@@ -107,34 +107,22 @@ public void ClearUserId()
                 throw new NotSupportedException();
             }
 
-            public bool IsAppIdPresent()
-            {
-                throw new NotSupportedException();
-            }
+            public bool IsAppIdPresent() => AppId != null;
 
             public bool IsClusterIdPresent()
             {
                 throw new NotSupportedException();
             }
 
-            public bool IsContentEncodingPresent()
-            {
-                throw new NotSupportedException();
-            }
+            public bool IsContentEncodingPresent() => ContentEncoding != null;
 
-            public bool IsContentTypePresent()
-            {
-                throw new NotSupportedException();
-            }
+            public bool IsContentTypePresent() => ContentType != null;
 
             public bool IsCorrelationIdPresent() => !string.IsNullOrEmpty(CorrelationId);
 
             public bool IsDeliveryModePresent() => DeliveryMode != 0;
 
-            public bool IsExpirationPresent()
-            {
-                throw new NotSupportedException();
-            }
+            public bool IsExpirationPresent() => Expiration != null;
 
             public bool IsHeadersPresent()
             {
@@ -157,10 +145,7 @@ public bool IsTimestampPresent()
 
             public bool IsTypePresent() => !string.IsNullOrEmpty(Type);
 
-            public bool IsUserIdPresent()
-            {
-                throw new NotSupportedException();
-            }
+            public bool IsUserIdPresent() => UserId != null;
         }
 
         MessageConverter converter = new MessageConverter(MessageConverter.DefaultMessageIdStrategy);
@@ -401,5 +386,29 @@ public void TestCanHandleTablesListHeader()
                 Assert.That(Convert.ToString(headers["Foo"]), Is.EqualTo("key1=value1,key2=value2"));
             });
         }
+
+        [Test]
+        public void Should_handle_basic_properties()
+        {
+            var basicProperties = new TestingBasicProperties
+            {
+                MessageId = "Blah",
+                ContentType = "content_type",
+                ContentEncoding = "content_encoding"
+            };
+
+            var message = new BasicDeliverEventArgs(default, default, default, default, default, basicProperties, default);
+
+            var headers = converter.RetrieveHeaders(message);
+            var messageId = converter.RetrieveMessageId(message, headers);
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(messageId, Is.Not.Null);
+                Assert.That(headers, Is.Not.Null);
+                Assert.That(headers[NServiceBus.Headers.ContentType], Is.EqualTo(basicProperties.ContentType));
+                Assert.That(headers[PropertiesToHeaderMapping.ContentEncoding], Is.EqualTo(basicProperties.ContentEncoding));
+            });
+        }
     }
 }

src/NServiceBus.Transport.RabbitMQ.Tests/When_sending_a_message_over_rabbitmq.cs

@@ -110,6 +110,12 @@ public Task Should_transmit_all_transportMessage_headers()
                 });
         }
 
+        [Test]
+        public Task Should_set_the_content_encoding()
+        {
+            return Verify(new OutgoingMessageBuilder().WithHeader(PropertiesToHeaderMapping.ContentEncoding, "content-encoding"), received => Assert.That(received.BasicProperties.ContentEncoding, Is.EqualTo("content-encoding")));
+        }
+
         async Task Verify(OutgoingMessageBuilder builder, Action<IncomingMessage, BasicDeliverEventArgs> assertion, CancellationToken cancellationToken = default)
         {
             var operations = builder.SendTo(QueueToReceiveOn).Build();

src/NServiceBus.Transport.RabbitMQ/Configuration/PropertiesToHeaderMapping.cs

@@ -0,0 +1,8 @@
+namespace NServiceBus
+{
+    static class PropertiesToHeaderMapping
+    {
+        public const string AppId = "NServiceBus.Transport.RabbitMQ.AppId";
+        public const string ContentEncoding = "NServiceBus.Transport.RabbitMQ.ContentEncoding";
+    }
+}

src/NServiceBus.Transport.RabbitMQ/Receiving/MessageConverter.cs

@@ -77,6 +77,21 @@ public Dictionary<string, string> RetrieveHeaders(BasicDeliverEventArgs message)
                 deserializedHeaders[Headers.EnclosedMessageTypes] = properties.Type;
             }
 
+            if (properties.IsContentTypePresent())
+            {
+                deserializedHeaders[Headers.ContentType] = properties.ContentType;
+            }
+
+            if (properties.IsAppIdPresent())
+            {
+                deserializedHeaders[PropertiesToHeaderMapping.AppId] = properties.AppId;
+            }
+
+            if (properties.IsContentEncodingPresent())
+            {
+                deserializedHeaders[PropertiesToHeaderMapping.ContentEncoding] = properties.ContentEncoding;
+            }
+
             //These headers need to be removed so that they won't be copied to an outgoing message if this message gets forwarded
             //They can't be removed before deserialization because the value is used by the message pump
             deserializedHeaders.Remove("x-delivery-count");

src/NServiceBus.Transport.RabbitMQ/Sending/BasicPropertiesExtensions.cs

@@ -70,6 +70,16 @@ public static void Fill(this IBasicProperties properties, OutgoingMessage messag
             {
                 properties.ReplyTo = replyToAddress;
             }
+
+            if (messageHeaders.TryGetValue(PropertiesToHeaderMapping.AppId, out var appId) && appId != null)
+            {
+                properties.AppId = appId;
+            }
+
+            if (messageHeaders.TryGetValue(PropertiesToHeaderMapping.ContentEncoding, out var contentEncoding) && contentEncoding != null)
+            {
+                properties.ContentEncoding = contentEncoding;
+            }
         }
 
         static bool CalculateDelay(DispatchProperties dispatchProperties, out long delay)