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

Fix Arrays in SystemText #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Arrays in SystemText #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3010a
Fix SystemText arrays
Morcatko Jan 5, 2021
d19b896
.NET 5 readme
Morcatko Jan 5, 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
26 changes: 13 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# JSON Merge Patch support for ASP.NET Core
# JSON Merge Patch support for ASP.NET Core 2, 3 and 5


[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch) - [Morcatko.AspNetCore.JsonMergePatch](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch) (ASP.NET Core 2.x)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson) - [Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson) (ASP.NET Core 3.x)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.SystemText.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) - [Morcatko.AspNetCore.JsonMergePatch.SystemText](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) (ASP.NET Core 3.x)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.Document.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.Document) - [Morcatko.AspNetCore.JsonMergePatch.Document](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.Document) (ASP.NET Core 3.x - base package)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch) - [Morcatko.AspNetCore.JsonMergePatch](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch) (ASP.NET Core 2)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson) - [Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson) (ASP.NET Core 3 & 5)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.SystemText.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) - [Morcatko.AspNetCore.JsonMergePatch.SystemText](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) (ASP.NET Core 3 & 5)
[![Nuget](https://img.shields.io/nuget/v/Morcatko.AspNetCore.JsonMergePatch.Document.svg)](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.Document) - [Morcatko.AspNetCore.JsonMergePatch.Document](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.Document) (ASP.NET Core 3 & 5 - base package)

### JSON Merge Patch
- [RFC 7396](https://tools.ietf.org/html/rfc7396)
Expand Down Expand Up @@ -36,9 +36,9 @@ resulting C# object:
### How to
See `2.1-testApp` or `3.0 testApp` for sample
1. Install nuget.
- ASP.NET Core 2.x [Morcatko.AspNetCore.JsonMergePatch](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch)
- ASP.NET Core 3.x (Newtonsoft.Json) [Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson)
- ASP.NET Core 3.x (System.Text) [Morcatko.AspNetCore.JsonMergePatch.SystemText](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) nuget
- ASP.NET Core 2 [Morcatko.AspNetCore.JsonMergePatch](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch)
- ASP.NET Core 3 & 5 (Newtonsoft.Json) [Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.NewtonsoftJson)
- ASP.NET Core 3 & 5 (System.Text) [Morcatko.AspNetCore.JsonMergePatch.SystemText](https://www.nuget.org/packages/Morcatko.AspNetCore.JsonMergePatch.SystemText) nuget

2. Add to your startup class
```
Expand All @@ -49,9 +49,9 @@ public void ConfigureServices(IServiceCollection services)
...
services
.AddMvc() // or .AddMvcCore()
//.AddJsonMergePatch(); // 2.x
//.AddNewtonsoftJsonMergePatch(); // 3.x (Newtonsoft.Josn)
//.AddSystemTextJsonMergePatch(); // 3.x (System.Text)
//.AddJsonMergePatch(); // 2
//.AddNewtonsoftJsonMergePatch(); // 3 & 5 (Newtonsoft.Josn)
//.AddSystemTextJsonMergePatch(); // 3 & 5 (System.Text)
...
}
```
Expand All @@ -78,8 +78,8 @@ patch.ApplyToT(backendModel)
4. Swagger config (optional)

copy & paste this class into your app
- 2.x - https://github.com/Morcatko/Morcatko.AspNetCore.JsonMergePatch/blob/master/src/2.1-testApp/JsonMergePatchDocumentOperationFilter.cs
- 3.x - https://github.com/Morcatko/Morcatko.AspNetCore.JsonMergePatch/blob/master/src/3.0-testApp/JsonMergePatchDocumentOperationFilter.cs
- 2 - https://github.com/Morcatko/Morcatko.AspNetCore.JsonMergePatch/blob/master/src/2.1-testApp/JsonMergePatchDocumentOperationFilter.cs
- 3 & 5 - https://github.com/Morcatko/Morcatko.AspNetCore.JsonMergePatch/blob/master/src/3.0-testApp/JsonMergePatchDocumentOperationFilter.cs
```
services.AddSwaggerGen(c =>
{
Expand Down
19 changes: 9 additions & 10 deletions src/3.0-JsonMergePatch.SystemText/Builders/PatchBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Morcatko.AspNetCore.JsonMergePatch.Internal;
using System;
using System.Linq;
using System.Reflection;
using System.Text.Json;

Expand All @@ -14,25 +15,23 @@ private static object ToObject(this JsonElement jsonElement)
case JsonValueKind.Null: return null;
case JsonValueKind.String: return jsonElement.GetString();
case JsonValueKind.Number: return jsonElement.GetGenericNumber();
case JsonValueKind.Array: return jsonElement.EnumerateArray().Select(j => j.ToObject()).ToArray();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leads to an exception when an array contains complex objects. When ToObject is called with such array element, it throws NotSupportedException.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did any of you manage to make some progress with this?
@OleksandrHorbunovVP what was the end solution that you used?
Currently working on a project where this would be useful but immediately hit this problem.

case JsonValueKind.True: return true;
case JsonValueKind.False: return false;
case JsonValueKind.Undefined:
case JsonValueKind.Object:
case JsonValueKind.Array:
default:
throw new NotSupportedException($"Unsupported ValueKind - {jsonElement.ValueKind}");
}
}

private static object GetGenericNumber (this JsonElement jsonElement)
{

// Attempt to parse the JSON Element as an Int32 first
if (jsonElement.TryGetInt32(out int int32)) return int32;

// Failing that, parse it as a Decimal instead
return jsonElement.GetDecimal();

private static object GetGenericNumber(this JsonElement jsonElement)
{
// Attempt to parse the JSON Element as an Int32 first
if (jsonElement.TryGetInt32(out int int32)) return int32;

// Failing that, parse it as a Decimal instead
return jsonElement.GetDecimal();
}

private static bool IsValue(this JsonValueKind valueKind)
Expand Down
29 changes: 25 additions & 4 deletions src/3.0-JsonMergePatch.Tests/Integration/MvcTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ await p.MergePatchAsync(null, new[]
[MemberData(nameof(GetCombinations))]
public async Task NullableDecimalFloatingPoint(bool core, bool newtonsoft)
{
using (var p = new TestHelper(core, newtonsoft)) {
using (var p = new TestHelper(core, newtonsoft))
{
await p.PostAsync("0", p.GetTestModel());

await p.MergePatchAsync(null, new[]
Expand All @@ -133,11 +134,31 @@ await p.MergePatchAsync(null, new[]

var patchedModel = await p.GetAsync("0");
var expected = p.GetTestModel();
expected.NullableDecimal = (decimal?) 7.5;
expected.NullableDecimal = (decimal?)7.5;
Assert.Equal(expected, patchedModel);
}
}

[Theory]
[MemberData(nameof(GetCombinations))]
public async Task Arrays(bool core, bool newtonsoft)
{
using (var p = new TestHelper(core, newtonsoft))
{
await p.PostAsync("0", p.GetTestModel());

await p.MergePatchAsync(null, new[]
{
new { id = 0, ArrayOfFloats = new [] { 7, 3.5f }}
});

var patchedModel = await p.GetAsync("0");
var expected = p.GetTestModel();
expected.ArrayOfFloats = new [] { 7, 3.5f };
Assert.Equal(expected, patchedModel);
}
}

[Theory(Skip = "Does not work")]
[MemberData(nameof(GetCombinations))]
public async Task MissingRequiredProperty(bool core, bool newtonsoft)
Expand All @@ -152,8 +173,8 @@ public async Task MissingRequiredProperty(bool core, bool newtonsoft)
expected.Integer = 8;
Assert.Equal(expected, patchedModel);
}
}

}
#region ValueEnum
[Theory(Skip = "Enums do not work - https://github.com/aspnet/Home/issues/2423")]
[MemberData(nameof(GetCombinations))]
Expand Down
5 changes: 4 additions & 1 deletion src/3.0-JsonMergePatch.Tests/TestModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public class TestModelBase : IEquatable<TestModelBase>, IEquatable<NewtonsoftTes

public decimal? NullableDecimal { get; set; }

public float[] ArrayOfFloats { get; set; } = new float[0];

public Dictionary<string, SubModel> SubModels { get; set; } = new Dictionary<string, SubModel>();

public bool Equals(TestModelBase other)
Expand All @@ -43,7 +45,8 @@ public bool Equals(TestModelBase other)
&& this.ValueEnum == other.ValueEnum
&& this.NullableDecimal == other.NullableDecimal
&& this.Date == other.Date
&& this.Date.GetValueOrDefault().Offset == other.Date.GetValueOrDefault().Offset
&& this.Date.GetValueOrDefault().Offset == other.Date.GetValueOrDefault().Offset
&& Enumerable.SequenceEqual(this.ArrayOfFloats, other.ArrayOfFloats)
&& Enumerable.SequenceEqual(this.SubModels?.Keys, other.SubModels?.Keys)
&& Enumerable.SequenceEqual(this.SubModels?.Values, other.SubModels?.Values)
&& ((this.SubModel == other.SubModel)
Expand Down