[System.Text.Json]Improve error output for unsupported scenarios in S…

…ystem.Text.Json.Serialization (dotnet/corefx#38061) * custom exception for parameterless constructors * add polymorphic interface exception * fix ReflectionMaterializer * address PR feedback Commit migrated from dotnet/corefx@792eb85
picenka21 · May 31, 2019 · fea784e · fea784e
1 parent 270f8f8
commit fea784e
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 1 deletion.
diff --git a/src/libraries/System.Text.Json/src/Resources/Strings.resx b/src/libraries/System.Text.Json/src/Resources/Strings.resx
@@ -371,4 +371,10 @@
   <data name="JsonSerializerDoesNotSupportComments" xml:space="preserve">
     <value>Comments cannot be stored when deserializing objects, only the Skip and Disallow comment handling modes are supported.</value>
   </data>
+  <data name="DeserializeMissingParameterlessConstructor" xml:space="preserve">
+    <value>Deserialization of reference types without parameterless constructor is not supported. Type '{0}'</value>
+  </data>
+  <data name="DeserializePolymorphicInterface" xml:space="preserve">
+    <value>Deserialization of interface types is not supported. Type '{0}'</value>
+  </data>
 </root>
diff --git a/...s/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.HandleObject.cs b/...s/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializer.Read.HandleObject.cs
@@ -28,6 +28,19 @@ private static void HandleStartObject(JsonSerializerOptions options, ref Utf8Jso
             }
 
             JsonClassInfo classInfo = state.Current.JsonClassInfo;
+
+            if (classInfo.CreateObject is null && classInfo.ClassType == ClassType.Object)
+            {
+                if (classInfo.Type.IsInterface)
+                {
+                    ThrowHelper.ThrowInvalidOperationException_DeserializePolymorphicInterface(classInfo.Type);
+                }
+                else
+                {
+                    ThrowHelper.ThrowInvalidOperationException_DeserializeMissingParameterlessConstructor(classInfo.Type);
+                }
+            }
+
             state.Current.ReturnValue = classInfo.CreateObject();
         }
 

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMaterializer.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMaterializer.cs
@@ -12,6 +12,14 @@ internal sealed class ReflectionMaterializer : ClassMaterializer
     {
         public override JsonClassInfo.ConstructorDelegate CreateConstructor(Type type)
         {
+            Debug.Assert(type != null);
+            ConstructorInfo realMethod = type.GetConstructor(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, binder: null, Type.EmptyTypes, modifiers: null);
+
+            if (realMethod == null && !type.IsValueType)
+            {
+                return null;
+            }
+
             return () => Activator.CreateInstance(type);
         }
 

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.Serialization.cs b/src/libraries/System.Text.Json/src/System/Text/Json/ThrowHelper.Serialization.cs
@@ -122,5 +122,17 @@ public static void ThrowInvalidOperationException_SerializationDataExtensionProp
         {
             throw new InvalidOperationException(SR.Format(SR.SerializationDataExtensionPropertyInvalidElement, jsonClassInfo.Type, jsonClassInfo.DataExtensionProperty.PropertyInfo.Name, invalidType));
         }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void ThrowInvalidOperationException_DeserializeMissingParameterlessConstructor(Type invalidType)
+        {
+            throw new NotSupportedException(SR.Format(SR.DeserializeMissingParameterlessConstructor, invalidType));
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void ThrowInvalidOperationException_DeserializePolymorphicInterface(Type invalidType)
+        {
+            throw new NotSupportedException(SR.Format(SR.DeserializePolymorphicInterface, invalidType));
+        }
     }
 }
diff --git a/src/libraries/System.Text.Json/tests/Serialization/Object.ReadTests.cs b/src/libraries/System.Text.Json/tests/Serialization/Object.ReadTests.cs
@@ -160,6 +160,25 @@ public static void ReadObjectFail()
             Assert.Throws<JsonException>(() => JsonSerializer.Parse<object>("null."));
         }
 
+        [Fact]
+        public static void ReadObjectFail_ReferenceTypeMissingParameterlessConstructor()
+        {
+            Assert.Throws<NotSupportedException>(() => JsonSerializer.Parse<PublicParameterizedConstructorTestClass>(@"{""Name"":""Name!""}"));
+        }
+
+        class PublicParameterizedConstructorTestClass
+        {
+            private readonly string _name;
+            public PublicParameterizedConstructorTestClass(string name)
+            {
+                _name = name;
+            }
+            public string Name
+            {
+                get { return _name; }
+            }
+        }
+
         [Fact]
         public static void ParseUntyped()
         {

diff --git a/src/libraries/System.Text.Json/tests/Serialization/PolymorphicTests.cs b/src/libraries/System.Text.Json/tests/Serialization/PolymorphicTests.cs
@@ -386,6 +386,28 @@ public static void StaticAnalysisWithRelationship()
             Assert.Equal(typeof(UsaCustomer), deserializedCustomer.GetType());
             Assert.Equal(typeof(Address), deserializedCustomer.Address.GetType());
             ((Customer)deserializedCustomer).VerifyNonVirtual();
-       }
+        }
+
+        [Fact]
+        public static void PolymorphicInterface_NotSupported()
+        {
+            Assert.Throws<NotSupportedException>(() => JsonSerializer.Parse<MyClass>(@"{ ""Value"": ""A value"", ""Thing"": { ""Number"": 123 } }"));
+        }
+
+        class MyClass
+        {
+            public string Value { get; set; }
+            public IThing Thing { get; set; }
+        }
+
+        interface IThing
+        {
+            int Number { get; set; }
+        }
+
+        class MyThing : IThing
+        {
+            public int Number { get; set; }
+        }
     }
 }