workaround dirty tests by only checking objSerializer in cached generic parse fn

Author: mythz

src/ServiceStack.Text/Common/DeserializeDictionary.cs

@@ -45,14 +45,12 @@ public static ParseStringSpanDelegate GetParseStringSpanMethod(Type type)
                     return s => ParseIDictionary(s, type);
                 }
 
-                throw new ArgumentException(string.Format("Type {0} is not of type IDictionary<,>", type.FullName));
+                throw new ArgumentException($"Type {type.FullName} is not of type IDictionary<,>");
             }
 
             //optimized access for regularly used types
             if (type == typeof(Dictionary<string, string>))
                 return ParseStringDictionary;
-            if (type == typeof(Dictionary<string, object>) && Json.JsonTypeSerializer.Instance.ObjectDeserializer != null)
-                return s => Json.JsonTypeSerializer.Instance.ObjectDeserializer(s);
             if (type == typeof(JsonObject))
                 return ParseJsonObject;
             if (typeof(JsonObject).IsAssignableFrom(type))
@@ -229,6 +227,14 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
         {
             if (value.IsEmpty) return null;
 
+            var to = (createMapType == null)
+                ? new Dictionary<TKey, TValue>()
+                : (IDictionary<TKey, TValue>)createMapType.CreateInstance();
+
+            var objDeserializer = Json.JsonTypeSerializer.Instance.ObjectDeserializer;
+            if (to is Dictionary<string, object> && objDeserializer != null)
+                return (IDictionary<TKey,TValue>) objDeserializer(value);
+
             var config = JsConfig.GetConfig();
 
             var tryToParseItemsAsDictionaries =
@@ -238,10 +244,6 @@ public static IDictionary<TKey, TValue> ParseDictionary<TKey, TValue>(
 
             var index = VerifyAndGetStartIndex(value, createMapType);
 
-            var to = (createMapType == null)
-                ? new Dictionary<TKey, TValue>()
-                : (IDictionary<TKey, TValue>)createMapType.CreateInstance();
-
             if (Json.JsonTypeSerializer.IsEmptyMap(value, index)) return to;
 
             var valueLength = value.Length;

src/ServiceStack.Text/Common/DeserializeListWithElements.cs

@@ -161,16 +161,18 @@ public static ICollection<T> ParseGenericList(string value, Type createListType,
 
         public static ICollection<T> ParseGenericList(ReadOnlySpan<char> value, Type createListType, ParseStringSpanDelegate parseFn)
         {
-            if ((value = DeserializeListWithElements<TSerializer>.StripList(value)).IsEmpty) 
-                return null;
-
-            var isReadOnly = createListType != null
-                && (createListType.IsGenericType && createListType.GetGenericTypeDefinition() == typeof(ReadOnlyCollection<>));
-
+            var isReadOnly = createListType != null && (createListType.IsGenericType && createListType.GetGenericTypeDefinition() == typeof(ReadOnlyCollection<>));
             var to = (createListType == null || isReadOnly)
                 ? new List<T>()
                 : (ICollection<T>)createListType.CreateInstance();
 
+            var objSerializer = Json.JsonTypeSerializer.Instance.ObjectDeserializer;
+            if (to is List<object> && objSerializer != null)
+                return (ICollection<T>)objSerializer(value);
+
+            if ((value = DeserializeListWithElements<TSerializer>.StripList(value)).IsEmpty) 
+                return null;
+
             if (value.IsNullOrEmpty())
                 return isReadOnly ? (ICollection<T>)Activator.CreateInstance(createListType, to) : to;
 
@@ -270,9 +272,6 @@ public static ParseStringSpanDelegate GetParseStringSpanFn()
             if (typeof(T) == typeof(List<int>))
                 return DeserializeListWithElements<TSerializer>.ParseIntList;
 
-            if (typeof(T) == typeof(List<object>) && Json.JsonTypeSerializer.Instance.ObjectDeserializer != null)
-                return s => Json.JsonTypeSerializer.Instance.ObjectDeserializer(s);
-
             var elementType = listInterface.GetGenericArguments()[0];
 
             var supportedTypeParseMethod = DeserializeListWithElements<TSerializer>.Serializer.GetParseStringSpanFn(elementType);

tests/ServiceStack.Text.Tests/JsonTests/DictionaryDeserializationTests.cs

@@ -12,18 +12,13 @@ public void CanDeserializeDictionaryOfComplexTypes()
         {
             JsConfig.ConvertObjectTypesIntoStringDictionary = true;
 
-            var dict = new Dictionary<string, object>();
-
-            dict["ChildDict"] = new Dictionary<string, object>
-            {
-                {"age", 12},
-                {"name", "mike"}
+            var dict = new Dictionary<string, object> {
+                ["ChildDict"] = new Dictionary<string, object> {{"age", 12}, {"name", "mike"}},
+                ["ChildIntList"] = new List<int> {1, 2, 3},
+                ["ChildStringList"] = new List<string> {"a", "b", "c"},
+                ["ChildObjectList"] = new List<object> {1, "cat", new Dictionary<string, object> {{"s", "s"}, {"n", 1}}}
             };
 
-            dict["ChildIntList"] = new List<int> {1, 2, 3};
-            dict["ChildStringList"] = new List<string> {"a", "b", "c"};
-            dict["ChildObjectList"] = new List<object> {1, "cat", new Dictionary<string, object> {{"s", "s"}, {"n", 1}}};
-
             var serialized = JsonSerializer.SerializeToString(dict);
 
             var deserialized = JsonSerializer.DeserializeFromString<Dictionary<string, object>>(serialized);

tests/ServiceStack.Text.Tests/JsonTests/JsonObjectTests.cs

@@ -505,7 +505,7 @@ public void Can_deserialize_custom_JsonObject_with_incorrect_payload()
             }
             catch (FormatException) {}
         }
-
+        
         class HasObjectDictionary
         {
             public Dictionary<string, object> Properties { get; set; }
@@ -544,6 +544,5 @@ public void Can_deserialize_unknown_ObjectList()
 
             JS.UnConfigure();
         }
-        
     }
 }