Skip to content

Commit 48b512c

Browse files
committed
Update Jackson builder to set properly AUTO_DETECT_IS_GETTERS
Issue: SPR-13073
1 parent 6a30d04 commit 48b512c

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,13 @@ public Jackson2ObjectMapperBuilder autoDetectFields(boolean autoDetectFields) {
338338

339339
/**
340340
* Shortcut for {@link MapperFeature#AUTO_DETECT_SETTERS}/
341-
* {@link MapperFeature#AUTO_DETECT_GETTERS} option.
341+
* {@link MapperFeature#AUTO_DETECT_GETTERS}/{@link MapperFeature#AUTO_DETECT_IS_GETTERS}
342+
* options.
342343
*/
343344
public Jackson2ObjectMapperBuilder autoDetectGettersSetters(boolean autoDetectGettersSetters) {
344345
this.features.put(MapperFeature.AUTO_DETECT_GETTERS, autoDetectGettersSetters);
345346
this.features.put(MapperFeature.AUTO_DETECT_SETTERS, autoDetectGettersSetters);
347+
this.features.put(MapperFeature.AUTO_DETECT_IS_GETTERS, autoDetectGettersSetters);
346348
return this;
347349
}
348350

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ public void setAutoDetectFields(boolean autoDetectFields) {
269269

270270
/**
271271
* Shortcut for {@link MapperFeature#AUTO_DETECT_SETTERS}/
272-
* {@link MapperFeature#AUTO_DETECT_GETTERS} option.
272+
* {@link MapperFeature#AUTO_DETECT_GETTERS}/{@link MapperFeature#AUTO_DETECT_IS_GETTERS}
273+
* options.
273274
*/
274275
public void setAutoDetectGettersSetters(boolean autoDetectGettersSetters) {
275276
this.builder.autoDetectGettersSetters(autoDetectGettersSetters);

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void defaultProperties() {
103103
assertFalse(objectMapper.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
104104
assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
105105
assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
106+
assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_IS_GETTERS));
106107
assertTrue(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_SETTERS));
107108
assertFalse(objectMapper.isEnabled(SerializationFeature.INDENT_OUTPUT));
108109
assertTrue(objectMapper.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS));
@@ -118,6 +119,7 @@ public void propertiesShortcut() {
118119
assertTrue(objectMapper.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
119120
assertFalse(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_FIELDS));
120121
assertFalse(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_GETTERS));
122+
assertFalse(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_IS_GETTERS));
121123
assertFalse(objectMapper.isEnabled(MapperFeature.AUTO_DETECT_SETTERS));
122124
assertTrue(objectMapper.isEnabled(SerializationFeature.INDENT_OUTPUT));
123125
assertFalse(objectMapper.isEnabled(SerializationFeature.FAIL_ON_EMPTY_BEANS));

0 commit comments

Comments
 (0)