Skip to content

Commit 3635824

Browse files
committed
Avoid possible NPE in JsonFieldPaths
See gh-715
1 parent 7d6ac32 commit 3635824

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldPaths.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static void from(Set<String> paths, String parent, Object object) {
7171
else if (object instanceof Map) {
7272
from(paths, parent, (Map<?, ?>) object);
7373
}
74-
else if (object.equals(ExtractedField.ABSENT)) {
74+
else if (ExtractedField.ABSENT.equals(object)) {
7575
paths.add(parent);
7676
}
7777
}

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonFieldPathsTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ public class JsonFieldPathsTests {
3535

3636
@Test
3737
public void noUncommonPathsForSingleItem() {
38-
assertThat(JsonFieldPaths.from(Arrays.asList(json("{\"a\": 1, \"b\": [ { \"c\": 2}, {\"c\": 3} ]}")))
39-
.getUncommon()).isEmpty();
38+
assertThat(
39+
JsonFieldPaths.from(Arrays.asList(json("{\"a\": 1, \"b\": [ { \"c\": 2}, {\"c\": 3}, {\"c\": null}]}")))
40+
.getUncommon()).isEmpty();
4041
}
4142

4243
@Test

0 commit comments

Comments
 (0)