Merge branch '1.2.x'

2018-11-01 07:04:45 +00:00
parent eedc69836e e23c6b45d4
commit 9deae49795
2 changed files with 10 additions and 1 deletions
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/JsonContentHandlerTests.java
@@ -183,4 +183,13 @@ public class JsonContentHandlerTests {
 		assertThat(missingFields.get(0).getPath()).isEqualTo("a.[].b.[].c");
 	}

+	@Test
+	public void describedMissingFieldThatIsChildOfOptionalObjectThatIsNullIsNotConsideredMissing() {
+		List<FieldDescriptor> missingFields = new JsonContentHandler(
+				"{\"a\":null}".getBytes()).findMissingFields(
+						Arrays.asList(new FieldDescriptor("a").optional(),
+								new FieldDescriptor("a.b")));
+		assertThat(missingFields.size()).isEqualTo(0);
+	}
+
 }