fix optional parameter order issue.

Martin Daetz · Martin Daetz · commit b6c39589478f · 2015-01-23T10:39:11.000+01:00
diff --git a/AustinHarris.JsonRpcTest/UnitTest1.cs b/AustinHarris.JsonRpcTest/UnitTest1.cs
@@ -1320,6 +1320,18 @@ public void TestOptionalParametersStrings_BothExists()
             result.Wait();
             Assert.IsFalse(result.Result.Contains("error"));
             Assert.AreEqual(expectedResult, result.Result);
-        }
+        }
+        [TestMethod]
+        public void TestOptionalParametersBoolsAndStrings()
+        {
+            string request =
+                "{\"jsonrpc\":\"2.0\",\"method\":\"TestOptionalParametersBoolsAndStrings\",\"params\":{\"input1\":\"murkel\"},\"Id\":1}";
+            string expectedResult = "{\"jsonrpc\":\"2.0\",\"result\":true,\"id\":1}";
+
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+            Assert.IsFalse(result.Result.Contains("error"));
+            Assert.AreEqual(expectedResult, result.Result);
+        }
     }
 }
diff --git a/AustinHarris.JsonRpcTest/service.cs b/AustinHarris.JsonRpcTest/service.cs
@@ -291,7 +291,12 @@ private IList<string> TestOptionalParameters_Strings(string input1 = null, strin
                 input1,
                 input2
             };
-        }
+        }
+        [JsonRpcMethod]
+        public bool TestOptionalParametersBoolsAndStrings(string input1, bool input2 = true, string input3 = "")
+        {
+            return input2;
+        }
 
     }
 }
diff --git a/Json-Rpc/Handler.cs b/Json-Rpc/Handler.cs
@@ -266,28 +266,39 @@ public JsonResponse Handle(JsonRequest Rpc, Object RpcContext = null)
                     }
                     parameters[i] = CleanUpParameter(jo[metadata.parameters[i].Name], metadata.parameters[i]);
                 }
-            }
-
-            // Optional Parameter support
-            // check if we still miss parameters compared to metadata which may include optional parameters.
-            // if the rpc-call didn't supply a value for an optional parameter, we should be assinging the default value of it.
-            if (parameters.Length < metaDataParamCount && metadata.defaultValues.Length > 0) // rpc call didn't set values for all optional parameters, so we need to assign the default values for them.
-            {
-                var paramIndex = parameters.Length; // the index we should start storing default values of optional parameters.
-                var missingParamsCount = metaDataParamCount - parameters.Length; // the amount of optional parameters without a value set by rpc-call.
-                Array.Resize(ref parameters, parameters.Length + missingParamsCount); // resize the array to include all optional parameters.
-
-                // we need to add in reverse order as parameters can appear after all required parameters.
-                // as some of the optional parameters could already have assigned their values in rpc-call,
-                // by starting from the end we can make sure we only add the required default values.
-                for (int k = missingParamsCount; k > 0; k--)
-                {
-                    var optionalParamIndex = k - 1; // the index of the optional parameter we will be currently setting a default value.
-                    parameters[paramIndex] = metadata.defaultValues[optionalParamIndex].Value; // set the default value for the optional parameter that rpc-call didn't set a value for.
-                    paramIndex++;
-                    paramCount++; // we need to increase the paramCount by one each time we add default-value for an optional parameter that rpc-call didn't set a value for.
-                }
-            }
+            }
+
+            // Optional Parameter support
+            // check if we still miss parameters compared to metadata which may include optional parameters.
+            // if the rpc-call didn't supply a value for an optional parameter, we should be assinging the default value of it.
+            if (parameters.Length < metaDataParamCount && metadata.defaultValues.Length > 0) // rpc call didn't set values for all optional parameters, so we need to assign the default values for them.
+            {
+                var suppliedParamsCount = parameters.Length; // the index we should start storing default values of optional parameters.
+                var missingParamsCount = metaDataParamCount - parameters.Length; // the amount of optional parameters without a value set by rpc-call.
+                Array.Resize(ref parameters, parameters.Length + missingParamsCount); // resize the array to include all optional parameters.
+
+                for (int paramIndex = parameters.Length - 1, defaultIndex = metadata.defaultValues.Length - 1;     // fill missing parameters from the back 
+                    paramIndex >= suppliedParamsCount && defaultIndex >= 0;                                        // to don't overwrite supplied ones.
+                    paramIndex--, defaultIndex--)
+                {
+                    parameters[paramIndex] = metadata.defaultValues[defaultIndex].Value;
+                }
+
+                if (missingParamsCount > metadata.defaultValues.Length)
+                {
+                    return new JsonResponse
+                    {
+                        Error = ProcessException(Rpc,
+                            new JsonRpcException(-32602,
+                                "Invalid params",
+                                string.Format(
+                                    "Number of default parameters {0} not sufficient to fill all missing parameters {1}",
+                                    metadata.defaultValues.Length, missingParamsCount)
+                                )),
+                        Id = Rpc.Id
+                    };
+                }
+            }
             
             if (parameters.Length != metaDataParamCount)
             {

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,12 @@ private IList<string> TestOptionalParameters_Strings(string input1 = null, strin`
`291`	`291`	`input1,`
`292`	`292`	`input2`
`293`	`293`	`};`
`294`		`- }`
	`294`	`+ }`
	`295`	`+ [JsonRpcMethod]`
	`296`	`+ public bool TestOptionalParametersBoolsAndStrings(string input1, bool input2 = true, string input3 = "")`
	`297`	`+ {`
	`298`	`+ return input2;`
	`299`	`+ }`
`295`	`300`
`296`	`301`	`}`
`297`	`302`	`}`