Merge branch '1.2.x'

2017-07-01 11:14:55 +01:00
parent 1499eabef3 eac0e2c2d3
commit fbd13e30b0
4 changed files with 90 additions and 2 deletions
--- a/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldTypeResolver.java
+++ b/spring-restdocs-core/src/main/java/org/springframework/restdocs/payload/JsonFieldTypeResolver.java
@@ -38,7 +38,7 @@ class JsonFieldTypeResolver {
 				if (commonType == null) {
 					commonType = fieldType;
 				}
-				else if (fieldType != commonType) {
+				else if (fieldType != commonType && fieldType != JsonFieldType.NULL) {
 					return JsonFieldType.VARIES;
 				}
 			}