From 389e6226ca70643b0dc185ada874d30e014971d4 Mon Sep 17 00:00:00 2001 From: Jan Bernitt Date: Thu, 27 Feb 2025 16:22:09 +0100 Subject: [PATCH] fix: diff report more object members in actual --- src/main/java/org/hisp/dhis/jsontree/JsonDiff.java | 2 +- .../java/org/hisp/dhis/jsontree/JsonDiffTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/hisp/dhis/jsontree/JsonDiff.java b/src/main/java/org/hisp/dhis/jsontree/JsonDiff.java index 42237f7..2658f49 100644 --- a/src/main/java/org/hisp/dhis/jsontree/JsonDiff.java +++ b/src/main/java/org/hisp/dhis/jsontree/JsonDiff.java @@ -197,7 +197,7 @@ private static void diffNumber(JsonNumber e, JsonNumber a, Mode mode, Consumer add, PropertyInfo p) { - if (!p.anyAdditional(mode.objects.anyAdditional) && e.size() != a.size()) { + if (!p.anyAdditional(mode.objects.anyAdditional)) { // list all extra members a.keys() .filter(not(e::has)) diff --git a/src/test/java/org/hisp/dhis/jsontree/JsonDiffTest.java b/src/test/java/org/hisp/dhis/jsontree/JsonDiffTest.java index 21999d6..9046a29 100644 --- a/src/test/java/org/hisp/dhis/jsontree/JsonDiffTest.java +++ b/src/test/java/org/hisp/dhis/jsontree/JsonDiffTest.java @@ -77,6 +77,18 @@ void testObject() { assertDiff("{\"a\":[1,2,3]}", "{\"a\":[1,5,3]}", "!= $.a[1]: 2 <> 5"); } + @Test + void testObject_Pager() { + assertDiff( + """ + {"page":1, "pageSize":50}""", + """ + {"paga":1, "pageSize":50.0}""", + DEFAULT, + "++ $.paga: ? <> 1", + "-- $.page: 1 <> ?"); + } + private interface JsonAnyAnnotationObject extends JsonObject { @JsonDiff.AnyOrder