Allow [DataMember] to use as alias without needing [DataContract]

Author: mythz

src/ServiceStack.Text/Common/DeserializeTypeRef.cs

@@ -61,7 +61,6 @@ internal static KeyValuePair<string, TypeAccessor>[] GetCachedTypeAccessors(Type
         internal static KeyValuePair<string, TypeAccessor>[] GetTypeAccessors(TypeConfig typeConfig, ITypeSerializer serializer)
         {
             var type = typeConfig.Type;
-            var isDataContract = type.IsDto();
 
             var propertyInfos = type.GetSerializableProperties();
             var fieldInfos = type.GetSerializableFields();
@@ -77,13 +76,10 @@ internal static KeyValuePair<string, TypeAccessor>[] GetTypeAccessors(TypeConfig
                 {
                     var propertyInfo = propertyInfos[i];
                     var propertyName = propertyInfo.Name;
-                    if (isDataContract)
+                    var dcsDataMember = propertyInfo.GetDataMember();
+                    if (dcsDataMember?.Name != null)
                     {
-                        var dcsDataMember = propertyInfo.GetDataMember();
-                        if (dcsDataMember?.Name != null)
-                        {
-                            propertyName = dcsDataMember.Name;
-                        }
+                        propertyName = dcsDataMember.Name;
                     }
 
                     accessors[i] = new KeyValuePair<string, TypeAccessor>(propertyName, TypeAccessor.Create(serializer, typeConfig, propertyInfo));
@@ -96,13 +92,10 @@ internal static KeyValuePair<string, TypeAccessor>[] GetTypeAccessors(TypeConfig
                 {
                     var fieldInfo = fieldInfos[j];
                     var fieldName = fieldInfo.Name;
-                    if (isDataContract)
+                    var dcsDataMember = fieldInfo.GetDataMember();
+                    if (dcsDataMember?.Name != null)
                     {
-                        var dcsDataMember = fieldInfo.GetDataMember();
-                        if (dcsDataMember?.Name != null)
-                        {
-                            fieldName = dcsDataMember.Name;
-                        }
+                        fieldName = dcsDataMember.Name;
                     }
 
                     accessors[i + j] = new KeyValuePair<string, TypeAccessor>(fieldName, TypeAccessor.Create(serializer, typeConfig, fieldInfo));

src/ServiceStack.Text/CsvReader.cs

@@ -208,7 +208,6 @@ internal static void Reset()
             PropertyConverters = new List<ParseStringDelegate>();
             PropertyConvertersMap = new Dictionary<string, ParseStringDelegate>(PclExport.Instance.InvariantComparerIgnoreCase);
 
-            var isDataContract = typeof(T).IsDto();
             foreach (var propertyInfo in TypeConfig<T>.Properties)
             {
                 if (!propertyInfo.CanWrite || propertyInfo.GetSetMethod(nonPublic:true) == null) continue;
@@ -221,12 +220,9 @@ internal static void Reset()
                 var converter = JsvReader.GetParseFn(propertyInfo.PropertyType);
                 PropertyConverters.Add(converter);
 
-                if (isDataContract)
-                {
-                    var dcsDataMemberName = propertyInfo.GetDataMemberName();
-                    if (dcsDataMemberName != null)
-                        propertyName = dcsDataMemberName;
-                }
+                var dcsDataMemberName = propertyInfo.GetDataMemberName();
+                if (dcsDataMemberName != null)
+                    propertyName = dcsDataMemberName;
 
                 Headers.Add(propertyName);
                 PropertySettersMap[propertyName] = setter;

src/ServiceStack.Text/CsvSerializer.cs

@@ -35,8 +35,7 @@ internal static WriteObjectDelegate GetWriteFn(Type type)
                 do
                 {
                     snapshot = WriteFnCache;
-                    newCache = new Dictionary<Type, WriteObjectDelegate>(WriteFnCache);
-                    newCache[type] = writeFn;
+                    newCache = new Dictionary<Type, WriteObjectDelegate>(WriteFnCache) {[type] = writeFn};
 
                 } while (!ReferenceEquals(
                     Interlocked.CompareExchange(ref WriteFnCache, newCache, snapshot), snapshot));
@@ -68,8 +67,7 @@ internal static ParseStringDelegate GetReadFn(Type type)
                 do
                 {
                     snapshot = ReadFnCache;
-                    newCache = new Dictionary<Type, ParseStringDelegate>(ReadFnCache);
-                    newCache[type] = writeFn;
+                    newCache = new Dictionary<Type, ParseStringDelegate>(ReadFnCache) {[type] = writeFn};
 
                 } while (!ReferenceEquals(
                     Interlocked.CompareExchange(ref ReadFnCache, newCache, snapshot), snapshot));

src/ServiceStack.Text/CsvWriter.cs

@@ -162,20 +162,16 @@ internal static void Reset()
             Headers = new List<string>();
 
             PropertyGetters = new List<GetMemberDelegate<T>>();
-            var isDataContract = typeof(T).IsDto();
             foreach (var propertyInfo in TypeConfig<T>.Properties)
             {
                 if (!propertyInfo.CanRead || propertyInfo.GetGetMethod(nonPublic:true) == null) continue;
                 if (!TypeSerializer.CanCreateFromString(propertyInfo.PropertyType)) continue;
 
                 PropertyGetters.Add(propertyInfo.CreateGetter<T>());
                 var propertyName = propertyInfo.Name;
-                if (isDataContract)
-                {
-                    var dcsDataMemberName = propertyInfo.GetDataMemberName();
-                    if (dcsDataMemberName != null)
-                        propertyName = dcsDataMemberName;
-                }
+                var dcsDataMemberName = propertyInfo.GetDataMemberName();
+                if (dcsDataMemberName != null)
+                    propertyName = dcsDataMemberName;
                 Headers.Add(propertyName);
             }
         }

tests/ServiceStack.Text.Tests/DataContractTests.cs

@@ -329,6 +329,10 @@ public void Does_use_alias_and_is_not_optin_without_DataContract_Attribute()
         {
             var dto = new AliasWithoutDataContract { Id = 1, Name = "foo" };
             Assert.That(dto.ToJson(), Is.EqualTo("{\"Id\":1,\"alias\":\"foo\"}"));
+
+            Assert.That(dto.ToJsv(), Is.EqualTo("{Id:1,alias:foo}"));
+            
+            Assert.That(dto.ToCsv(), Is.EqualTo("Id,alias\r\n1,foo\r\n"));
         }
 
     }

tests/ServiceStack.Text.Tests/LicensingTests.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using NUnit.Framework;
 
@@ -44,6 +45,7 @@ public class LicensingTests
         [SetUp]
         public void SetUp()
         {
+            
             LicenseUtils.RemoveLicense();
         }