Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reuse the Newtonsoft.Json serializer #5197

Closed
wants to merge 1 commit into from
Closed

reuse the Newtonsoft.Json serializer #5197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 26 additions & 18 deletions src/core/Akka/Serialization/NewtonSoftJsonSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
Expand Down Expand Up @@ -229,8 +230,16 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
/// <returns>A byte array containing the serialized object</returns>
public override byte[] ToBinary(object obj)
{
string data = JsonConvert.SerializeObject(obj, Formatting.None, Settings);
byte[] bytes = Encoding.UTF8.GetBytes(data);
var sb = new StringBuilder(256); // TODO: pool these
var sw = new StringWriter(sb, CultureInfo.InvariantCulture);
using (var jsonWriter = new JsonTextWriter(sw))
{
jsonWriter.Formatting = Formatting.None;
_serializer.Serialize(jsonWriter, obj);
}

var data = sw.ToString();
var bytes = Encoding.UTF8.GetBytes(data);
return bytes;
}

Expand All @@ -242,15 +251,17 @@ public override byte[] ToBinary(object obj)
/// <returns>The object contained in the array</returns>
public override object FromBinary(byte[] bytes, Type type)
{
string data = Encoding.UTF8.GetString(bytes);
object res = JsonConvert.DeserializeObject(data, Settings);
return TranslateSurrogate(res, this, type);
var data = Encoding.UTF8.GetString(bytes);
using (var jsonReader = new JsonTextReader(new StringReader(data)))
{
var res = _serializer.Deserialize(jsonReader);
return TranslateSurrogate(res, this, type);
}
}

private static object TranslateSurrogate(object deserializedValue, NewtonSoftJsonSerializer parent, Type type)
{
var j = deserializedValue as JObject;
if (j != null)
if (deserializedValue is JObject j)
{
//The JObject represents a special akka.net wrapper for primitives (int,float,decimal) to preserve correct type when deserializing
if (j["$"] != null)
Expand All @@ -262,10 +273,9 @@ private static object TranslateSurrogate(object deserializedValue, NewtonSoftJso
//The JObject is not of our concern, let Json.NET deserialize it.
return j.ToObject(type, parent._serializer);
}
var surrogate = deserializedValue as ISurrogate;

//The deserialized object is a surrogate, unwrap it
if (surrogate != null)
if (deserializedValue is ISurrogate surrogate)
{
return surrogate.FromSurrogate(parent.system);
}
Expand Down Expand Up @@ -356,10 +366,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
}
else
{
var value1 = value as ISurrogated;
if (value1 != null)
if (value is ISurrogated surrogated)
{
var surrogated = value1;
var surrogate = surrogated.ToSurrogate(_parent.system);
serializer.Serialize(writer, surrogate);
}
Expand All @@ -372,12 +380,12 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s

private object GetString(object value)
{
if (value is int)
return "I" + ((int)value).ToString(NumberFormatInfo.InvariantInfo);
if (value is float)
return "F" + ((float)value).ToString(NumberFormatInfo.InvariantInfo);
if (value is decimal)
return "M" + ((decimal)value).ToString(NumberFormatInfo.InvariantInfo);
if (value is int i)
return "I" + i.ToString(NumberFormatInfo.InvariantInfo);
if (value is float f)
return "F" + f.ToString(NumberFormatInfo.InvariantInfo);
if (value is decimal value1)
return "M" + value1.ToString(NumberFormatInfo.InvariantInfo);
throw new NotSupportedException();
}
}
Expand Down