Skip to content

Commit 1f63b82

Browse files
valfirstsnicoll
authored andcommitted
Upgrade to Jackson 2.12.0
See gh-24415
1 parent 5fe5dc4 commit 1f63b82

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.fasterxml.jackson.annotation.PropertyAccessor;
3333
import com.fasterxml.jackson.databind.Module;
3434
import com.fasterxml.jackson.databind.ObjectMapper;
35+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
3536
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3637
import com.fasterxml.jackson.databind.SerializationFeature;
3738
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
@@ -257,10 +258,10 @@ private void configurePropertyNamingStrategyClass(Jackson2ObjectMapperBuilder bu
257258
private void configurePropertyNamingStrategyField(Jackson2ObjectMapperBuilder builder, String fieldName) {
258259
// Find the field (this way we automatically support new constants
259260
// that may be added by Jackson in the future)
260-
Field field = ReflectionUtils.findField(PropertyNamingStrategy.class, fieldName,
261+
Field field = ReflectionUtils.findField(PropertyNamingStrategies.class, fieldName,
261262
PropertyNamingStrategy.class);
262263
Assert.notNull(field, () -> "Constant named '" + fieldName + "' not found on "
263-
+ PropertyNamingStrategy.class.getName());
264+
+ PropertyNamingStrategies.class.getName());
264265
try {
265266
builder.propertyNamingStrategy((PropertyNamingStrategy) field.get(null));
266267
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class JacksonProperties {
5050
private String dateFormat;
5151

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

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

Lines changed: 2 additions & 2 deletions
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;
@@ -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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.fasterxml.jackson.databind.DeserializationFeature;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
21+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
2122
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
2223
import com.fasterxml.jackson.databind.SerializationFeature;
2324
import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
@@ -42,9 +43,9 @@ void getReturnsConfiguredObjectMapper() {
4243
assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
4344
.enabledIn(mapper.getDeserializationConfig().getDeserializationFeatures())).isFalse();
4445
assertThat(mapper.getSerializationConfig().getPropertyNamingStrategy())
45-
.isEqualTo(PropertyNamingStrategy.LOWER_CAMEL_CASE);
46+
.isEqualTo(PropertyNamingStrategies.LOWER_CAMEL_CASE);
4647
assertThat(mapper.getDeserializationConfig().getPropertyNamingStrategy())
47-
.isEqualTo(PropertyNamingStrategy.LOWER_CAMEL_CASE);
48+
.isEqualTo(PropertyNamingStrategies.LOWER_CAMEL_CASE);
4849
}
4950

5051
}

0 commit comments

Comments
 (0)