Fix Dictionary deserialization when TKey is Uri

mbdavid · Apr 15, 2020 · 4fe3afc · 4fe3afc · lbnascimento · Apr 15, 2020
1 parent b79a856
commit 4fe3afc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/LiteDB.Tests/Mapper/Dictionary_Tests.cs b/LiteDB.Tests/Mapper/Dictionary_Tests.cs
@@ -69,5 +69,17 @@ public void Serialize_Hashtable()
             Assert.Single(result);
             Assert.Equal(1, result["x"].AsInt32);
         }
+
+        [Fact]
+        public void Deserialize_Uri()
+        {
+            var dict = new Dictionary<Uri, string>();
+            dict.Add(new Uri("http://www.litedb.org/"), "LiteDB website");
+            var doc = _mapper.Serialize(dict).AsDocument;
+            var dict2 = _mapper.Deserialize<Dictionary<Uri, string>>(doc);
+
+            Assert.Single(dict2);
+            Assert.Equal(dict.Keys.Single(), dict2.Keys.Single());
+        }
     }
 }
diff --git a/LiteDB/Client/Mapper/BsonMapper.Deserialize.cs b/LiteDB/Client/Mapper/BsonMapper.Deserialize.cs
@@ -259,7 +259,7 @@ private void DeserializeDictionary(Type K, Type T, IDictionary dict, BsonDocumen
             var isKEnum = K.GetTypeInfo().IsEnum;
             foreach (var el in value.GetElements())
             {
-                var k = isKEnum ? Enum.Parse(K, el.Key) : Convert.ChangeType(el.Key, K);
+                var k = isKEnum ? Enum.Parse(K, el.Key) : K == typeof(Uri) ? new Uri(el.Key) : Convert.ChangeType(el.Key, K);
                 var v = this.Deserialize(T, el.Value);
 
                 dict.Add(k, v);