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

Show file tree
Hide file tree
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
Add GUID-from-string support
  • Loading branch information
@Turnerj
Turnerj committed Dec 14, 2019
commit d4f08f571f267c7827ce38770d7421918fd49366
5 changes: 5 additions & 0 deletions Source/Schema.NET/ValuesJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,11 @@ private static bool TryProcessTokenAsType(JsonReader reader, Type targetType, ou
success = Uri.TryCreate(valueString, UriKind.Absolute, out var localResult);
result = localResult;
}
else if (targetType == typeof(Guid))
{
success = Guid.TryParse(valueString, out var localResult);
result = localResult;
}
}
else if (tokenType == JsonToken.Integer || tokenType == JsonToken.Float)
{
Expand Down
8 changes: 8 additions & 0 deletions Tests/Schema.NET.Test/ValuesJsonConverterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ public void ReadJson_Values_SingleValue_BooleanAsString()
Assert.True(result.Value2.First());
}

[Fact]
public void ReadJson_Values_SingleValue_GuidAsString()
{
var json = "{\"Property\":\"13ec75b3-250c-48a2-8bd0-dfee62852bd4\"}";
var result = this.DeserializeObject<Values<string, Guid>>(json);
Assert.Equal(new Guid("13ec75b3-250c-48a2-8bd0-dfee62852bd4"), result.Value2.First());
}

[Fact]
public void ReadJson_Values_SingleValue_NullablePrimitiveAsString()
{
Expand Down