Merge pull request #152 from manuc66/feature/fix_SetFallbackSubtype

manuc66 · web-flow · commit 62d53de246fa · 2022-09-10T23:32:50.000+02:00
Fix call SetFallbackSubtype<T>() #147
diff --git a/JsonSubTypes.Tests/DynamicRegisterTests.cs b/JsonSubTypes.Tests/DynamicRegisterTests.cs
@@ -384,6 +384,23 @@ public void TestFallBack()
             Assert.AreEqual("False", (expr as UnknownExpression)?.Type);
         }
 
+        [Test]
+        public void TestFallBackGeneric()
+        {
+            var settings = new JsonSerializerSettings();
+            JsonConvert.DefaultSettings = () => settings;
+
+            settings.Converters.Add(JsonSubtypesConverterBuilder
+                .Of(typeof(IExpression), "Type")
+                .SetFallbackSubtype<UnknownExpression>()
+                .RegisterSubtype(typeof(ConstantExpression), "Constant")
+                .Build());
+
+            var expr = JsonConvert.DeserializeObject<IExpression>("{\"Type\": \"False\"}");
+
+            Assert.AreEqual("False", (expr as UnknownExpression)?.Type);
+        }
+
         [Test]
         public void TestFallBackWithNullRegistered()
         {
diff --git a/JsonSubTypes/JsonSubtypesConverterBuilder.cs b/JsonSubTypes/JsonSubtypesConverterBuilder.cs
@@ -78,9 +78,9 @@ public JsonSubtypesConverterBuilder SetFallbackSubtype(Type fallbackSubtype)
             return this;
         }
 
-        public JsonSubtypesConverterBuilder SetFallbackSubtype<T>(object value)
+        public JsonSubtypesConverterBuilder SetFallbackSubtype<T>()
         {
-            return RegisterSubtype(typeof(T), value);
+            return SetFallbackSubtype(typeof(T));
         }
 
         public JsonConverter Build()

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ public JsonSubtypesConverterBuilder SetFallbackSubtype(Type fallbackSubtype)`
`78`	`78`	`return this;`
`79`	`79`	`}`
`80`	`80`
`81`		`- public JsonSubtypesConverterBuilder SetFallbackSubtype<T>(object value)`
	`81`	`+ public JsonSubtypesConverterBuilder SetFallbackSubtype<T>()`
`82`	`82`	`{`
`83`		`- return RegisterSubtype(typeof(T), value);`
	`83`	`+ return SetFallbackSubtype(typeof(T));`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public JsonConverter Build()`