Skip to content

Commit 70d4b8d

Browse files
committed
fix-to(return): 修复路径显示
1 parent 1d804da commit 70d4b8d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/TravelPath.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ public TravelPath(TravelPath parentPath, MappingKey mappingKey) {
3131
// 抽象的路径
3232
this.abstractTravelPath = PathUtil.getObjectPath(parentPath.getAbstractTravelPath()) + (mappingKey.getExpectKey() != null ? mappingKey.getExpectKey() : mappingKey.getActualKey());
3333
// 实际遍历的路径
34-
this.actualTravelPath = PathUtil.getObjectPath(parentPath.actualTravelPath) + mappingKey.getActualKey();
34+
this.actualTravelPath = PathUtil.getObjectPath(parentPath.getActualTravelPath()) + mappingKey.getActualKey();
3535
this.expectTravelPath = PathUtil.getObjectPath(parentPath.getExpectTravelPath()) + mappingKey.getExpectKey();
3636
}
3737

3838
public TravelPath(TravelPath parentPath, int expectIndex, int actualIndex) {
3939
// 抽象的路径
40-
this.abstractTravelPath = parentPath.getAbstractTravelPath() + PathUtil.getIndexPath("*");
40+
this.abstractTravelPath = parentPath.getAbstractTravelPath() + PathUtil.getAbstractIndexPath(null);
4141
// 实际遍历的路径
4242
this.actualTravelPath = parentPath.getActualTravelPath() + PathUtil.getIndexPath(String.valueOf(actualIndex));
4343
this.expectTravelPath = parentPath.getExpectTravelPath() + PathUtil.getIndexPath(String.valueOf(expectIndex));

json-diff-common/src/main/java/me/codeleep/jsondiff/common/utils/PathUtil.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@ public class PathUtil {
1414
private static final String ARRAY_SING_RIGHT = "]";
1515

1616

17+
public static String getAbstractIndexPath(String index) {
18+
return ARRAY_SING_LEFT + "*" + ARRAY_SING_RIGHT;
19+
}
20+
1721
public static String getIndexPath(String index) {
1822
return ARRAY_SING_LEFT + index + ARRAY_SING_RIGHT;
1923
}
2024

2125
public static String getObjectPath(String parentPath) {
22-
return parentPath.replaceAll("\\[\\d+]", "[*]") + OBJECT_SING;
26+
return parentPath + OBJECT_SING;
2327
}
2428

2529
}

0 commit comments

Comments
 (0)