Added opt-in, opt-out serialization option
Added virtual GetSerializableMembers to JsonSerializer
This commit is contained in:
@@ -444,7 +444,7 @@ namespace Newtonsoft.Json.Converters
|
||||
{
|
||||
case JsonToken.PropertyName:
|
||||
if (currentNode.NodeType == XmlNodeType.Document && document.DocumentElement != null)
|
||||
throw new JsonSerializationException("JSON root object has multiple properties.");
|
||||
throw new JsonSerializationException("JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document.");
|
||||
|
||||
string propertyName = reader.Value.ToString();
|
||||
reader.Read();
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Newtonsoft.Json
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = false)]
|
||||
public sealed class JsonObjectAttribute : Attribute
|
||||
{
|
||||
private MemberSerialization _memberSerialization = MemberSerialization.OptOut;
|
||||
|
||||
public MemberSerialization MemberSerialization
|
||||
{
|
||||
get { return _memberSerialization; }
|
||||
set { _memberSerialization = value; }
|
||||
}
|
||||
|
||||
public JsonObjectAttribute()
|
||||
{
|
||||
}
|
||||
|
||||
public JsonObjectAttribute(MemberSerialization memberSerialization)
|
||||
{
|
||||
MemberSerialization = memberSerialization;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -321,20 +321,26 @@ namespace Newtonsoft.Json
|
||||
|
||||
private MemberMappingCollection CreateMemberMappings(Type objectType)
|
||||
{
|
||||
List<MemberInfo> members = ReflectionUtils.GetFieldsAndProperties(objectType, BindingFlags.Public | BindingFlags.Instance);
|
||||
MemberSerialization memberSerialization = GetObjectMemberSerialization(objectType);
|
||||
|
||||
List<MemberInfo> members = GetSerializableMembers(objectType);
|
||||
if (members == null)
|
||||
throw new JsonSerializationException("Null collection of seralizable members returned.");
|
||||
|
||||
MemberMappingCollection memberMappings = new MemberMappingCollection();
|
||||
|
||||
foreach (MemberInfo member in members)
|
||||
{
|
||||
string mappedName;
|
||||
|
||||
JsonPropertyAttribute propertyAttribute = ReflectionUtils.GetAttribute<JsonPropertyAttribute>(member, true);
|
||||
if (propertyAttribute != null)
|
||||
mappedName = propertyAttribute.PropertyName;
|
||||
else
|
||||
mappedName = member.Name;
|
||||
bool hasIgnoreAttribute = member.IsDefined(typeof(JsonIgnoreAttribute), true);
|
||||
|
||||
string mappedName = (propertyAttribute != null && propertyAttribute.PropertyName != null)
|
||||
? propertyAttribute.PropertyName
|
||||
: member.Name;
|
||||
|
||||
bool ignored = (hasIgnoreAttribute
|
||||
|| (memberSerialization == MemberSerialization.OptIn && propertyAttribute == null));
|
||||
|
||||
bool ignored = member.IsDefined(typeof(JsonIgnoreAttribute), true);
|
||||
bool readable = ReflectionUtils.CanReadMemberValue(member);
|
||||
bool writable = ReflectionUtils.CanSetMemberValue(member);
|
||||
MemberMapping memberMapping = new MemberMapping(mappedName, member, ignored, readable, writable);
|
||||
@@ -345,6 +351,21 @@ namespace Newtonsoft.Json
|
||||
return memberMappings;
|
||||
}
|
||||
|
||||
protected virtual List<MemberInfo> GetSerializableMembers(Type objectType)
|
||||
{
|
||||
return ReflectionUtils.GetFieldsAndProperties(objectType, BindingFlags.Public | BindingFlags.Instance);
|
||||
}
|
||||
|
||||
private static MemberSerialization GetObjectMemberSerialization(Type objectType)
|
||||
{
|
||||
JsonObjectAttribute objectAttribute = ReflectionUtils.GetAttribute<JsonObjectAttribute>(objectType, true);
|
||||
|
||||
if (objectAttribute == null)
|
||||
return MemberSerialization.OptOut;
|
||||
else
|
||||
return objectAttribute.MemberSerialization;
|
||||
}
|
||||
|
||||
private void SetObjectMember(JsonReader reader, object target, Type targetType, string memberName)
|
||||
{
|
||||
if (!reader.Read())
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Newtonsoft.Json
|
||||
{
|
||||
public enum MemberSerialization
|
||||
{
|
||||
OptOut,
|
||||
OptIn
|
||||
}
|
||||
}
|
||||
@@ -75,6 +75,8 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="JsonObjectAttribute.cs" />
|
||||
<Compile Include="MemberSerialization.cs" />
|
||||
<Compile Include="ObjectCreationHandling.cs" />
|
||||
<Compile Include="Converters\IsoDateTimeConverter.cs" />
|
||||
<Compile Include="Converters\JavaScriptDateTimeConverter.cs" />
|
||||
|
||||
Reference in New Issue
Block a user