Fixing BindingData conversion bug

Author: mathewc

src/WebJobs.Script.WebHost/Diagnostics/FastLogger.cs

@@ -4,10 +4,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Host.Loggers;
 using Microsoft.Azure.WebJobs.Logging;
-using Microsoft.Azure.WebJobs.Script;
 using Microsoft.WindowsAzure.Storage;
 using Newtonsoft.Json;
 

src/WebJobs.Script/Binding/Http/HttpTriggerAttributeBindingProvider.cs

@@ -201,14 +201,7 @@ internal static void ApplyBindingData(object target, IDictionary<string, object>
                         propertyHelper.Property.CanWrite)
                     {
                         object value = pair.Value;
-                        Type targetType = propertyHelper.Property.PropertyType;
-                        if (value != null && value.GetType() != targetType)
-                        {
-                            // if the type is nullable, we only need to convert to the
-                            // correct underlying type
-                            targetType = Nullable.GetUnderlyingType(targetType) ?? targetType;
-                            value = Convert.ChangeType(value, targetType);
-                        }
+                        value = ConvertValueIfNecessary(value, propertyHelper.Property.PropertyType);
                         propertyHelper.SetValue(target, value);
                     }
                 }
@@ -249,15 +242,10 @@ internal static async Task<IReadOnlyDictionary<string, object>> GetRequestBindin
                         // necessary conversion
                         value = pair.Value;
                         Type type = null;
-                        if (value != null && 
-                            bindingDataContract != null && 
-                            bindingDataContract.TryGetValue(pair.Key, out type) &&
-                            value.GetType() != type)
+                        if (bindingDataContract != null && 
+                            bindingDataContract.TryGetValue(pair.Key, out type))
                         {
-                            // if the type is nullable, we only need to convert to the
-                            // correct underlying type
-                            type = Nullable.GetUnderlyingType(type) ?? type;
-                            value = Convert.ChangeType(value, type);
+                            value = ConvertValueIfNecessary(value, type);
                         }
 
                         bindingData[pair.Key] = value;
@@ -290,6 +278,19 @@ private async Task<IValueProvider> CreateUserTypeValueProvider(HttpRequestMessag
                 return new SimpleValueProvider(_parameter.ParameterType, value, invokeString);
             }
 
+            private static object ConvertValueIfNecessary(object value, Type targetType)
+            {
+                if (value != null && !targetType.IsAssignableFrom(value.GetType()))
+                {
+                    // if the type is nullable, we only need to convert to the
+                    // correct underlying type
+                    targetType = Nullable.GetUnderlyingType(targetType) ?? targetType;
+                    value = Convert.ChangeType(value, targetType);
+                }
+
+                return value;
+            }
+
             /// <summary>
             /// ValueBinder for all our built in supported Types
             /// </summary>

test/WebJobs.Script.Tests/HttpTriggerBindingTests.cs

@@ -199,7 +199,7 @@ public async Task BindAsync_Poco_MergedBindingData()
             ValueBindingContext context = new ValueBindingContext(functionContext, CancellationToken.None);
             ITriggerData triggerData = await binding.BindAsync(request, context);
 
-            Assert.Equal(5, triggerData.BindingData.Count);
+            Assert.Equal(6, triggerData.BindingData.Count);
             Assert.Equal("Mathew Charles", triggerData.BindingData["Name"]);
             Assert.Equal("Seattle", triggerData.BindingData["Location"]);
             Assert.Equal("(425) 555-6666", triggerData.BindingData["Phone"]);
@@ -284,12 +284,19 @@ public async Task BindAsync_String()
         public static void ApplyBindingData_Succeeds()
         {
             TestPocoEx poco = new TestPocoEx();
+            Dictionary<string, string> properties = new Dictionary<string, string>
+            {
+                { "A", "123" },
+                { "B", "456" },
+                { "c", "789" }
+            };
             Dictionary<string, object> bindingData = new Dictionary<string, object>()
             {
                 { "name", "Ted" },
                 { "Location", "Seattle" },
                 { "Age", "25" },
-                { "Readonly", "Test" }
+                { "Readonly", "Test" },
+                { "Properties", properties }
             };
 
             HttpTriggerAttributeBindingProvider.HttpTriggerBinding.ApplyBindingData(poco, bindingData);
@@ -298,6 +305,11 @@ public static void ApplyBindingData_Succeeds()
             Assert.Equal("Seattle", poco.Location);
             Assert.Equal(25, poco.Age);  // verifies string was converted
             Assert.Null(poco.Readonly);
+            Assert.Equal(3, poco.Properties.Count);
+            foreach (var pair in properties)
+            {
+                Assert.Equal(pair.Value, poco.Properties[pair.Key]);
+            }
         }
 
         public void TestPocoFunction(TestPoco poco)

test/WebJobs.Script.Tests/PhpEndToEndTests.cs

@@ -1,7 +1,6 @@
 // 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.Threading.Tasks;
 using Microsoft.WindowsAzure.Storage.Blob;
 using Xunit;

test/WebJobs.Script.Tests/UtilityTests.cs

@@ -31,6 +31,8 @@ public class TestPocoEx : TestPoco
         public string Phone { get; set; }
 
         public string Readonly { get; }
+
+        public IDictionary<string, string> Properties { get; set; }
     }
 
     public class UtilityTests