Separate Refresh reads from writes

Author: mythz

src/ServiceStack.Text/JsConfig.cs

@@ -1093,7 +1093,7 @@ public static Func<T, string> RawSerializeFn
         public static Func<T, T> OnSerializingFn
         {
             get { return onSerializingFn; }
-            set { onSerializingFn = value; Refresh(); }
+            set { onSerializingFn = value; RefreshWrite(); }
         }
 
         /// <summary>
@@ -1103,7 +1103,7 @@ public static Func<T, T> OnSerializingFn
         public static Action<T> OnSerializedFn
         {
             get { return onSerializedFn; }
-            set { onSerializedFn = value; Refresh(); }
+            set { onSerializedFn = value; RefreshWrite(); }
         }
 
         /// <summary>
@@ -1113,7 +1113,7 @@ public static Action<T> OnSerializedFn
         public static Func<string, T> DeSerializeFn
         {
             get { return deSerializeFn; }
-            set { deSerializeFn = value; Refresh(); }
+            set { deSerializeFn = value; RefreshRead(); }
         }
 
         /// <summary>
@@ -1123,7 +1123,7 @@ public static Func<string, T> DeSerializeFn
         public static Func<string, T> RawDeserializeFn
         {
             get { return rawDeserializeFn; }
-            set { rawDeserializeFn = value; Refresh(); }
+            set { rawDeserializeFn = value; RefreshRead(); }
         }
 
         public static bool HasDeserializeFn
@@ -1135,7 +1135,7 @@ public static bool HasDeserializeFn
         public static Func<T, T> OnDeserializedFn
         {
             get { return onDeserializedFn; }
-            set { onDeserializedFn = value; Refresh(); }
+            set { onDeserializedFn = value; RefreshRead(); }
         }
 
         public static bool HasDeserialingFn
@@ -1147,7 +1147,7 @@ public static bool HasDeserialingFn
         public static Func<T, string, object, object> OnDeserializingFn
         {
             get { return onDeserializingFn; }
-            set { onDeserializingFn = value; Refresh(); }
+            set { onDeserializingFn = value; RefreshRead(); }
         }
 
         /// <summary>
@@ -1241,11 +1241,15 @@ public static void Reset()
             EmitCamelCaseNames = EmitLowercaseUnderscoreNames = IncludeTypeInfo = ExcludeTypeInfo = null;
         }
 
-        public static void Refresh()
+        public static void RefreshRead()
         {
             JsonReader<T>.Refresh();
-            JsonWriter<T>.Refresh();
             JsvReader<T>.Refresh();
+        }
+
+        public static void RefreshWrite()
+        {
+            JsonWriter<T>.Refresh();
             JsvWriter<T>.Refresh();
         }
     }

tests/ServiceStack.Text.Tests/Issues/JsConfigIssues.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Globalization;
+using NUnit.Framework;
+using ServiceStack;
+using ServiceStack.Text;
+
+namespace ServiceStack.Text.Tests.Issues
+{
+    [TestFixture]
+    public class JsConfigIssues
+    {
+        struct CustomFormatType
+        {
+            private int _value;
+
+            public int Value
+            {
+                get { return _value; }
+            }
+
+            public CustomFormatType(int value)
+            {
+                _value = value;
+            }
+        }
+
+        class Dto
+        {
+            public CustomFormatType CustomFormatTypeProperty { get; set; }
+        }
+
+        [Test]
+        public void CallReset_AfterSerializingOnce_WithCustomSerializationForProperty_DoesNotPickUpFurtherConfigChangesForPropertyType()
+        {
+            var dto = new Dto { CustomFormatTypeProperty = new CustomFormatType(12345) };
+
+            ConfigureCustomFormatType();
+            TestRoundTripValue(dto);
+
+            JsConfig.Reset();
+
+            ConfigureCustomFormatType();
+            TestRoundTripValue(dto);
+        }
+
+        private static void ConfigureCustomFormatType()
+        {
+            JsConfig<CustomFormatType>.RawSerializeFn = value => 
+                value.Value.ToString("x");
+
+            JsConfig<CustomFormatType>.DeSerializeFn = str => 
+                new CustomFormatType(int.Parse(str, NumberStyles.HexNumber));
+        }
+
+        private static void TestRoundTripValue(Dto dto)
+        {
+            var json = dto.ToJson();
+            var fromJson = json.FromJson<Dto>();
+            Assert.AreEqual(dto.CustomFormatTypeProperty.Value, dto.CustomFormatTypeProperty.Value);
+        }
+    }
+}

tests/ServiceStack.Text.Tests/ServiceStack.Text.Tests.csproj

@@ -191,6 +191,7 @@
     <Compile Include="AttributeTests.cs" />
     <Compile Include="CsvTypeTests.cs" />
     <Compile Include="HttpUtilsTests.cs" />
+    <Compile Include="Issues\JsConfigIssues.cs" />
     <Compile Include="JsonTests\InheritAbstractTests.cs" />
     <Compile Include="JsonTests\JsonEnumTests.cs" />
     <Compile Include="JsonTests\InvalidJsonTests.cs" />

tests/ServiceStack.Text.Tests/StructTests.cs

@@ -94,7 +94,6 @@ public void Test_structs_with_double_quotes()
 
             JsConfig<Text>.SerializeFn = text => text.ToString();
             JsConfig<Text>.DeSerializeFn = v => new Text(v);
-            JsConfig<Foo>.Refresh();
 
             var json = JsonSerializer.SerializeToString(dto, dto.GetType());
             Assert.That(json, Is.EqualTo("{\"Name\":\"My \\\"quoted\\\" name\",\"Content1\":\"My \\\"quoted\\\" content\"}"));