Fix Merge Conflicts

Astn · Astn · commit f92ee3d57459 · 2016-11-05T23:18:11.000-06:00
diff --git a/Json-Rpc/Attributes.cs b/Json-Rpc/Attributes.cs
@@ -24,4 +24,27 @@ public string JsonMethodName
             get { return jsonMethodName; }
         }
     }
+
+    /// <summary>
+    /// Used to assign JsonRpc parameter name to method argument.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false, AllowMultiple = false)]
+    public sealed class JsonRpcParamAttribute : Attribute
+    {
+        readonly string jsonParamName;
+
+        /// <summary>
+        /// Used to assign JsonRpc parameter name to method argument.
+        /// </summary>
+        /// <param name="jsonParamName">Lets you specify the parameter name as it will be referred to by JsonRpc.</param>
+        public JsonRpcParamAttribute(string jsonParamName = "")
+        {
+            this.jsonParamName = jsonParamName;
+        }
+
+        public string JsonParamName
+        {
+            get { return jsonParamName; }
+        }
+    }
 }
diff --git a/Json-Rpc/ServiceBinder.cs b/Json-Rpc/ServiceBinder.cs
@@ -24,12 +24,26 @@ public static void bindService<T>(string sessionID, Func<T> serviceFactory)
                 List<Type> parameterTypeArray = new List<Type>();
                 for (int i = 0; i < paramzs.Length; i++)
                 {
+                    string paramName; 
+                    var paramAttrs = paramzs[i].GetCustomAttributes(typeof(JsonRpcParamAttribute), false); 
+                    if (paramAttrs.Length > 0) 
+                    { 
+                        paramName = ((JsonRpcParamAttribute)paramAttrs[0]).JsonParamName;
+                        if (string.IsNullOrEmpty(paramName))
+                        {
+                            paramName = paramzs[i].Name; 
+                        }
+                    } 
+                    else 
+                    { 
+                        paramName = paramzs[i].Name; 
+                    } 
                     // reflection attribute information for optional parameters
                     //http://stackoverflow.com/questions/2421994/invoking-methods-with-optional-parameters-through-reflection
-                    paras.Add(paramzs[i].Name, paramzs[i].ParameterType);
+                    paras.Add(paramName, paramzs[i].ParameterType);
 
                     if (paramzs[i].IsOptional) // if the parameter is an optional, add the default value to our default values dictionary.
-                        defaultValues.Add(paramzs[i].Name, paramzs[i].DefaultValue);
+                        defaultValues.Add(paramName, paramzs[i].DefaultValue);
                 }
 
                 var resType = meth.ReturnType;
@@ -44,6 +58,7 @@ public static void bindService<T>(string sessionID, Func<T> serviceFactory)
                     handlerSession.MetaData.AddService(methodName, paras, defaultValues, newDel);
                 }
             }
+
         }
         public static void bindService<T>(string sessionID) where T : new()
         {

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,26 @@ public static void bindService<T>(string sessionID, Func<T> serviceFactory)`
`24`	`24`	`List<Type> parameterTypeArray = new List<Type>();`
`25`	`25`	`for (int i = 0; i < paramzs.Length; i++)`
`26`	`26`	`{`
	`27`	`+ string paramName;`
	`28`	`+ var paramAttrs = paramzs[i].GetCustomAttributes(typeof(JsonRpcParamAttribute), false);`
	`29`	`+ if (paramAttrs.Length > 0)`
	`30`	`+ {`
	`31`	`+ paramName = ((JsonRpcParamAttribute)paramAttrs[0]).JsonParamName;`
	`32`	`+ if (string.IsNullOrEmpty(paramName))`
	`33`	`+ {`
	`34`	`+ paramName = paramzs[i].Name;`
	`35`	`+ }`
	`36`	`+ }`
	`37`	`+ else`
	`38`	`+ {`
	`39`	`+ paramName = paramzs[i].Name;`
	`40`	`+ }`
`27`	`41`	`// reflection attribute information for optional parameters`
`28`	`42`	`//http://stackoverflow.com/questions/2421994/invoking-methods-with-optional-parameters-through-reflection`
`29`		`- paras.Add(paramzs[i].Name, paramzs[i].ParameterType);`
	`43`	`+ paras.Add(paramName, paramzs[i].ParameterType);`
`30`	`44`
`31`	`45`	`if (paramzs[i].IsOptional) // if the parameter is an optional, add the default value to our default values dictionary.`
`32`		`- defaultValues.Add(paramzs[i].Name, paramzs[i].DefaultValue);`
	`46`	`+ defaultValues.Add(paramName, paramzs[i].DefaultValue);`
`33`	`47`	`}`
`34`	`48`
`35`	`49`	`var resType = meth.ReturnType;`
`@@ -44,6 +58,7 @@ public static void bindService<T>(string sessionID, Func<T> serviceFactory)`
`44`	`58`	`handlerSession.MetaData.AddService(methodName, paras, defaultValues, newDel);`
`45`	`59`	`}`
`46`	`60`	`}`
	`61`	`+`
`47`	`62`	`}`
`48`	`63`	`public static void bindService<T>(string sessionID) where T : new()`
`49`	`64`	`{`