Bring void function result handling in line with the jsonrpc 2.0 spec. Result must be present on success.

Astn · Astn · commit d7fcde2b5185 · 2016-11-06T14:44:33.000-07:00
diff --git a/AustinHarris.JsonRpcTestN/Test.cs b/AustinHarris.JsonRpcTestN/Test.cs
@@ -140,7 +140,7 @@ public void NullableFloatToNullableFloat3()
         public void NullableFloatToNullableFloat2()
         {
             string request = @"{method:'NullableFloatToNullableFloat',params:[null],id:1}";
-            string expectedResult = "{\"jsonrpc\":\"2.0\",\"id\":1}";
+            string expectedResult = "{\"jsonrpc\":\"2.0\",\"result\":null,\"id\":1}";
             var result = JsonRpcProcessor.Process(request);
             result.Wait();
             Assert.AreEqual(result.Result, expectedResult);
@@ -1437,6 +1437,17 @@ public void TestEmptyBatchResult()
             Assert.IsTrue(string.IsNullOrEmpty(result.Result));
         }
 
+
+        [Test()]
+        public void TestNotificationVoidResult()
+        {
+            var secondRequest = @"{""jsonrpc"":""2.0"",""method"":""Notify"",""params"":[""Hello World!""], ""id"":73}";
+            var result = JsonRpcProcessor.Process(secondRequest);
+            result.Wait();
+            Console.WriteLine(result.Result);
+            Assert.IsTrue(result.Result.Contains("result"), "Json Rpc 2.0 Spec - 'result' - This member is REQUIRED on success. A function that returns void should have the result property included even though the value may be null.");
+        }
+
         [Test()]
         public void TestLeftOutParams()
         {
diff --git a/Json-Rpc/JsonRpcProcessor.cs b/Json-Rpc/JsonRpcProcessor.cs
@@ -209,6 +209,14 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
                 var idx = 0;
                 foreach (var resp in batch.Where(x => x.Item2.Id != null || x.Item2.Error != null))
                 {
+                    if (resp.Item2.Result == null && resp.Item2.Error == null)
+                    {
+                        // Per json rpc 2.0 spec
+                        // result : This member is REQUIRED on success.
+                        // This member MUST NOT exist if there was an error invoking the method.    
+                        // Either the result member or error member MUST be included, but both members MUST NOT be included.
+                        resp.Item2.Result = new Newtonsoft.Json.Linq.JValue((Object)null);
+                    }
                     responses[idx++] = JsonConvert.SerializeObject(resp.Item2);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,14 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j`
`209`	`209`	`var idx = 0;`
`210`	`210`	`foreach (var resp in batch.Where(x => x.Item2.Id != null \|\| x.Item2.Error != null))`
`211`	`211`	`{`
	`212`	`+ if (resp.Item2.Result == null && resp.Item2.Error == null)`
	`213`	`+ {`
	`214`	`+ // Per json rpc 2.0 spec`
	`215`	`+ // result : This member is REQUIRED on success.`
	`216`	`+ // This member MUST NOT exist if there was an error invoking the method.`
	`217`	`+ // Either the result member or error member MUST be included, but both members MUST NOT be included.`
	`218`	`+ resp.Item2.Result = new Newtonsoft.Json.Linq.JValue((Object)null);`
	`219`	`+ }`
`212`	`220`	`responses[idx++] = JsonConvert.SerializeObject(resp.Item2);`
`213`	`221`	`}`
`214`	`222`