GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-02 19:30:23 +01:00
Code Issues Projects Releases Wiki Activity

Apply default property inclusion to content

Browse Source 
Previously, the setting was only applied to values. This worked
for POJOs but had no effect on maps.

Fixes gh-48343
This commit is contained in:
Andy Wilkinson
2025-12-01 10:57:11 +00:00
parent e5928f7d5b
commit e1d85b3678
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-jackson/src/main/java/org/springframework/boot/jackson/autoconfigure/JacksonAutoConfiguration.java
+5 -3
View File
@@ -29,6 +29,7 @@ import java.util.function.BiConsumer;
import java.util.stream.Stream;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import org.jspecify.annotations.Nullable;
import tools.jackson.databind.JacksonModule;
@@ -371,9 +372,10 @@ public final class JacksonAutoConfiguration {
if (this.jacksonProperties.isFindAndAddModules()) {
builder.findAndAddModules(getClass().getClassLoader());
}
if (this.jacksonProperties.getDefaultPropertyInclusion() != null) {
builder.changeDefaultPropertyInclusion(
(handler) -> handler.withValueInclusion(this.jacksonProperties.getDefaultPropertyInclusion()));
Include propertyInclusion = this.jacksonProperties.getDefaultPropertyInclusion();
if (propertyInclusion != null) {
builder.changeDefaultPropertyInclusion((handler) -> handler.withValueInclusion(propertyInclusion)
.withContentInclusion(propertyInclusion));
}
if (this.jacksonProperties.getTimeZone() != null) {
builder.defaultTimeZone(this.jacksonProperties.getTimeZone());
module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/JacksonAutoConfigurationTests.java
+6 -2
View File
@@ -436,9 +436,11 @@ class JacksonAutoConfigurationTests {
@EnumSource
@ParameterizedTest
void defaultSerializationInclusion(MapperType mapperType) {
void defaultPropertyInclusion(MapperType mapperType) {
this.contextRunner.run((context) -> {
ObjectMapper mapper = mapperType.getMapper(context);
assertThat(mapper.serializationConfig().getDefaultPropertyInclusion().getContentInclusion())
.isEqualTo(JsonInclude.Include.USE_DEFAULTS);
assertThat(mapper.serializationConfig().getDefaultPropertyInclusion().getValueInclusion())
.isEqualTo(JsonInclude.Include.USE_DEFAULTS);
});
@@ -446,9 +448,11 @@ class JacksonAutoConfigurationTests {
@EnumSource
@ParameterizedTest
void customSerializationInclusion(MapperType mapperType) {
void customPropertyInclusion(MapperType mapperType) {
this.contextRunner.withPropertyValues("spring.jackson.default-property-inclusion:non_null").run((context) -> {
ObjectMapper mapper = mapperType.getMapper(context);
assertThat(mapper.serializationConfig().getDefaultPropertyInclusion().getContentInclusion())
.isEqualTo(JsonInclude.Include.NON_NULL);
assertThat(mapper.serializationConfig().getDefaultPropertyInclusion().getValueInclusion())
.isEqualTo(JsonInclude.Include.NON_NULL);
});