made DataBusAttachment serializable across the board

rebus-org · Jun 21, 2016 · aa8a2dc · aa8a2dc
1 parent cc8a4f0
commit aa8a2dc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -974,6 +974,7 @@
 # 0.99.63
 
 * Maintain time of last read access in all data bus storages
+* Made `DataBusAttachment` serializable with all currently supported serializers (JSON.NET, Jil, Wire, and Protobuf)
 
 ---
 

diff --git a/Rebus.Protobuf/ProtobufSerializer.cs b/Rebus.Protobuf/ProtobufSerializer.cs
@@ -4,6 +4,7 @@
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using ProtoBuf.Meta;
+using Rebus.DataBus;
 using Rebus.Extensions;
 using Rebus.Messages;
 using Rebus.Messages.Control;
@@ -28,6 +29,9 @@ public ProtobufSerializer(RuntimeTypeModel runtimeTypeModel)
             var unsubscribeRequestType = _runtimeTypeModel.Add(typeof (UnsubscribeRequest), true);
             unsubscribeRequestType.AddField(1, Reflect.Path<UnsubscribeRequest>(r => r.Topic));
             unsubscribeRequestType.AddField(2, Reflect.Path<UnsubscribeRequest>(r => r.SubscriberAddress));
+
+            var dataBusAttachmentType = _runtimeTypeModel.Add(typeof(DataBusAttachment), true);
+            dataBusAttachmentType.AddField(1, Reflect.Path<DataBusAttachment>(r => r.Id));
         }
 
         public ProtobufSerializer()

diff --git a/Rebus.Tests/DataBus/SimpleTest.cs b/Rebus.Tests/DataBus/SimpleTest.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -78,7 +79,11 @@ public async Task CanSendBigFile()
             // send a message that sends the contents of a file as an attachment
             using (var source = File.OpenRead(sourceFilePath))
             {
-                var attachment = await _senderBus.Advanced.DataBus.CreateAttachment(source);
+                var optionalMetadata = new Dictionary<string, string>
+                {
+                    {"username", Thread.CurrentPrincipal.Identity.Name }
+                };
+                var attachment = await _senderBus.Advanced.DataBus.CreateAttachment(source, optionalMetadata);
 
                 await _senderBus.Send(new MessageWithAttachment
                 {

diff --git a/Rebus.Tests/Serialization/BasicSerializationTests.cs b/Rebus.Tests/Serialization/BasicSerializationTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using Rebus.DataBus;
 using Rebus.Messages;
 using Rebus.Messages.Control;
 using Rebus.Serialization;
@@ -19,6 +20,18 @@ protected override void SetUp()
             _serializer = _factory.GetSerializer();
         }
 
+        [Test]
+        public async Task CanRoundtripInternalMessages_DataBusAttachment()
+        {
+            var message = new DataBusAttachment("bimmelim!!!");
+
+            Console.WriteLine("Roundtripping {0}", message.GetType());
+
+            var roundtrippedMessage = (DataBusAttachment)await Roundtrip(message);
+
+            Assert.That(roundtrippedMessage.Id, Is.EqualTo("bimmelim!!!"));
+        }
+
         [Test]
         public async Task CanRoundtripInternalMessages_SubscribeRequest()
         {

diff --git a/Rebus/DataBus/DataBusAttachment.cs b/Rebus/DataBus/DataBusAttachment.cs
@@ -26,7 +26,14 @@ public DataBusAttachment(string id)
         /// <summary>
         /// Gets the ID of the attachment
         /// </summary>
-        public string Id { get; }
+        public string Id
+        {
+            get;
+            protected set; // protected setter to make the JIL serializer happy
+        }
+
+        // ctor added to make the JIL serializer happy
+        DataBusAttachment() { }
 
         /// <summary>
         /// Opens the attachment for reading, using the data bus of the bus that is handling the current message to read it.