From 70f72583410e8603d14546aeb8e6ec0321014afb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 9 Nov 2022 17:31:04 +0000 Subject: [PATCH] Simplify JacksonAutoConfiguration as we now require Jackson 2.14 See gh-33086 --- .../jackson/JacksonAutoConfiguration.java | 12 ++---------- .../jackson/JacksonAutoConfigurationTests.java | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index 32b330d1fa..dde97c57b4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -299,14 +299,8 @@ public class JacksonAutoConfiguration { } private Field findPropertyNamingStrategyField(String fieldName) { - try { - return ReflectionUtils.findField(com.fasterxml.jackson.databind.PropertyNamingStrategies.class, - fieldName, PropertyNamingStrategy.class); - } - catch (NoClassDefFoundError ex) { // Fallback pre Jackson 2.12 - return ReflectionUtils.findField(PropertyNamingStrategy.class, fieldName, - PropertyNamingStrategy.class); - } + return ReflectionUtils.findField(com.fasterxml.jackson.databind.PropertyNamingStrategies.class, + fieldName, PropertyNamingStrategy.class); } private void configureModules(Jackson2ObjectMapperBuilder builder) { @@ -364,8 +358,6 @@ public class JacksonAutoConfiguration { */ private void registerPropertyNamingStrategyHints(ReflectionHints hints) { registerPropertyNamingStrategyHints(hints, PropertyNamingStrategies.class); - // PropertyNamingStrategy is used pre Jackson 2.12 - registerPropertyNamingStrategyHints(hints, PropertyNamingStrategy.class); } private void registerPropertyNamingStrategyHints(ReflectionHints hints, Class type) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index 163a30d8f7..0cab87e316 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -41,7 +41,6 @@ import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.cfg.ConstructorDetector; @@ -468,8 +467,6 @@ class JacksonAutoConfigurationTests { void shouldRegisterPropertyNamingStrategyHints() { shouldRegisterPropertyNamingStrategyHints(PropertyNamingStrategies.class, "LOWER_CAMEL_CASE", "UPPER_CAMEL_CASE", "SNAKE_CASE", "UPPER_SNAKE_CASE", "LOWER_CASE", "KEBAB_CASE", "LOWER_DOT_CASE"); - shouldRegisterPropertyNamingStrategyHints(PropertyNamingStrategy.class, "LOWER_CAMEL_CASE", "UPPER_CAMEL_CASE", - "SNAKE_CASE", "LOWER_CASE", "KEBAB_CASE", "LOWER_DOT_CASE"); } private void shouldRegisterPropertyNamingStrategyHints(Class type, String... fieldNames) {