Added ability to serialize messages containing Uri-s to xml.

Particular · Dec 21, 2010 · c82ddf2 · c82ddf2
1 parent 41a6f62
commit c82ddf2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/impl/Serializers/NServiceBus.Serializers.XML.Test/IM1.cs b/src/impl/Serializers/NServiceBus.Serializers.XML.Test/IM1.cs
@@ -1,11 +1,14 @@
-namespace NServiceBus.Serializers.XML
+using System;
+
+namespace NServiceBus.Serializers.XML
 {
     public interface IM1 : IMessage
     {
         float Age { get; set; }
         int Int { get; set; }
         string Name { get; set; }
         string Address { get; set; }
+        Uri Uri { get; set; }
         Risk Risk { get; set; }
     }
 }
diff --git a/src/impl/Serializers/NServiceBus.Serializers.XML.Test/M1.cs b/src/impl/Serializers/NServiceBus.Serializers.XML.Test/M1.cs
@@ -10,6 +10,7 @@ public class M1 : IM1
         public int Int { get; set; }
         public string Name { get; set; }
         public string Address { get; set; }
+        public Uri Uri { get; set; }
         public Risk Risk { get; set; }
         public string this[int key]
         {

diff --git a/src/impl/Serializers/NServiceBus.Serializers.XML.Test/SerializerTests.cs b/src/impl/Serializers/NServiceBus.Serializers.XML.Test/SerializerTests.cs
@@ -77,6 +77,7 @@ public void TestInterfaces()
             o.Address = Guid.NewGuid().ToString();
             o.Int = 7;
             o.Name = "udi";
+            o.Uri = new Uri("http://www.UdiDahan.com/");
             o.Risk = new Risk { Percent = 0.15D, Annum = true, Accuracy = 0.314M };
             o.Some = SomeEnum.B;
             o.Start = DateTime.Now;

diff --git a/src/impl/Serializers/NServiceBus.Serializers.XML/MessageSerializer.cs b/src/impl/Serializers/NServiceBus.Serializers.XML/MessageSerializer.cs
@@ -335,7 +335,7 @@ private object Process(XmlNode node, object parent)
 
         private object GetObjectOfTypeFromNode(Type t, XmlNode node)
         {
-            if (t.IsSimpleType())
+            if (t.IsSimpleType() || t == typeof(Uri))
                 return GetPropertyValue(t, node);
 
             if (t == typeof(WireEncryptedString))
@@ -477,6 +477,9 @@ private object GetPropertyValue(Type type, XmlNode n)
 
                 if (type == typeof(byte[]))
                     return Convert.FromBase64String(n.ChildNodes[0].InnerText);
+
+                if (type == typeof(Uri))
+                    return new Uri(n.ChildNodes[0].InnerText);
             }
 
             //Handle dictionaries
@@ -656,6 +659,12 @@ private void WriteObject(string name, Type type, object value, StringBuilder bui
                 return;
             }
 
+            if (value is Uri)
+            {
+                builder.AppendFormat("<{0}>{1}</{0}>\n", name, value);
+                return;
+            }
+
             string element = name;
             string prefix;
             namespacesToPrefix.TryGetValue(type.Namespace, out prefix);