Removing custom DictionaryJsonConverter

Author: mathewc

src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Dynamic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -25,7 +26,6 @@ public class NodeFunctionInvoker : FunctionInvokerBase
         private readonly Collection<FunctionBinding> _inputBindings;
         private readonly Collection<FunctionBinding> _outputBindings;
         private readonly string _script;
-        private static readonly DictionaryJsonConverter _dictionaryJsonConverter = new DictionaryJsonConverter();
         private readonly BindingMetadata _trigger;
         private readonly string _entryPoint;
 
@@ -536,16 +536,16 @@ private static bool TryDeserializeJsonObjectOrArray(string json, out object resu
             result = null;
 
             // if the input is json, try converting to an object or array
-            Dictionary<string, object> jsonObject;
-            Dictionary<string, object>[] jsonObjectArray;
-            if (TryDeserializeJson(json, out jsonObject))
+            ExpandoObject obj;
+            ExpandoObject[] objArray;
+            if (TryDeserializeJson(json, out obj))
             {
-                result = jsonObject;
+                result = obj;
                 return true;
             }
-            else if (TryDeserializeJson(json, out jsonObjectArray))
+            else if (TryDeserializeJson(json, out objArray))
             {
-                result = jsonObjectArray;
+                result = objArray;
                 return true;
             }
 
@@ -558,7 +558,7 @@ private static bool TryDeserializeJson<TResult>(string json, out TResult result)
 
             try
             {
-                result = JsonConvert.DeserializeObject<TResult>(json, _dictionaryJsonConverter);
+                result = JsonConvert.DeserializeObject<TResult>(json);
                 return true;
             }
             catch

src/WebJobs.Script/DictionaryJsonConverter.cs

@@ -428,7 +428,6 @@
     <Compile Include="Description\Script\ScriptFunctionInvoker.cs" />
     <Compile Include="Description\Node\NodeFunctionDescriptorProvider.cs" />
     <Compile Include="Description\Node\NodeFunctionInvoker.cs" />
-    <Compile Include="DictionaryJsonConverter.cs" />
     <Compile Include="Extensions\ActionExtensions.cs" />
     <Compile Include="Diagnostics\FileTraceWriter.cs" />
     <Compile Include="Host\ScriptHostState.cs" />

src/WebJobs.Script/WebJobs.Script.csproj

@@ -1,11 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
-using System.Dynamic;
-using System.Threading.Tasks;
+using System.Linq;
 using Microsoft.Azure.WebJobs.Script.Description;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
@@ -27,14 +26,43 @@ public void TryConvertJson_ArrayOfJsonObjectStrings()
             Assert.True(didConvert);
 
             object[] objects = result as object[];
-            Dictionary<string, object> obj = (Dictionary<string, object>)objects[0];
+            IDictionary<string, object> obj = (IDictionary<string, object>)objects[0];
             Assert.Equal("Larry", obj["name"]);
 
-            obj = (Dictionary<string, object>)objects[1];
+            obj = (IDictionary<string, object>)objects[1];
             Assert.Equal("Moe", obj["name"]);
 
-            obj = (Dictionary<string, object>)objects[2];
+            obj = (IDictionary<string, object>)objects[2];
             Assert.Equal("Curly", obj["name"]);
         }
+
+        [Fact]
+        public void TryConvertJson_JsonObjectString()
+        {
+            JObject child = new JObject
+            {
+                { "Name", "Mary" },
+                { "Location", "Seattle" },
+                { "Age", 5 }
+            };
+
+            JObject parent = new JObject
+            {
+                { "Name", "Bob" },
+                { "Location", "Seattle" },
+                { "Age", 40 },
+                { "Children", new JArray(child) }
+            };
+
+            object result;
+            string input = parent.ToString();
+            bool didConvert = NodeFunctionInvoker.TryConvertJson(input, out result);
+            Assert.True(didConvert);
+
+            var resultDictionary = (IDictionary<string, object>)result;
+            var resultChildren = (IEnumerable<object>)resultDictionary["Children"];
+            var resultChild = (IDictionary<string, object>)resultChildren.ElementAt(0);
+            Assert.Equal(5, (long)resultChild["Age"]);
+        }
     }
 }