From d6794673f8c0a4cf06af09fd8ef7026dc7599922 Mon Sep 17 00:00:00 2001 From: chen_gd Date: Fri, 3 Nov 2023 10:10:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=88=A4=E6=96=AD=E3=80=822=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BF=BD=E7=95=A5=E6=8C=87=E5=AE=9Akey=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsondiff/core/handle/array/AbstractArrayJsonNeat.java | 3 --- .../jsondiff/core/handle/object/ComplexObjectJsonNeat.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java index 370f794036d..da1ac451002 100644 --- a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java +++ b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java @@ -49,9 +49,6 @@ public abstract class AbstractArrayJsonNeat extends AbstractTypeCheck implements if (ignorePath.contains(travelPath.getAbstractTravelPath())) { return false; } - if (expect == null && actual == null) { - return false; - } if (expect == null || actual == null) { return false; diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java index e949761c099..7ab605ae2ab 100644 --- a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java +++ b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java @@ -126,7 +126,7 @@ public class ComplexObjectJsonNeat extends AbstractObjectJsonNeat { HashSet ignorePath = RunTimeDataFactory.getOptionInstance().getIgnorePath(); List mappingKeys = keyMap.stream().filter(mappingKey -> { String actualTravelPath = PathUtil.getObjectPath(travelPath.getAbstractTravelPath()) + mappingKey.getActualKey(); - String expectTravelPath = PathUtil.getObjectPath(travelPath.getAbstractTravelPath()) + mappingKey.getActualKey(); + String expectTravelPath = PathUtil.getObjectPath(travelPath.getAbstractTravelPath()) + mappingKey.getExpectKey(); if (ignorePath.contains(actualTravelPath) || ignorePath.contains(expectTravelPath) ) { return false; } -- Gitee