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

Jump to bottom

Spatial: Fixes deserialization when Json does not represent a Spatial type #2311

Merged
merged 4 commits into from
Mar 16, 2021
Merged

Spatial: Fixes deserialization when Json does not represent a Spatial type #2311

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95a602d
when null
ealsur Mar 15, 2021
ce1501d
test
ealsur Mar 15, 2021
1f2f420
Merge branch 'master' into users/ealsur/nrespatial
j82w Mar 16, 2021
2fbf4f4
Merge branch 'master' into users/ealsur/nrespatial
j82w Mar 16, 2021
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
3 changes: 2 additions & 1 deletion Microsoft.Azure.Cosmos/src/Spatial/Converters/GeometryJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public override object ReadJson(
}

JToken typeToken = token["type"];
if (typeToken.Type != JTokenType.String)
if (typeToken == null
|| typeToken.Type != JTokenType.String)
{
throw new JsonSerializationException(RMResources.SpatialInvalidGeometryType);
}
Expand Down
11 changes: 11 additions & 0 deletions Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Spatial/CommonSerializationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ public void TestInvalidJson()
Point point = JsonConvert.DeserializeObject<Point>(json);
}

/// <summary>
/// Tests that no type throws exception.
/// </summary>
[TestMethod]
[ExpectedException(typeof(JsonSerializationException))]
public void TestNoType()
{
string json = @"{""notatype"":""nothingrelevant""}";
Point point = JsonConvert.DeserializeObject<Point>(json);
}

/// <summary>
/// Tests that coordinates cannot be null.
/// </summary>
Expand Down