Skip to content

Overhaul ValuesJsonConverter #109

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

Merged
RehanSaeed merged 19 commits into from
Dec 19, 2019
Merged

Overhaul ValuesJsonConverter #109

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4589fd0
Initial refactor of ValuesJsonConverter
Turnerj Dec 12, 2019
908d9e6
Remove branch logic for casting to OneOrMany
Turnerj Dec 13, 2019
bb28364
Improve memory allocation for writes
Turnerj Dec 13, 2019
7df50c5
Updating enum string URI logic
Turnerj Dec 13, 2019
3c34f84
Improving hot path for serialization
Turnerj Dec 13, 2019
33ce37f
Use reader directly instead of JToken
Turnerj Dec 13, 2019
f6b24cc
Prevent list allocation for single item
Turnerj Dec 13, 2019
58cc155
Added missing success marker
Turnerj Dec 13, 2019
536a53a
Better support for external types
Turnerj Dec 14, 2019
d4f08f5
Add GUID-from-string support
Turnerj Dec 14, 2019
a3eb4d3
Adds full support for implicit external types in any namespace
Turnerj Dec 16, 2019
2197c96
Add TimeSpan support for reads
Turnerj Dec 17, 2019
b073901
Add support for implicit array conversion
Turnerj Dec 17, 2019
86c4c66
Add write tests for time-related types
Turnerj Dec 17, 2019
1d40a8a
Add support for TimeSpan as ISO 8601 duration
Turnerj Dec 17, 2019
1b0f726
WriteObject to only take individual items
Turnerj Dec 17, 2019
280d05e
TimeSpan converter doesn't need to handle reads
Turnerj Dec 17, 2019
a546cac
Moved model classes to separate folder
Turnerj Dec 17, 2019
6dc7814
Updated test naming to make intention clearer
Turnerj Dec 17, 2019
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
Prev Previous commit
Next Next commit
Use reader directly instead of JToken
  • Loading branch information
@Turnerj
Turnerj committed Dec 13, 2019
commit 33ce37f7980e2e4d6230c6f7a6f742aeb85acef3
200 changes: 99 additions & 101 deletions Source/Schema.NET/ValuesJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,29 @@ public override object ReadJson(
throw new ArgumentNullException(nameof(serializer));
}

var token = JToken.Load(reader);
var items = new List<object>();

if (token.Type == JTokenType.Array)
if (reader.TokenType == JsonToken.StartArray)
{
foreach (var childToken in token.Children())
while (reader.Read())
{
var item = ProcessToken(childToken, objectType.GenericTypeArguments, serializer);
if (reader.TokenType == JsonToken.EndArray)
{
break;
}

if (reader.TokenType == JsonToken.Null)
{
continue;
}

var item = ProcessToken(reader, objectType.GenericTypeArguments, serializer);
items.Add(item);
}
}
else
else if (reader.TokenType != JsonToken.Null)
{
var item = ProcessToken(token, objectType.GenericTypeArguments, serializer);
var item = ProcessToken(reader, objectType.GenericTypeArguments, serializer);
items.Add(item);
}

Expand Down Expand Up @@ -152,10 +161,13 @@ public virtual void WriteObject(JsonWriter writer, object value, JsonSerializer
serializer.Serialize(writer, value);
}

private static object ProcessToken(JToken token, Type[] targetTypes, JsonSerializer serializer)
private static object ProcessToken(JsonReader reader, Type[] targetTypes, JsonSerializer serializer)
{
if (token.Type == JTokenType.Object)
if (reader.TokenType == JsonToken.StartObject)
{
var token = JToken.ReadFrom(reader);

// Use the type property (if provided) to identify the correct type
var explicitTypeFromToken = token.SelectToken("@type")?.ToString();
if (!string.IsNullOrEmpty(explicitTypeFromToken) && ThingTypeLookup.TryGetValue(explicitTypeFromToken, out var explicitTypeInfo))
{
Expand All @@ -168,61 +180,98 @@ private static object ProcessToken(JToken token, Type[] targetTypes, JsonSeriali
}
}
}
}

for (var i = targetTypes.Length - 1; i >= 0; i--)
// Brute force the type by checking against every possible target
for (var i = targetTypes.Length - 1; i >= 0; i--)
{
var underlyingTargetType = targetTypes[i].GetUnderlyingTypeFromNullable();
if (!underlyingTargetType.IsPrimitiveType())
{
try
{
// If the target is an interface, attempt to identify concrete target
var localTargetType = underlyingTargetType;
var typeInfo = localTargetType.GetTypeInfo();
if (typeInfo.IsInterface && ThingTypeLookup.TryGetValue(typeInfo.Name.Substring(1), out var concreteTypeInfo))
{
localTargetType = concreteTypeInfo.AsType();
}

return token.ToObject(localTargetType, serializer);
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
#pragma warning restore CA1031 // Do not catch general exception types
}
}
}
else
{
var underlyingTargetType = targetTypes[i].GetUnderlyingTypeFromNullable();
if (TryProcessTokenAsType(token, underlyingTargetType, serializer, out var value))
// Brute force the type by checking against every possible target
for (var i = targetTypes.Length - 1; i >= 0; i--)
{
return value;
var underlyingTargetType = targetTypes[i].GetUnderlyingTypeFromNullable();
if (TryProcessTokenAsType(reader, underlyingTargetType, out var value))
{
return value;
}
}
}

