From eaa4d900ebd38f6b99223f3f2b740310a0927519 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 29 Oct 2015 15:40:01 +0000 Subject: [PATCH] Update auto-configured ParameterNamesModule to use DEFAULT creator mode The PROPERTIES creator mode has the unfortunate side-effect of stopping mixins from working. This commit updates the auto-configured module to use the DEFAULT creator mode instead. Closes gh-4336 --- .../boot/autoconfigure/jackson/JacksonAutoConfiguration.java | 2 +- .../autoconfigure/jackson/JacksonAutoConfigurationTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index 03c00b6e76..25854db55a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -143,7 +143,7 @@ public class JacksonAutoConfiguration { @Bean @ConditionalOnMissingBean(ParameterNamesModule.class) public ParameterNamesModule parameterNamesModule() { - return new ParameterNamesModule(JsonCreator.Mode.PROPERTIES); + return new ParameterNamesModule(JsonCreator.Mode.DEFAULT); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index dd8c1a8cf6..afcf26b7ee 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -413,7 +413,7 @@ public class JacksonAutoConfigurationTests { @Test public void parameterNamesModuleIsAutoConfigured() { - assertParameterNamesModuleCreatorBinding(Mode.PROPERTIES, + assertParameterNamesModuleCreatorBinding(Mode.DEFAULT, JacksonAutoConfiguration.class); }