Removing string literals and using BindingType enum

mathewc · mathewc · commit fe4bb7a60f7d · 2016-03-16T18:24:13.000-07:00
diff --git a/src/WebJobs.Script/Binding/BlobBinding.cs b/src/WebJobs.Script/Binding/BlobBinding.cs
@@ -7,14 +7,15 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
+using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
     public class BlobBinding : FunctionBinding
     {
         private readonly BindingTemplate _pathBindingTemplate;
 
-        public BlobBinding(ScriptHostConfiguration config, string name, string path, FileAccess access, bool isTrigger) : base(config, name, "blob", access, isTrigger)
+        public BlobBinding(ScriptHostConfiguration config, string name, string path, FileAccess access, bool isTrigger) : base(config, name, BindingType.Blob, access, isTrigger)
         {
             if (string.IsNullOrEmpty(path))
             {
diff --git a/src/WebJobs.Script/Binding/EasyTableBinding.cs b/src/WebJobs.Script/Binding/EasyTableBinding.cs
@@ -16,7 +16,7 @@ public class EasyTableBinding : FunctionBinding
         private readonly BindingDirection _bindingDirection;
 
         public EasyTableBinding(ScriptHostConfiguration config, string name, string tableName, string id, FileAccess access, BindingDirection direction) :
-            base(config, name, "easytable", access, false)
+            base(config, name, BindingType.EasyTable, access, false)
         {
             this.TableName = tableName;
             this.Id = id;
diff --git a/src/WebJobs.Script/Binding/EventHubBinding.cs b/src/WebJobs.Script/Binding/EventHubBinding.cs
@@ -7,6 +7,7 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
+using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
@@ -15,7 +16,7 @@ public class EventHubBinding : FunctionBinding
         private readonly BindingTemplate _eventHubNameBindingTemplate;
 
         public EventHubBinding(ScriptHostConfiguration config, string name, string eventHubName, FileAccess access, bool isTrigger) : 
-            base(config, name, "eventhub", access, isTrigger)
+            base(config, name, BindingType.EventHub, access, isTrigger)
         {
             if (string.IsNullOrEmpty(eventHubName))
             {
diff --git a/src/WebJobs.Script/Binding/FunctionBinding.cs b/src/WebJobs.Script/Binding/FunctionBinding.cs
@@ -17,7 +17,7 @@ public abstract class FunctionBinding
     {
         private readonly ScriptHostConfiguration _config;
 
-        protected FunctionBinding(ScriptHostConfiguration config, string name, string type, FileAccess access, bool isTrigger)
+        protected FunctionBinding(ScriptHostConfiguration config, string name, BindingType type, FileAccess access, bool isTrigger)
         {
             _config = config;
             Name = name;
@@ -28,7 +28,7 @@ protected FunctionBinding(ScriptHostConfiguration config, string name, string ty
 
         public string Name { get; private set; }
 
-        public string Type { get; private set; }
+        public BindingType Type { get; private set; }
 
         public bool IsTrigger { get; private set; }
 
diff --git a/src/WebJobs.Script/Binding/HttpBinding.cs b/src/WebJobs.Script/Binding/HttpBinding.cs
@@ -9,6 +9,7 @@
 using System.Net.Http.Headers;
 using System.Reflection.Emit;
 using System.Threading.Tasks;
+using Microsoft.Azure.WebJobs.Script.Description;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -18,7 +19,7 @@ public class HttpBinding : FunctionBinding, IResultProcessingBinding
     {
         internal const string HttpResponsePropertyKey = "MS_AzureFunctionsHttpResponse";
 
-        public HttpBinding(ScriptHostConfiguration config, string name, FileAccess access, bool isTrigger) : base(config, name, "http", access, isTrigger)
+        public HttpBinding(ScriptHostConfiguration config, string name, FileAccess access, bool isTrigger) : base(config, name, BindingType.Http, access, isTrigger)
         {
         }
 
diff --git a/src/WebJobs.Script/Binding/QueueBinding.cs b/src/WebJobs.Script/Binding/QueueBinding.cs
@@ -7,14 +7,15 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
+using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
     public class QueueBinding : FunctionBinding
     {
         private readonly BindingTemplate _queueNameBindingTemplate;
 
-        public QueueBinding(ScriptHostConfiguration config, string name, string queueName, FileAccess access, bool isTrigger) : base(config, name, "queue", access, isTrigger)
+        public QueueBinding(ScriptHostConfiguration config, string name, string queueName, FileAccess access, bool isTrigger) : base(config, name, BindingType.Queue, access, isTrigger)
         {
             if (string.IsNullOrEmpty(queueName))
             {
diff --git a/src/WebJobs.Script/Binding/ServiceBusBinding.cs b/src/WebJobs.Script/Binding/ServiceBusBinding.cs
@@ -7,14 +7,15 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
+using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Binding
 {
     public class ServiceBusBinding : FunctionBinding
     {
         private readonly BindingTemplate _queueOrTopicNameBindingTemplate;
 
-        public ServiceBusBinding(ScriptHostConfiguration config, string name, string queueOrTopicName, FileAccess access, bool isTrigger) : base(config, name, "serviceBus", access, isTrigger)
+        public ServiceBusBinding(ScriptHostConfiguration config, string name, string queueOrTopicName, FileAccess access, bool isTrigger) : base(config, name, BindingType.ServiceBus, access, isTrigger)
         {
             if (string.IsNullOrEmpty(queueOrTopicName))
             {
diff --git a/src/WebJobs.Script/Binding/TableBinding.cs b/src/WebJobs.Script/Binding/TableBinding.cs
@@ -7,6 +7,7 @@
 using System.Reflection.Emit;
 using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Host.Bindings.Path;
+using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
 using Newtonsoft.Json;
@@ -21,7 +22,8 @@ public class TableBinding : FunctionBinding
         private readonly BindingTemplate _rowKeyBindingTemplate;
         private readonly TableQuery _tableQuery;
 
-        public TableBinding(ScriptHostConfiguration config, string name, string tableName, string partitionKey, string rowKey, FileAccess access, TableQuery tableQuery = null) : base(config, name, "queue", access, false)
+        public TableBinding(ScriptHostConfiguration config, string name, string tableName, string partitionKey, string rowKey, FileAccess access, TableQuery tableQuery = null) 
+            : base(config, name, BindingType.Table, access, false)
         {
             if (string.IsNullOrEmpty(tableName))
             {
diff --git a/src/WebJobs.Script/Description/CSharp/CSharpFunctionInvoker.cs b/src/WebJobs.Script/Description/CSharp/CSharpFunctionInvoker.cs
@@ -346,7 +346,7 @@ private ImmutableArray<Diagnostic> ValidateFunctionBindingArguments(CSharpFuncti
 
             foreach (var binding in bindings)
             {
-                if (binding.Type == "http")
+                if (binding.Type == BindingType.Http)
                 {
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,15 @@`
`7`	`7`	`using System.Reflection.Emit;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using Microsoft.Azure.WebJobs.Host.Bindings.Path;`
	`10`	`+using Microsoft.Azure.WebJobs.Script.Description;`
`10`	`11`
`11`	`12`	`namespace Microsoft.Azure.WebJobs.Script.Binding`
`12`	`13`	`{`
`13`	`14`	`public class BlobBinding : FunctionBinding`
`14`	`15`	`{`
`15`	`16`	`private readonly BindingTemplate _pathBindingTemplate;`
`16`	`17`
`17`		`- public BlobBinding(ScriptHostConfiguration config, string name, string path, FileAccess access, bool isTrigger) : base(config, name, "blob", access, isTrigger)`
	`18`	`+ public BlobBinding(ScriptHostConfiguration config, string name, string path, FileAccess access, bool isTrigger) : base(config, name, BindingType.Blob, access, isTrigger)`
`18`	`19`	`{`
`19`	`20`	`if (string.IsNullOrEmpty(path))`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class EasyTableBinding : FunctionBinding`
`16`	`16`	`private readonly BindingDirection _bindingDirection;`
`17`	`17`
`18`	`18`	`public EasyTableBinding(ScriptHostConfiguration config, string name, string tableName, string id, FileAccess access, BindingDirection direction) :`
`19`		`- base(config, name, "easytable", access, false)`
	`19`	`+ base(config, name, BindingType.EasyTable, access, false)`
`20`	`20`	`{`
`21`	`21`	`this.TableName = tableName;`
`22`	`22`	`this.Id = id;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Reflection.Emit;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using Microsoft.Azure.WebJobs.Host.Bindings.Path;`
	`10`	`+using Microsoft.Azure.WebJobs.Script.Description;`
`10`	`11`
`11`	`12`	`namespace Microsoft.Azure.WebJobs.Script.Binding`
`12`	`13`	`{`
`@@ -15,7 +16,7 @@ public class EventHubBinding : FunctionBinding`
`15`	`16`	`private readonly BindingTemplate _eventHubNameBindingTemplate;`
`16`	`17`
`17`	`18`	`public EventHubBinding(ScriptHostConfiguration config, string name, string eventHubName, FileAccess access, bool isTrigger) :`
`18`		`- base(config, name, "eventhub", access, isTrigger)`
	`19`	`+ base(config, name, BindingType.EventHub, access, isTrigger)`
`19`	`20`	`{`
`20`	`21`	`if (string.IsNullOrEmpty(eventHubName))`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public abstract class FunctionBinding`
`17`	`17`	`{`
`18`	`18`	`private readonly ScriptHostConfiguration _config;`
`19`	`19`
`20`		`- protected FunctionBinding(ScriptHostConfiguration config, string name, string type, FileAccess access, bool isTrigger)`
	`20`	`+ protected FunctionBinding(ScriptHostConfiguration config, string name, BindingType type, FileAccess access, bool isTrigger)`
`21`	`21`	`{`
`22`	`22`	`_config = config;`
`23`	`23`	`Name = name;`
`@@ -28,7 +28,7 @@ protected FunctionBinding(ScriptHostConfiguration config, string name, string ty`
`28`	`28`
`29`	`29`	`public string Name { get; private set; }`
`30`	`30`
`31`		`- public string Type { get; private set; }`
	`31`	`+ public BindingType Type { get; private set; }`
`32`	`32`
`33`	`33`	`public bool IsTrigger { get; private set; }`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Net.Http.Headers;`
`10`	`10`	`using System.Reflection.Emit;`
`11`	`11`	`using System.Threading.Tasks;`
	`12`	`+using Microsoft.Azure.WebJobs.Script.Description;`
`12`	`13`	`using Newtonsoft.Json;`
`13`	`14`	`using Newtonsoft.Json.Linq;`
`14`	`15`
`@@ -18,7 +19,7 @@ public class HttpBinding : FunctionBinding, IResultProcessingBinding`
`18`	`19`	`{`
`19`	`20`	`internal const string HttpResponsePropertyKey = "MS_AzureFunctionsHttpResponse";`
`20`	`21`
`21`		`- public HttpBinding(ScriptHostConfiguration config, string name, FileAccess access, bool isTrigger) : base(config, name, "http", access, isTrigger)`
	`22`	`+ public HttpBinding(ScriptHostConfiguration config, string name, FileAccess access, bool isTrigger) : base(config, name, BindingType.Http, access, isTrigger)`
`22`	`23`	`{`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ private ImmutableArray<Diagnostic> ValidateFunctionBindingArguments(CSharpFuncti`
`346`	`346`
`347`	`347`	`foreach (var binding in bindings)`
`348`	`348`	`{`
`349`		`- if (binding.Type == "http")`
	`349`	`+ if (binding.Type == BindingType.Http)`
`350`	`350`	`{`
`351`	`351`	`continue;`
`352`	`352`	`}`