restore KVP > Dictionary behavior

Author: mythz

src/ServiceStack.Text/AutoMappingUtils.cs

@@ -260,12 +260,8 @@ public static object ChangeValueType(object from, Type toType)
                 {
 
                     var toKvpArgs = toKvpType.GetGenericArguments();
-                    var toKeyType = toKvpArgs[0];
-                    var toValueType = toKvpArgs[1];
                     var toCtor = toKvpType.GetConstructor(toKvpArgs);
-                    var toKey = fromKey.ConvertTo(toKeyType);
-                    var toValue = fromValue.ConvertTo(toValueType);
-                    var to = toCtor.Invoke(new[] {toKey,toValue});
+                    var to = toCtor.Invoke(new[] { fromKey.ConvertTo(toKvpArgs[0]), fromValue.ConvertTo(toKvpArgs[1]) });
                     return to;
                 }
 
@@ -277,7 +273,8 @@ public static object ChangeValueType(object from, Type toType)
                     var toValueType = toArgs[1];
 
                     var to = (IDictionary)toType.CreateInstance();
-                    to[fromKey.ConvertTo(toKeyType)] = fromValue.ConvertTo(toValueType);
+                    to["Key"] = fromKey.ConvertTo(toKeyType);
+                    to["Value"] = fromValue.ConvertTo(toValueType);
                     return to;
                 }
             }

src/ServiceStack.Text/PlatformExtensions.cs

@@ -738,14 +738,15 @@ public static Dictionary<string, object> ToObjectDictionary(this object obj)
 
 
             if (obj is KeyValuePair<string, object> objKvp)
-                return new Dictionary<string, object> { {objKvp.Key, objKvp.Value} };
+                return new Dictionary<string, object> { { nameof(objKvp.Key), objKvp.Key }, { nameof(objKvp.Value), objKvp.Value } };
             if (obj is KeyValuePair<string, string> strKvp)
-                return new Dictionary<string, object> { {strKvp.Key, strKvp.Value} };
+                return new Dictionary<string, object> { { nameof(strKvp.Key), strKvp.Key }, { nameof(strKvp.Value), strKvp.Value } };
 
             if (type.GetKeyValuePairTypes(out _, out var _))
             {
                 return new Dictionary<string, object> {
-                    { TypeProperties.Get(type).GetPublicGetter("Key")(obj).ConvertTo<string>(), TypeProperties.Get(type).GetPublicGetter("Value")(obj) },
+                    { "Key", TypeProperties.Get(type).GetPublicGetter("Key")(obj).ConvertTo<string>() },
+                    { "Value", TypeProperties.Get(type).GetPublicGetter("Value")(obj) },
                 };
             }
 

tests/ServiceStack.Text.Tests/AutoMappingTests.cs

@@ -1251,9 +1251,9 @@ public void Can_ToObjectDictionary_KVPs()
             var strKvp = new KeyValuePair<string, string>("A", "1");
             var intKvp = new KeyValuePair<string, int>("A", 1);
 
-            Assert.That(objKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"A", 1} }));
-            Assert.That(strKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"A", "1"} }));
-            Assert.That(intKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"A", 1} }));
+            Assert.That(objKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", 1  } } ));
+            Assert.That(strKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", "1"} } ));
+            Assert.That(intKvp.ToObjectDictionary(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", 1  } } ));
 
             var objKvp2 = new KeyValuePair<string, object>("B", 2);
             var strKvp2 = new KeyValuePair<string, string>("B", "2");
@@ -1271,9 +1271,9 @@ public void Can_convert_KVPs_to_ObjectDictionary()
             var strKvp = new KeyValuePair<string, string>("A", "1");
             var intKvp = new KeyValuePair<string, int>("A", 1);
 
-            Assert.That(objKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"A", 1} }));
-            Assert.That(strKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"A", "1"} }));
-            Assert.That(intKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"A", 1} }));
+            Assert.That(objKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", 1  } } ));
+            Assert.That(strKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", "1"} } ));
+            Assert.That(intKvp.ConvertTo<Dictionary<string,object>>(), Is.EquivalentTo(new Dictionary<string, object> { {"Key", "A" }, { "Value", 1  } } ));
 
             var objKvp2 = new KeyValuePair<string, object>("B", 2);
             var strKvp2 = new KeyValuePair<string, string>("B", "2");