Merge pull request #169 from PaulCampbell/master

XML Deserialization of nullable types with attributes

Author: johnsheehan

RestSharp.Tests/XmlTests.cs

@@ -508,6 +508,32 @@ public void Can_Deserialize_Boolean_From_String()
 				Assert.True(output.Value);
 		}
 
+        [Fact]
+        public void Can_Deserialize_Empty_Elements_With_Attributes_to_Nullable_Values()
+        {
+            var doc = CreateXmlWithAttributesAndNullValues();
+
+            var xml = new XmlDeserializer();
+            var output = xml.Deserialize<NullableValues>(new RestResponse { Content = doc });
+
+            Assert.Null(output.Id);
+            Assert.Null(output.StartDate);
+            Assert.Null(output.UniqueId);
+        }
+
+        [Fact]
+        public void Can_Deserialize_Mixture_Of_Empty_Elements_With_Attributes_And_Populated_Elements()
+        {
+            var doc = CreateXmlWithAttributesAndNullValuesAndPopulatedValues();
+
+            var xml = new XmlDeserializer();
+            var output = xml.Deserialize<NullableValues>(new RestResponse { Content = doc });
+
+            Assert.Null(output.Id);
+            Assert.Null(output.StartDate);
+            Assert.Equal(new Guid(GuidString), output.UniqueId);
+        }
+
 		private static string CreateUnderscoresXml()
 		{
 			var doc = new XDocument();
@@ -753,5 +779,39 @@ private static string CreateXmlWithEmptyInlineList()
 
 			return doc.ToString();
 		}
+
+        private static string CreateXmlWithAttributesAndNullValues()
+        {
+            var doc = new XDocument();
+            var root = new XElement("NullableValues");
+
+            var idElement = new XElement("Id", null);
+            idElement.SetAttributeValue("SomeAttribute", "SomeAttribute_Value");
+            root.Add(idElement,
+                     new XElement("StartDate", null),
+                     new XElement("UniqueId", null)
+                );
+
+            doc.Add(root);
+
+            return doc.ToString();
+        }
+
+        private static string CreateXmlWithAttributesAndNullValuesAndPopulatedValues()
+        {
+            var doc = new XDocument();
+            var root = new XElement("NullableValues");
+
+            var idElement = new XElement("Id", null);
+            idElement.SetAttributeValue("SomeAttribute", "SomeAttribute_Value");
+            root.Add(idElement,
+                     new XElement("StartDate", null),
+                     new XElement("UniqueId", new Guid(GuidString))
+                );
+
+            doc.Add(root);
+
+            return doc.ToString();
+        }
 	}
 }

RestSharp/Deserializers/XmlDeserializer.cs

@@ -124,7 +124,13 @@ private void Map(object x, XElement root)
 				// check for nullable and extract underlying type
 				if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
 				{
-					type = type.GetGenericArguments()[0];
+                    // if the value is empty, set the property to null...
+                    if (value == null || String.IsNullOrEmpty(value.ToString()))
+                    {
+                        prop.SetValue(x, null, null);
+                        continue;
+                    }
+                    type = type.GetGenericArguments()[0];
 				}
 
 				if (type == typeof(bool))