Merge branch '2.7.x'

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyJsonComponent.java

@@ -36,8 +36,10 @@ public static class Serializer extends JsonSerializer<MyObject> {
 
 		@Override
 		public void serialize(MyObject value, JsonGenerator jgen, SerializerProvider serializers) throws IOException {
+			jgen.writeStartObject();
 			jgen.writeStringField("name", value.getName());
 			jgen.writeNumberField("age", value.getAge());
+			jgen.writeEndObject();
 		}
 
 	}