Support for System.Text.Json in .NET Core 3 #85

improvements
manuc66 · Feb 24, 2020 · 29acba3 · 29acba3
1 parent a445fc1
commit 29acba3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/NewApi.Tests/BaseIsAnInterfaceTests.cs b/NewApi.Tests/BaseIsAnInterfaceTests.cs
@@ -52,7 +52,7 @@ public void ConcurrentThreadTest()
         public void UnknownMappingFails()
         {
             var exception = Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<IAnimal>("{\"Sound\":\"Scream\"}"));
-            Assert.AreEqual("Could not create an instance of type JsonSubTypes.Tests.BaseIsAnInterfaceTests+IAnimal. Type is an interface or abstract class and cannot be instantiated. Path 'Sound', line 1, position 9.", exception.Message);
+            Assert.AreEqual("Could not create an instance of type JsonSubTypes.Tests.BaseIsAnInterfaceTests+IAnimal. Type is an interface or abstract class and cannot be instantiated. Position: 0.", exception.Message);
         }
     }
 }
diff --git a/NewApi.Tests/DemoAlternativeTypePropertyNameTests.cs b/NewApi.Tests/DemoAlternativeTypePropertyNameTests.cs
@@ -85,7 +85,6 @@ public void DemoCaseInsensitive()
 
             public void DemoBaseWhenNull()
             {
-                Assert.Fail("Not ready");
                 var animal =
                     JsonSerializer.Deserialize<Animal>(
                         "{\"ClassName\": null,\"Color\":\"blue\"}");

diff --git a/NewApi.Tests/DiscriminatorOfDifferentKindTests.cs b/NewApi.Tests/DiscriminatorOfDifferentKindTests.cs
@@ -75,7 +75,6 @@ class Child2 : Child
             [Test]
             public void DiscriminatorValueCanBeANumber()
             {
-                Assert.Fail("Not ready");
                 var root1 = JsonSerializer.Deserialize<Parent>("{\"child\":{\"ChildType\":1}}");
                 var root2 = JsonSerializer.Deserialize<Parent>("{\"child\":{\"ChildType\":2}}");
                 var root3 = JsonSerializer.Deserialize<Parent>("{\"child\":{\"ChildType\":8}}");

diff --git a/NewApi.Tests/JsonSubTypesTests.cs b/NewApi.Tests/JsonSubTypesTests.cs
@@ -202,7 +202,6 @@ public void DeserializeBadDocument()
         [Test]
         public void WhenDiscriminatorValueIsNullDeserializeToBaseType()
         {
-            Assert.Fail("Not ready");
             var expected = new Root
             {
                 Content = new Base()

diff --git a/NewApi.Tests/TypePropertyCase.cs b/NewApi.Tests/TypePropertyCase.cs
@@ -24,7 +24,6 @@ class Foo : DtoBase
             [Test]
             public void FooParsingCamelCase()
             {
-                Assert.Fail("Not ready");
                 var serializeObject = "{\"MsgType\":1}";
                 var msgType = JsonSerializer.Deserialize<Foo>(serializeObject).MsgType;
                 Assert.AreEqual(1, msgType);
@@ -65,7 +64,6 @@ public void FooParsingCamelCase()
             [Test]
             public void FooParsingLowerPascalCase()
             {
-                Assert.Fail("Not ready");
                 var serializeObject = "{\"msgType\":1}";
                 Assert.AreEqual(1, JsonSerializer.Deserialize<Foo>(serializeObject).MsgType);
                 Assert.IsInstanceOf<Foo>(JsonSerializer.Deserialize<DtoBase>(serializeObject));
@@ -89,7 +87,6 @@ class Foo : DtoBase
             [Test]
             public void FooParsingCamelCase()
             {
-                Assert.Fail("Not ready");
                 var serializeObject = "{\"MessageType\":1}";
                 Assert.AreEqual(1, JsonSerializer.Deserialize<Foo>(serializeObject).MsgType);
                 Assert.IsInstanceOf<Foo>(JsonSerializer.Deserialize<DtoBase>(serializeObject));
@@ -129,7 +126,6 @@ public void FooParsingCamelCase()
             [Test]
             public void FooParsingLowerPascalCase()
             {
-                Assert.Fail("Not ready");
                 var serializeObject = "{\"messageType\":1}";
                 Assert.AreEqual(1, JsonSerializer.Deserialize<Foo>(serializeObject).MsgType);
                 Assert.IsInstanceOf<Foo>(JsonSerializer.Deserialize<DtoBase>(serializeObject));

diff --git a/NewApi/JsonSubtypes2.cs b/NewApi/JsonSubtypes2.cs
@@ -177,7 +177,7 @@ private T ReadObject(ref Utf8JsonReader reader, Type objectType, JsonSerializerO
             var targetType = GetType(jObject, objectType, serializer);
             if (targetType is null)
             {
-                throw new JsonException($"Unable to resolve a subtype of {objectType.Name}");
+                throw new JsonException($"Could not create an instance of type {objectType.FullName}. Type is an interface or abstract class and cannot be instantiated. Position: {reader.Position.GetInteger()}.");
             }
 
             return (T)JsonSerializer.Deserialize(ref readerAtStart, targetType, serializer);
@@ -203,11 +203,16 @@ private Type GetType(JsonDocument jObject, Type parentType, JsonSerializerOption
             Type targetType = parentType;
             IJsonSubtypes lastTypeResolver = null;
             IJsonSubtypes currentTypeResolver = GetTypeResolver(ToTypeInfo(targetType), serializer.Converters.OfType<IJsonSubtypes>());
+            var visitedTypes = new HashSet<Type> { targetType };
 
             var jsonConverterCollection = serializer.Converters.OfType<IJsonSubtypes>().ToList();
             while (currentTypeResolver != null && currentTypeResolver != lastTypeResolver)
             {
                 targetType = currentTypeResolver.GetType(jObject, targetType);
+                if (!visitedTypes.Add(targetType))
+                {
+                    break;
+                }
                 lastTypeResolver = currentTypeResolver;
                 jsonConverterCollection = jsonConverterCollection.Where(c => c != currentTypeResolver).ToList();
                 currentTypeResolver = GetTypeResolver(ToTypeInfo(targetType), jsonConverterCollection);
@@ -224,7 +229,7 @@ private IJsonSubtypes GetTypeResolver(TypeInfo targetType, IEnumerable<IJsonSubt
             }
 
             var jsonConverterAttribute = GetAttribute<JsonSubTypeConverterAttribute>(targetType);
-            if (jsonConverterAttribute != null && ToTypeInfo(typeof(JsonSubtypes<T>)).IsAssignableFrom(ToTypeInfo(jsonConverterAttribute.ConverterType)))
+            if (jsonConverterAttribute != null && ToTypeInfo(typeof(T)).IsAssignableFrom(ToTypeInfo(jsonConverterAttribute.ConverterType.GenericTypeArguments[0])))
             {
                 return (JsonSubtypes<T>)Activator.CreateInstance(jsonConverterAttribute.ConverterType, jsonConverterAttribute.DiscriminatorPropertyName);
             }