Minor cleanup in binding pipeline

Author: mathewc

src/WebJobs.Script/Binding/ExtensionBinding.cs

@@ -46,8 +46,6 @@ public override async Task BindAsync(BindingContext context)
         {
             context.Attributes = _attributes.ToArray();
 
-            object inputValue = null;
-
             if (_binding.DefaultType == typeof(IAsyncCollector<byte[]>))
             {
                 await BindAsyncCollectorAsync<byte[]>(context);
@@ -66,35 +64,16 @@ public override async Task BindAsync(BindingContext context)
             }
             else if (_binding.DefaultType == typeof(JObject))
             {
-                var result = await context.Binder.BindAsync<JObject>(_attributes.ToArray());
-                if (Access == FileAccess.Read)
-                {
-                    inputValue = result;
-                }
+                await BindJTokenAsync<JObject>(context, Access);
             }
             else if (_binding.DefaultType == typeof(JArray))
             {
-                JArray entityArray = await context.Binder.BindAsync<JArray>(_attributes.ToArray());
-                inputValue = entityArray;
+                await BindJTokenAsync<JArray>(context, Access);
             }
             else
             {
                 throw new NotSupportedException($"ScriptBinding type {_binding.DefaultType} is not supported");
             }
-
-            if (inputValue != null)
-            {
-                if (context.DataType == DataType.Stream)
-                {
-                    // In file-based scripting (like Python), arguments may need to be copied to the file system. 
-                    var inputStream = (Stream)context.Value;
-                    ConvertValueToStream(inputValue, inputStream);
-                }
-                else
-                {
-                    context.Value = inputValue;
-                }
-            }
         }
 
         internal static CustomAttributeBuilder GetAttributeBuilder(Attribute attribute)

src/WebJobs.Script/Binding/FunctionBinding.cs

@@ -187,6 +187,21 @@ internal static async Task BindAsyncCollectorAsync<T>(BindingContext context)
             }
         }
 
+        internal static async Task BindJTokenAsync<T>(BindingContext context, FileAccess access)
+        {
+            var result = await context.Binder.BindAsync<T>(context.Attributes);
+
+            if (access == FileAccess.Read)
+            {
+                if (context.DataType == DataType.Stream)
+                {
+                    ConvertValueToStream(result, (Stream)context.Value);
+                }
+
+                context.Value = result;
+            }
+        }
+
         internal static async Task BindStreamAsync(BindingContext context, FileAccess access)
         {
             Stream stream = await context.Binder.BindAsync<Stream>(context.Attributes);
@@ -233,22 +248,11 @@ public static void ConvertValueToStream(object value, Stream stream)
                 {
                     bytes = BitConverter.GetBytes((double)value);
                 }
-                else
+                else if (value is JToken)
                 {
-                    var jValue = value as JToken;
-                    if (jValue != null)
-                    {
-                        string json = jValue.ToString(Formatting.None);
-
-                        // Use StreamWriter to handle encoding. 
-                        // We're explicitly NOT disposing the StreamWriter because
-                        // we don't want to close the underlying Stream
-                        StreamWriter sw = new StreamWriter(stream);
-                        sw.Write(json);
-                        sw.Flush();
-
-                        return;
-                    }
+                    JToken jToken = (JToken)value;
+                    string json = jToken.ToString(Formatting.None);
+                    bytes = Encoding.UTF8.GetBytes(json);
                 }
 
                 using (valueStream = new MemoryStream(bytes))