Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify JacksonAutoConfiguration as we now require Jackson 2.14

Browse Source 
See gh-33086
This commit is contained in:
Andy Wilkinson
2022-11-09 17:31:04 +00:00
parent fcbc7dacf1
commit 70f7258341
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View File

@@ -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) {

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
View File

@@ -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) {