Skip to content

JacksonAutoConfiguration should retain modules registered in Jackson2ObjectMapperBuilderCustomizer with higher precedence rather than overwriting them #42836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

JacksonAutoConfiguration should retain modules registered in Jackson2ObjectMapperBuilderCustomizer with higher precedence rather than overwriting them #42836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rc/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -306,7 +306,7 @@ private Field findPropertyNamingStrategyField(String fieldName) {
}

private void configureModules(Jackson2ObjectMapperBuilder builder) {
builder.modulesToInstall(this.modules.toArray(new Module[0]));
builder.modulesToInstall((modules) -> modules.addAll(this.modules));
}

private void configureLocale(Jackson2ObjectMapperBuilder builder) {
Expand Down
23 changes: 23 additions & 0 deletions ...st/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Primary;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -324,6 +326,16 @@ void moduleBeansAndWellKnownModulesAreRegisteredWithTheObjectMapperBuilder() {
});
}

@Test
void customModulesRegisteredByBuilderCustomizerWithHighestPrecedenceShouldBeRetained() {
this.contextRunner.withUserConfiguration(ModuleConfig.class, CustomModuleBuilderCustomizerConfig.class)
.run((context) -> {
ObjectMapper objectMapper = context.getBean(Jackson2ObjectMapperBuilder.class).build();
assertThat(context.getBean(CustomModule.class).getOwners()).contains(objectMapper);
assertThat(objectMapper.getRegisteredModuleIds()).contains("customizer-module");
});
}

@Test
void defaultSerializationInclusion() {
this.contextRunner.run((context) -> {
Expand Down Expand Up @@ -592,6 +604,17 @@ Jackson2ObjectMapperBuilderCustomizer customDateFormat() {

}

@Configuration(proxyBeanMethods = false)
static class CustomModuleBuilderCustomizerConfig {

@Bean
@Order(Ordered.HIGHEST_PRECEDENCE)
Jackson2ObjectMapperBuilderCustomizer customModuleCustomizer() {
return (builder) -> builder.modulesToInstall(new SimpleModule("customizer-module"));
}

}

@Configuration(proxyBeanMethods = false)
static class ObjectMapperBuilderConsumerConfig {

Expand Down