Merge 137e7a1 into af1cb6f

net-daemon · Dec 23, 2020 · 945ba55 · 945ba55
2 parents af1cb6f + 137e7a1
commit 945ba55
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/JsonElementExtensions.cs b/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/JsonElementExtensions.cs
@@ -6,7 +6,7 @@ namespace NetDaemon.Infrastructure.Extensions
 {
     internal static class JsonElementExtensions
     {
-        public static object? ToDynamicValue(this JsonElement elem)
+        public static object? ConvertToDynamicValue(this JsonElement elem)
         {
             switch (elem.ValueKind)
             {
@@ -31,7 +31,7 @@ internal static class JsonElementExtensions
                     var list = new List<object?>();
                     foreach (var val in elem.EnumerateArray())
                     {
-                        list.Add(val.ToDynamicValue());
+                        list.Add(val.ConvertToDynamicValue());
                     }
                     return (IEnumerable<object?>)list;
 
@@ -40,7 +40,7 @@ internal static class JsonElementExtensions
 
                     foreach (var prop in elem.EnumerateObject())
                     {
-                        obj[prop.Name] = prop.Value.ToDynamicValue();
+                        obj[prop.Name] = prop.Value.ConvertToDynamicValue();
                     }
                     return (IDictionary<string, object?>)obj;
             }

diff --git a/src/Daemon/NetDaemon.Daemon/Mapping/EntityStateMapper.cs b/src/Daemon/NetDaemon.Daemon/Mapping/EntityStateMapper.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using JoySoftware.HomeAssistant.Client;
+using NetDaemon.Infrastructure.Extensions;
 using NetDaemon.Common;
 
 namespace NetDaemon.Mapping
@@ -45,7 +46,7 @@ private static void MapAttributes(EntityState entityState, HassState hassState)
             {
                 if (value is JsonElement elem)
                 {
-                    var dynValue = elem.ToDynamicValue();
+                    var dynValue = elem.ConvertToDynamicValue();
 
                     if (dynValue != null)
                         dict[key] = dynValue;

diff --git a/tests/NetDaemon.Daemon.Tests/Daemon/ExtensionMethodsTests.cs b/tests/NetDaemon.Daemon.Tests/Daemon/ExtensionMethodsTests.cs
@@ -19,7 +19,7 @@ public void JsonElementToDynamicValueWhenStringShouldReturnString()
             var prop = doc.RootElement.GetProperty("str");
 
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
 
             // ASSERT
             Assert.IsType<string>(obj);
@@ -34,7 +34,7 @@ public void JsonElementToDynamicValueWhenTrueShouldReturnBoolTrue()
             var prop = doc.RootElement.GetProperty("bool");
 
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
 
             // ASSERT
             Assert.IsType<bool>(obj);
@@ -49,7 +49,7 @@ public void JsonElementToDynamicValueWhenFalseShouldReturnBoolFalse()
             var prop = doc.RootElement.GetProperty("bool");
 
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
 
             // ASSERT
             Assert.IsType<bool>(obj);
@@ -64,7 +64,7 @@ public void JsonElementToDynamicValueWhenIntegerShouldReturnInteger()
             var prop = doc.RootElement.GetProperty("int");
             long expectedValue = 10;
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
 
             // ASSERT
             Assert.IsType<long>(obj);
@@ -79,7 +79,7 @@ public void JsonElementToDynamicValueWhenDoubleShouldReturnDouble()
             var prop = doc.RootElement.GetProperty("int");
             double expectedValue = 10.5;
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
 
             // ASSERT
             Assert.IsType<double>(obj);
@@ -94,7 +94,7 @@ public void JsonElementToDynamicValueWhenArrayShouldReturnArray()
             var prop = doc.RootElement.GetProperty("array");
 
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(prop);
+            var obj = JsonElementExtensions.ConvertToDynamicValue(prop);
             var arr = obj as IEnumerable<object?>;
 
             // ASSERT
@@ -109,7 +109,7 @@ public void JsonElementToDynamicValueWhenObjectShouldReturnObject()
             var doc = JsonDocument.Parse("{\"str\": \"string\"}");
 
             // ACT
-            var obj = JsonElementExtensions.ToDynamicValue(doc.RootElement) as IDictionary<string, object?>;
+            var obj = JsonElementExtensions.ConvertToDynamicValue(doc.RootElement) as IDictionary<string, object?>;
 
             // ASSERT
             Assert.Equal("string", obj?["str"]);