Merge pull request Astn#62 from artnim/master

Astn · Astn · commit 8d8ea8261bb7 · 2016-05-16T09:37:12.000-06:00
Proper handle nested, recursive types for parameters and returns.
diff --git a/AustinHarris.JsonRpcTestN/Test.cs b/AustinHarris.JsonRpcTestN/Test.cs
@@ -1862,6 +1862,16 @@ public void TestExtraParameters()
             Assert.IsTrue(result.Result.Contains("\"code\":-32602"));
         }
 
+        [Test]
+        public void TestNestedReturnType()
+        {
+            var request = @"{""jsonrpc"":""2.0"",""method"":""TestNestedReturnType"",""id"":1}";
+            var expected = @"{""jsonrpc"":""2.0"",""result"":{""NodeId"":1,""Leafs"":[{""NodeId"":2,""Leafs"":[]},{""NodeId"":3,""Leafs"":[]}]},""id"":1}";
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+            Assert.AreEqual(expected, result.Result);
+        }
+
         private static void AssertJsonAreEqual(string expectedJson, string actualJson)
         {
             Newtonsoft.Json.Linq.JObject expected = (Newtonsoft.Json.Linq.JObject)Newtonsoft.Json.JsonConvert.DeserializeObject(expectedJson);
diff --git a/AustinHarris.JsonRpcTestN/service.cs b/AustinHarris.JsonRpcTestN/service.cs
@@ -7,6 +7,13 @@
 
 namespace AustinHarris.JsonRpcTestN
 {
+    public class TreeNode
+    {
+        public int NodeId { get; set; }
+
+        public IList<TreeNode> Leafs { get; set; }
+    }
+
     public class CalculatorService : JsonRpcService
     {
         [JsonRpcMethod]
@@ -354,5 +361,21 @@ public string TestPostProcessorSetsException(string inputValue)
             JsonRpcContext.SetException(new JsonRpcException(-27001, "This exception was thrown using: JsonRpcContext.SetException()", null));
             return null;
         }
+
+        [JsonRpcMethod]
+        public TreeNode TestNestedReturnType()
+        {
+            return new TreeNode
+            {
+                NodeId = 1,
+                Leafs =
+                    new[]
+                    {
+                        new TreeNode {NodeId = 2, Leafs = new List<TreeNode>()},
+                        new TreeNode {NodeId = 3, Leafs = new List<TreeNode>()}
+                    }
+            };
+        }
+
     }
 }
diff --git a/Json-Rpc/SMDService.cs b/Json-Rpc/SMDService.cs
@@ -42,19 +42,24 @@ public void AddService(string method, Dictionary<string,Type> parameters, Dictio
 
         public static int AddType(JObject jo)
         {
-            var hash = "t_" + jo.ToString().GetHashCode();
+            var hash = string.Format("t_{0}", jo.ToString().GetHashCode());
+            
             lock (TypeHashes)
-            {                
-                var idx = 0;
-                if (TypeHashes.Contains(hash) == false)
-                {
-                    TypeHashes.Add(hash);
-                    idx = TypeHashes.IndexOf(hash);                    
-                    Types.Add(idx, jo);
-                }
+            {
+                if (TypeHashes.Contains(hash)) return TypeHashes.IndexOf(hash);
+                
+                TypeHashes.Add(hash);
+                var idx = TypeHashes.IndexOf(hash);                    
+                Types.Add(idx, jo);
             }
+
             return TypeHashes.IndexOf(hash); 
         }
+
+        public static bool ContainsType(JObject jo)
+        {
+            return TypeHashes.Contains(string.Format("t_{0}", jo.ToString().GetHashCode()));
+        }
     }
 
     public class SMDService
@@ -163,11 +168,14 @@ internal static int GetTypeRecursive(Type t)
         {
             JObject jo = new JObject();
             jo.Add("__name", t.Name.ToLower());
-            if (isSimpleType(t))
+
+            if (isSimpleType(t) || SMD.ContainsType(jo))
             {                
                 return SMD.AddType(jo);
             }
 
+            var retVal = SMD.AddType(jo);
+
             var genArgs = t.GetGenericArguments();
             PropertyInfo[] properties = t.GetProperties();
             FieldInfo[] fields = t.GetFields();
@@ -225,7 +233,7 @@ internal static int GetTypeRecursive(Type t)
                 }
             }
 
-            return SMD.AddType(jo);
+            return retVal;
         }
 
         internal static bool isSimpleType(Type t)

Original file line number	Diff line number	Diff line change
`@@ -42,19 +42,24 @@ public void AddService(string method, Dictionary<string,Type> parameters, Dictio`
`42`	`42`
`43`	`43`	`public static int AddType(JObject jo)`
`44`	`44`	`{`
`45`		`- var hash = "t_" + jo.ToString().GetHashCode();`
	`45`	`+ var hash = string.Format("t_{0}", jo.ToString().GetHashCode());`
	`46`	`+`
`46`	`47`	`lock (TypeHashes)`
`47`		`- {`
`48`		`- var idx = 0;`
`49`		`- if (TypeHashes.Contains(hash) == false)`
`50`		`- {`
`51`		`- TypeHashes.Add(hash);`
`52`		`- idx = TypeHashes.IndexOf(hash);`
`53`		`- Types.Add(idx, jo);`
`54`		`- }`
	`48`	`+ {`
	`49`	`+ if (TypeHashes.Contains(hash)) return TypeHashes.IndexOf(hash);`
	`50`	`+`
	`51`	`+ TypeHashes.Add(hash);`
	`52`	`+ var idx = TypeHashes.IndexOf(hash);`
	`53`	`+ Types.Add(idx, jo);`
`55`	`54`	`}`
	`55`	`+`
`56`	`56`	`return TypeHashes.IndexOf(hash);`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+ public static bool ContainsType(JObject jo)`
	`60`	`+ {`
	`61`	`+ return TypeHashes.Contains(string.Format("t_{0}", jo.ToString().GetHashCode()));`
	`62`	`+ }`
`58`	`63`	`}`
`59`	`64`
`60`	`65`	`public class SMDService`
`@@ -163,11 +168,14 @@ internal static int GetTypeRecursive(Type t)`
`163`	`168`	`{`
`164`	`169`	`JObject jo = new JObject();`
`165`	`170`	`jo.Add("__name", t.Name.ToLower());`
`166`		`- if (isSimpleType(t))`
	`171`	`+`
	`172`	`+ if (isSimpleType(t) \|\| SMD.ContainsType(jo))`
`167`	`173`	`{`
`168`	`174`	`return SMD.AddType(jo);`
`169`	`175`	`}`
`170`	`176`
	`177`	`+ var retVal = SMD.AddType(jo);`
	`178`	`+`
`171`	`179`	`var genArgs = t.GetGenericArguments();`
`172`	`180`	`PropertyInfo[] properties = t.GetProperties();`
`173`	`181`	`FieldInfo[] fields = t.GetFields();`
`@@ -225,7 +233,7 @@ internal static int GetTypeRecursive(Type t)`
`225`	`233`	`}`
`226`	`234`	`}`
`227`	`235`
`228`		`- return SMD.AddType(jo);`
	`236`	`+ return retVal;`
`229`	`237`	`}`
`230`	`238`
`231`	`239`	`internal static bool isSimpleType(Type t)`