-Fixed serializing protected override properties
This commit is contained in:
@@ -3273,7 +3273,10 @@ keyword such as type of business.""
|
||||
testClass.co = new Co();
|
||||
String strFromTest = JsonConvert.SerializeObject(testClass);
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(() => { InterfacePropertyTestClass testFromDe = (InterfacePropertyTestClass)JsonConvert.DeserializeObject(strFromTest, typeof(InterfacePropertyTestClass)); }, @"Could not create an instance of type Newtonsoft.Json.Tests.TestObjects.ICo. Type is an interface or abstract class and cannot be instantiated. Path 'co.Name', line 1, position 14.");
|
||||
ExceptionAssert.Throws<JsonSerializationException>(() =>
|
||||
{
|
||||
InterfacePropertyTestClass testFromDe = (InterfacePropertyTestClass)JsonConvert.DeserializeObject(strFromTest, typeof(InterfacePropertyTestClass));
|
||||
}, @"Could not create an instance of type Newtonsoft.Json.Tests.TestObjects.ICo. Type is an interface or abstract class and cannot be instantiated. Path 'co.Name', line 1, position 14.");
|
||||
}
|
||||
|
||||
private Person GetPerson()
|
||||
@@ -7200,7 +7203,10 @@ Path '', line 1, position 1.");
|
||||
null
|
||||
]";
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(() => { List<int> numbers = JsonConvert.DeserializeObject<List<int>>(json); }, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6.");
|
||||
ExceptionAssert.Throws<JsonSerializationException>(() =>
|
||||
{
|
||||
List<int> numbers = JsonConvert.DeserializeObject<List<int>>(json);
|
||||
}, "Error converting value {null} to type 'System.Int32'. Path '[3]', line 5, position 6.");
|
||||
}
|
||||
|
||||
#if !(PORTABLE)
|
||||
@@ -9789,6 +9795,33 @@ Path '', line 1, position 1.");
|
||||
|
||||
ExceptionAssert.Throws<JsonSerializationException>(() => JsonConvert.DeserializeObject<CompletionDataRequest>(s), "Unexpected end when deserializing object. Path 'dataSource', line 1, position 63.");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ChildClassWithProtectedOverridePlusJsonProperty_Serialize()
|
||||
{
|
||||
var propertyValue = "test";
|
||||
var testJson = @"{ 'MyProperty' : '" + propertyValue + "' }";
|
||||
|
||||
var testObject = JsonConvert.DeserializeObject<ChildClassWithProtectedOverridePlusJsonProperty>(testJson);
|
||||
|
||||
Assert.AreEqual(propertyValue, testObject.GetPropertyValue(), "MyProperty should be populated");
|
||||
}
|
||||
}
|
||||
|
||||
public class BaseClassWithProtectedVirtual
|
||||
{
|
||||
protected virtual string MyProperty { get; set; }
|
||||
}
|
||||
|
||||
public class ChildClassWithProtectedOverridePlusJsonProperty : BaseClassWithProtectedVirtual
|
||||
{
|
||||
[JsonProperty]
|
||||
protected override string MyProperty { get; set; }
|
||||
|
||||
public string GetPropertyValue()
|
||||
{
|
||||
return MyProperty;
|
||||
}
|
||||
}
|
||||
|
||||
public class DerivedWithPrivate : BaseWithPrivate
|
||||
|
||||
@@ -98,13 +98,13 @@ namespace Newtonsoft.Json.Utilities
|
||||
{
|
||||
ValidationUtils.ArgumentNotNull(propertyInfo, nameof(propertyInfo));
|
||||
|
||||
MethodInfo m = propertyInfo.GetGetMethod();
|
||||
MethodInfo m = propertyInfo.GetGetMethod(true);
|
||||
if (m != null && m.IsVirtual)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
m = propertyInfo.GetSetMethod();
|
||||
m = propertyInfo.GetSetMethod(true);
|
||||
if (m != null && m.IsVirtual)
|
||||
{
|
||||
return true;
|
||||
@@ -1017,6 +1017,8 @@ namespace Newtonsoft.Json.Utilities
|
||||
{
|
||||
PropertyInfo subTypeProperty = propertyInfo;
|
||||
|
||||
if (!subTypeProperty.IsVirtual())
|
||||
{
|
||||
if (!IsPublic(subTypeProperty))
|
||||
{
|
||||
// have to test on name rather than reference because instances are different
|
||||
@@ -1040,8 +1042,6 @@ namespace Newtonsoft.Json.Utilities
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!subTypeProperty.IsVirtual())
|
||||
{
|
||||
int index = initialProperties.IndexOf(p => p.Name == subTypeProperty.Name
|
||||
&& p.DeclaringType == subTypeProperty.DeclaringType);
|
||||
@@ -1051,12 +1051,16 @@ namespace Newtonsoft.Json.Utilities
|
||||
initialProperties.Add(subTypeProperty);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
MethodInfo subTypePropertyBaseDefinition = subTypeProperty.GetBaseDefinition();
|
||||
if (subTypePropertyBaseDefinition != null)
|
||||
{
|
||||
int index = initialProperties.IndexOf(p => p.Name == subTypeProperty.Name
|
||||
&& p.IsVirtual()
|
||||
&& p.GetBaseDefinition() != null
|
||||
&& p.GetBaseDefinition().DeclaringType.IsAssignableFrom(subTypeProperty.GetBaseDefinition().DeclaringType));
|
||||
&& p.GetBaseDefinition().DeclaringType.IsAssignableFrom(subTypePropertyBaseDefinition.DeclaringType));
|
||||
|
||||
if (index == -1)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user