Skip to content

Commit 01cfb9e

Browse files
snicollsnicoll
committed
Merge pull request #24415 from valfirst
* pr/24415: Polish "Upgrade to Jackson 2.12.0" Upgrade to Jackson 2.12.0 Closes gh-24415
2 parents 5fe5dc4 + a6c6655 commit 01cfb9e

File tree

7 files changed

+81
-15
lines changed

7 files changed

+81
-15
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

+13-4
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,8 @@ private void configurePropertyNamingStrategyClass(Jackson2ObjectMapperBuilder bu
257257
private void configurePropertyNamingStrategyField(Jackson2ObjectMapperBuilder builder, String fieldName) {
258258
// Find the field (this way we automatically support new constants
259259
// that may be added by Jackson in the future)
260-
Field field = ReflectionUtils.findField(PropertyNamingStrategy.class, fieldName,
261-
PropertyNamingStrategy.class);
262-
Assert.notNull(field, () -> "Constant named '" + fieldName + "' not found on "
263-
+ PropertyNamingStrategy.class.getName());
260+
Field field = findPropertyNamingStrategyField(fieldName);
261+
Assert.notNull(field, () -> "Constant named '" + fieldName + "' not found");
264262
try {
265263
builder.propertyNamingStrategy((PropertyNamingStrategy) field.get(null));
266264
}
@@ -269,6 +267,17 @@ private void configurePropertyNamingStrategyField(Jackson2ObjectMapperBuilder bu
269267
}
270268
}
271269

270+
private Field findPropertyNamingStrategyField(String fieldName) {
271+
try {
272+
return ReflectionUtils.findField(com.fasterxml.jackson.databind.PropertyNamingStrategies.class,
273+
fieldName, PropertyNamingStrategy.class);
274+
}
275+
catch (NoClassDefFoundError ex) { // Fallback pre Jackson 2.12
276+
return ReflectionUtils.findField(PropertyNamingStrategy.class, fieldName,
277+
PropertyNamingStrategy.class);
278+
}
279+
}
280+
272281
private void configureModules(Jackson2ObjectMapperBuilder builder) {
273282
Collection<Module> moduleBeans = getBeans(this.applicationContext, Module.class);
274283
builder.modulesToInstall(moduleBeans.toArray(new Module[0]));

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public class JacksonProperties {
5050
private String dateFormat;
5151

5252
/**
53-
* One of the constants on Jackson's PropertyNamingStrategy. Can also be a
54-
* fully-qualified class name of a PropertyNamingStrategy subclass.
53+
* One of the constants on Jackson's PropertyNamingStrategies. Can also be a
54+
* fully-qualified class name of a PropertyNamingStrategy implementation.
5555
*/
5656
private String propertyNamingStrategy;
5757

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/Jackson211AutoConfigurationTests.java

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright 2012-2020 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.autoconfigure.jackson;
18+
19+
import com.fasterxml.jackson.databind.ObjectMapper;
20+
import org.junit.jupiter.api.Test;
21+
22+
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
23+
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
24+
25+
import static org.assertj.core.api.Assertions.assertThat;
26+
27+
/**
28+
* Tests for {@link JacksonAutoConfiguration} using Jackson 2.11.x
29+
*
30+
* @author Stephane Nicoll
31+
*/
32+
@ClassPathExclusions({ "jackson-databind*.jar", "jackson-dataformat-xml*.jar" })
33+
@ClassPathOverrides({ "com.fasterxml.jackson.core:jackson-databind:2.11.3",
34+
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.3" })
35+
public class Jackson211AutoConfigurationTests extends JacksonAutoConfigurationTests {
36+
37+
public static final String STRATEGY_CLASS_NAME = "com.fasterxml.jackson.databind.PropertyNamingStrategy$SnakeCaseStrategy";
38+
39+
@Test
40+
void customPropertyNamingStrategyField() {
41+
this.contextRunner.withPropertyValues("spring.jackson.property-naming-strategy:SNAKE_CASE").run((context) -> {
42+
ObjectMapper mapper = context.getBean(ObjectMapper.class);
43+
assertThat(mapper.getPropertyNamingStrategy().getClass().getName()).isEqualTo(STRATEGY_CLASS_NAME);
44+
});
45+
}
46+
47+
@Test
48+
void customPropertyNamingStrategyClass() {
49+
this.contextRunner.withPropertyValues(
50+
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy")
51+
.run((context) -> {
52+
ObjectMapper mapper = context.getBean(ObjectMapper.class);
53+
assertThat(mapper.getPropertyNamingStrategy().getClass().getName()).isEqualTo(STRATEGY_CLASS_NAME);
54+
});
55+
}
56+
57+
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import com.fasterxml.jackson.databind.MapperFeature;
3838
import com.fasterxml.jackson.databind.Module;
3939
import com.fasterxml.jackson.databind.ObjectMapper;
40-
import com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy;
40+
import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
4141
import com.fasterxml.jackson.databind.SerializationFeature;
4242
import com.fasterxml.jackson.databind.SerializerProvider;
4343
import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -72,7 +72,7 @@
7272
*/
7373
class JacksonAutoConfigurationTests {
7474

75-
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
75+
protected final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
7676
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class));
7777

7878
@Test
@@ -132,7 +132,7 @@ void customPropertyNamingStrategyField() {
132132
@Test
133133
void customPropertyNamingStrategyClass() {
134134
this.contextRunner.withPropertyValues(
135-
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy")
135+
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy")
136136
.run((context) -> {
137137
ObjectMapper mapper = context.getBean(ObjectMapper.class);
138138
assertThat(mapper.getPropertyNamingStrategy()).isInstanceOf(SnakeCaseStrategy.class);

‎spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ bom {
493493
]
494494
}
495495
}
496-
library("Jackson Bom", "2.11.3") {
496+
library("Jackson Bom", "2.12.0") {
497497
group("com.fasterxml.jackson") {
498498
imports = [
499499
"jackson-bom"

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.fasterxml.jackson.databind.DeserializationFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
21+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2222
import com.fasterxml.jackson.databind.SerializationFeature;
2323
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
2424

@@ -37,7 +37,7 @@ public final class SharedObjectMapper {
3737
objectMapper.registerModule(new ParameterNamesModule());
3838
objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
3939
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
40-
objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.LOWER_CAMEL_CASE);
40+
objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.LOWER_CAMEL_CASE);
4141
INSTANCE = objectMapper;
4242
}
4343

‎spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapperTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.fasterxml.jackson.databind.DeserializationFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
21+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2222
import com.fasterxml.jackson.databind.SerializationFeature;
2323
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
2424
import org.junit.jupiter.api.Test;
@@ -42,9 +42,9 @@ void getReturnsConfiguredObjectMapper() {
4242
assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
4343
.enabledIn(mapper.getDeserializationConfig().getDeserializationFeatures())).isFalse();
4444
assertThat(mapper.getSerializationConfig().getPropertyNamingStrategy())
45-
.isEqualTo(PropertyNamingStrategy.LOWER_CAMEL_CASE);
45+
.isEqualTo(PropertyNamingStrategies.LOWER_CAMEL_CASE);
4646
assertThat(mapper.getDeserializationConfig().getPropertyNamingStrategy())
47-
.isEqualTo(PropertyNamingStrategy.LOWER_CAMEL_CASE);
47+
.isEqualTo(PropertyNamingStrategies.LOWER_CAMEL_CASE);
4848
}
4949

5050
}

0 commit comments

Comments
 (0)