Also use CustomHeadersMap when deserializing

Author: mythz

src/ServiceStack.Text/CsvReader.cs

@@ -241,15 +241,22 @@ internal static void ConfigureCustomHeaders(Dictionary<string, string> customHea
             for (var i = Headers.Count - 1; i >= 0; i--)
             {
                 var oldHeader = Headers[i];
-                string newHeaderValue;
-                if (!customHeadersMap.TryGetValue(oldHeader, out newHeaderValue))
+                if (!customHeadersMap.TryGetValue(oldHeader, out var newHeader))
                 {
                     Headers.RemoveAt(i);
                     PropertySetters.RemoveAt(i);
                 }
                 else
                 {
-                    Headers[i] = newHeaderValue.EncodeJsv();
+                    Headers[i] = newHeader;
+
+                    PropertySettersMap.TryGetValue(oldHeader, out var setter);
+                    PropertySettersMap.Remove(oldHeader);
+                    PropertySettersMap[newHeader] = setter;
+                    
+                    PropertyConvertersMap.TryGetValue(oldHeader, out var converter);
+                    PropertyConvertersMap.Remove(oldHeader);
+                    PropertyConvertersMap[newHeader] = converter;
                 }
             }
         }

src/ServiceStack.Text/CsvSerializer.cs

@@ -21,8 +21,7 @@ internal static WriteObjectDelegate GetWriteFn(Type type)
         {
             try
             {
-                WriteObjectDelegate writeFn;
-                if (WriteFnCache.TryGetValue(type, out writeFn)) return writeFn;
+                if (WriteFnCache.TryGetValue(type, out var writeFn)) return writeFn;
 
                 var genericType = typeof(CsvSerializer<>).MakeGenericType(type);
                 var mi = genericType.GetStaticMethod("WriteFn");
@@ -55,8 +54,7 @@ internal static ParseStringDelegate GetReadFn(Type type)
         {
             try
             {
-                ParseStringDelegate writeFn;
-                if (ReadFnCache.TryGetValue(type, out writeFn)) return writeFn;
+                if (ReadFnCache.TryGetValue(type, out var writeFn)) return writeFn;
 
                 var genericType = typeof(CsvSerializer<>).MakeGenericType(type);
                 var mi = genericType.GetStaticMethod("ReadFn");

src/ServiceStack.Text/CsvWriter.cs

@@ -183,8 +183,7 @@ internal static void ConfigureCustomHeaders(Dictionary<string, string> customHea
             for (var i = Headers.Count - 1; i >= 0; i--)
             {
                 var oldHeader = Headers[i];
-                string newHeaderValue;
-                if (!customHeadersMap.TryGetValue(oldHeader, out newHeaderValue))
+                if (!customHeadersMap.TryGetValue(oldHeader, out var newHeaderValue))
                 {
                     Headers.RemoveAt(i);
                     PropertyGetters.RemoveAt(i);

tests/ServiceStack.Text.Tests/CsvTests/CustomHeaderTests.cs

@@ -91,6 +91,30 @@ public void Can_serialize_partial_custom_headers_map()
             ));
         }
 
+        [Test]
+        public void Can_deserialize_partial_custom_headers_map()
+        {
+            CsvConfig<TableItem>.CustomHeadersMap = new Dictionary<string, string> {
+                {"Column1Data", "Column 1"},
+                {"Column3Data", "Column,3"},
+                {"Column5Data", "Column 5"},
+            };
+
+            var csv = "Column 1,\"Column,3\",Column 5\r\n"
+                    + "I,To,Novels\r\n"
+                    + "I am,Cool,Awesome\r\n";
+
+            var data = CsvSerializer.DeserializeFromString<List<TableItem>>(csv);
+            
+            Assert.That(data[0].Column1Data, Is.EqualTo("I"));
+            Assert.That(data[0].Column3Data, Is.EqualTo("To"));
+            Assert.That(data[0].Column5Data, Is.EqualTo("Novels"));
+            
+            Assert.That(data[1].Column1Data, Is.EqualTo("I am"));
+            Assert.That(data[1].Column3Data, Is.EqualTo("Cool"));
+            Assert.That(data[1].Column5Data, Is.EqualTo("Awesome"));
+        }
+
         [Test]
         public void Can_serialize_without_headers()
         {