-Added JsonSerializer argument to JsonConverter.ReadJson and JsonConverter.WriteJson. Needed because serializer now has state
-Added CustomCreationConverter -Added IsReference to JsonContainerAttribute -Added PreserveReferencesHandling to JsonSerializer -Added IReferenceResolver to JsonSerializer -Split internals of JsonSerializer into JsonSerializerWriter (serializes) and JsonSerializerReader (deserializes) -Moved serialize stack from JsonWriter (yuck) to JsonSerializerWriter (yay) -Added FromObject overload with JsonSerializer argument for cases when state is needed
This commit is contained in:
@@ -8,7 +8,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
{
|
||||
public class DepartmentConverter : JsonConverter
|
||||
{
|
||||
public override void WriteJson(JsonWriter writer, object value)
|
||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||
{
|
||||
Department department = (Department)value;
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
o.WriteTo(writer);
|
||||
}
|
||||
|
||||
public override object ReadJson(JsonReader reader, Type objectType)
|
||||
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
|
||||
{
|
||||
JObject o = JObject.Load(reader);
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
{
|
||||
public class GuidByteArrayConverter : JsonConverter
|
||||
{
|
||||
public override void WriteJson(JsonWriter writer, object value)
|
||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||
{
|
||||
Guid guid = (Guid) value;
|
||||
writer.WriteValue(Convert.ToBase64String(guid.ToByteArray()));
|
||||
}
|
||||
|
||||
public override object ReadJson(JsonReader reader, Type objectType)
|
||||
public override object ReadJson(JsonReader reader, Type objectType, JsonSerializer serializer)
|
||||
{
|
||||
string encodedData = (string) reader.Value;
|
||||
byte[] data = Convert.FromBase64String(encodedData);
|
||||
|
||||
Reference in New Issue
Block a user