Merge pull request #408 from bjdodson/master

Support DataMember attribute on fields.

Author: mythz

src/ServiceStack.Text/Common/DeserializeTypeRef.cs

@@ -36,6 +36,7 @@ internal static SerializationException GetSerializationException(string property
         internal static Dictionary<string, TypeAccessor> GetTypeAccessorMap(TypeConfig typeConfig, ITypeSerializer serializer)
         {
             var type = typeConfig.Type;
+            var isDataContract = type.IsDto();
 
             var propertyInfos = type.GetSerializableProperties();
             var fieldInfos = type.GetSerializableFields();
@@ -45,7 +46,6 @@ internal static Dictionary<string, TypeAccessor> GetTypeAccessorMap(TypeConfig t
 
             if (propertyInfos.Length != 0)
             {
-                var isDataContract = type.IsDto();
                 foreach (var propertyInfo in propertyInfos)
                 {
                     var propertyName = propertyInfo.Name;
@@ -66,6 +66,14 @@ internal static Dictionary<string, TypeAccessor> GetTypeAccessorMap(TypeConfig t
                 foreach (var fieldInfo in fieldInfos)
                 {
                     var field = fieldInfo.Name;
+                    if (isDataContract)
+                    {
+                        var dcsDataMember = fieldInfo.GetDataMember();
+                        if (dcsDataMember != null && dcsDataMember.Name != null)
+                        {
+                            field = dcsDataMember.Name;
+                        }
+                    }
                     map[field] = TypeAccessor.Create(serializer, typeConfig, fieldInfo);
                 }
             }

tests/ServiceStack.Text.Tests/DataContractTests.cs

@@ -188,6 +188,13 @@ public class ClassThree
             public string Title { get; set; }
         }
 
+        [DataContract]
+        public class ClassFour
+        {
+            [DataMember(Name = "some-title")]
+            public string Title;
+        }
+
         [Test]
         public void Csv_Serialize_Should_Respects_DataContract_Name()
         {
@@ -218,6 +225,13 @@ public void Json_Serialize_Should_Respects_DataContract_Name_When_Deserialize()
             Assert.That(t.Title, Is.EqualTo("right"));
         }
 
+        [Test]
+        public void Json_Serialize_Should_Respects_DataContract_Field_Name_When_Deserialize()
+        {
+            var t = JsonSerializer.DeserializeFromString<ClassFour>("{\"some-title\": \"right\", \"Title\": \"wrong\"}");
+            Assert.That(t.Title, Is.EqualTo("right"));
+        }
+
         [Test]
         public void Json_Serialize_Should_Respects_DataContract_Name()
         {

tests/ServiceStack.Text.Tests/Support/MovieDtos.cs

@@ -40,13 +40,13 @@ public Movie()
         public decimal Rating { get; set; }
 
         [DataMember(Order = 5, EmitDefaultValue = true, IsRequired = false)]
-        public string Director { get; set; }
+        public string Director;
 
         [DataMember(Order = 6, EmitDefaultValue = false, IsRequired = false)]
         public DateTime ReleaseDate { get; set; }
 
         [DataMember(Order = 6, EmitDefaultValue = false, IsRequired = false)]
-        public string TagLine { get; set; }
+        public string TagLine;
 
         [DataMember(Order = 8, EmitDefaultValue = false, IsRequired = false)]
         public List<string> Genres { get; set; }