return null;
}

private static bool TryProcessTokenAsType(JToken token, Type targetType, JsonSerializer serializer, out object value)
private static bool TryProcessTokenAsType(JsonReader reader, Type targetType, out object value)
{
var success = false;
object result = null;

var tokenType = token.Type;
if (tokenType == JTokenType.Object)
var tokenType = reader.TokenType;
if (reader.ValueType == targetType)
{
if (targetType.IsPrimitiveType())
{
success = false;
}
else
result = reader.Value;
success = true;
}
else if (tokenType == JsonToken.String)
{
var valueString = (string)reader.Value;
if (targetType.GetTypeInfo().IsPrimitive)
{
try
if (targetType == typeof(int))
{
// If the target is an interface, attempt to identify concrete target
var localTargetType = targetType;
var typeInfo = localTargetType.GetTypeInfo();
if (typeInfo.IsInterface && ThingTypeLookup.TryGetValue(typeInfo.Name.Substring(1), out var concreteTypeInfo))
{
localTargetType = concreteTypeInfo.AsType();
}

result = token.ToObject(localTargetType, serializer);
success = true;
success = int.TryParse(valueString, NumberStyles.Integer, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
#pragma warning disable CA1031 // Do not catch general exception types
catch (Exception ex)
else if (targetType == typeof(long))
{
Debug.WriteLine(ex.Message);
success = false;
success = long.TryParse(valueString, NumberStyles.Integer, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(float))
{
success = float.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(double))
{
success = double.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(bool))
{
success = bool.TryParse(valueString, out var localResult);
result = localResult;
}
#pragma warning restore CA1031 // Do not catch general exception types
}
}
else if (tokenType == JTokenType.String)
{
var valueString = token.ToObject<string>();

if (targetType.GetTypeInfo().IsEnum)
else if (targetType == typeof(decimal))
{
success = decimal.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType.GetTypeInfo().IsEnum)
{
const string SCHEMA_ORG = "http://schema.org/";
const int SCHEMA_ORG_LENGTH = 18; // equivalent to "http://schema.org/".Length
Expand Down Expand Up @@ -256,44 +305,6 @@ private static bool TryProcessTokenAsType(JToken token, Type targetType, JsonSer
}
#pragma warning restore CA1031 // Do not catch general exception types
}
else if (targetType.IsPrimitiveType())
{
if (targetType == typeof(string))
{
success = true;
result = valueString;
}
else if (targetType == typeof(int))
{
success = int.TryParse(valueString, NumberStyles.Integer, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(long))
{
success = long.TryParse(valueString, NumberStyles.Integer, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(float))
{
success = float.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(double))
{
success = double.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(bool))
{
success = bool.TryParse(valueString, out var localResult);
result = localResult;
}
}
else if (targetType == typeof(decimal))
{
success = decimal.TryParse(valueString, NumberStyles.Float, CultureInfo.InvariantCulture, out var localResult);
result = localResult;
}
else if (targetType == typeof(DateTime))
{
success = DateTime.TryParse(valueString, CultureInfo.InvariantCulture, DateTimeStyles.None, out var localResult);
Expand All @@ -310,39 +321,26 @@ private static bool TryProcessTokenAsType(JToken token, Type targetType, JsonSer
result = localResult;
}
}
else if (tokenType == JTokenType.Integer || tokenType == JTokenType.Float)
else if (tokenType == JsonToken.Integer || tokenType == JsonToken.Float)
{
if (targetType.GetTypeInfo().IsPrimitive || targetType == typeof(decimal))
{
result = token.ToObject(targetType);
success = true;
result = Convert.ChangeType(reader.Value, targetType, CultureInfo.InvariantCulture);
}
}
else if (tokenType == JTokenType.Date)
else if (tokenType == JsonToken.Date)
{
if (targetType == typeof(DateTime))
if (targetType == typeof(DateTime) && reader.Value is DateTimeOffset dateTimeOffset)
{
result = token.ToObject(targetType);
result = dateTimeOffset.UtcDateTime;
success = true;
}
else if (targetType == typeof(DateTimeOffset))
else if (targetType == typeof(DateTimeOffset) && reader.Value is DateTime dateTime)
{
result = token.ToObject(targetType);
result = new DateTimeOffset(dateTime);
success = true;
}
}
else if (tokenType == JTokenType.Boolean)
{
if (targetType == typeof(bool))
{
result = token.ToObject(targetType);
success = true;
}
}
else if (tokenType == JTokenType.Null)
{
success = true;
}

value = result;
return success;
Expand Down