Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
1f63b82c
Commit
1f63b82c
authored
Dec 09, 2020
by
Valery Yatsynovich
Committed by
Stephane Nicoll
Dec 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Jackson 2.12.0
See gh-24415
parent
5fe5dc48
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
10 deletions
+12
-10
JacksonAutoConfiguration.java
.../boot/autoconfigure/jackson/JacksonAutoConfiguration.java
+3
-2
JacksonProperties.java
...amework/boot/autoconfigure/jackson/JacksonProperties.java
+1
-1
JacksonAutoConfigurationTests.java
.../autoconfigure/jackson/JacksonAutoConfigurationTests.java
+2
-2
build.gradle
spring-boot-project/spring-boot-dependencies/build.gradle
+1
-1
SharedObjectMapper.java
...work/boot/buildpack/platform/json/SharedObjectMapper.java
+2
-2
SharedObjectMapperTests.java
...boot/buildpack/platform/json/SharedObjectMapperTests.java
+3
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java
View file @
1f63b82c
...
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
...
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import
com.fasterxml.jackson.annotation.PropertyAccessor
;
import
com.fasterxml.jackson.annotation.PropertyAccessor
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategies
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
...
@@ -257,10 +258,10 @@ public class JacksonAutoConfiguration {
...
@@ -257,10 +258,10 @@ public class JacksonAutoConfiguration {
private
void
configurePropertyNamingStrategyField
(
Jackson2ObjectMapperBuilder
builder
,
String
fieldName
)
{
private
void
configurePropertyNamingStrategyField
(
Jackson2ObjectMapperBuilder
builder
,
String
fieldName
)
{
// Find the field (this way we automatically support new constants
// Find the field (this way we automatically support new constants
// that may be added by Jackson in the future)
// that may be added by Jackson in the future)
Field
field
=
ReflectionUtils
.
findField
(
PropertyNamingStrateg
y
.
class
,
fieldName
,
Field
field
=
ReflectionUtils
.
findField
(
PropertyNamingStrateg
ies
.
class
,
fieldName
,
PropertyNamingStrategy
.
class
);
PropertyNamingStrategy
.
class
);
Assert
.
notNull
(
field
,
()
->
"Constant named '"
+
fieldName
+
"' not found on "
Assert
.
notNull
(
field
,
()
->
"Constant named '"
+
fieldName
+
"' not found on "
+
PropertyNamingStrateg
y
.
class
.
getName
());
+
PropertyNamingStrateg
ies
.
class
.
getName
());
try
{
try
{
builder
.
propertyNamingStrategy
((
PropertyNamingStrategy
)
field
.
get
(
null
));
builder
.
propertyNamingStrategy
((
PropertyNamingStrategy
)
field
.
get
(
null
));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
View file @
1f63b82c
...
@@ -50,7 +50,7 @@ public class JacksonProperties {
...
@@ -50,7 +50,7 @@ public class JacksonProperties {
private
String
dateFormat
;
private
String
dateFormat
;
/**
/**
* One of the constants on Jackson's PropertyNamingStrateg
y
. Can also be a
* One of the constants on Jackson's PropertyNamingStrateg
ies
. Can also be a
* fully-qualified class name of a PropertyNamingStrategy subclass.
* fully-qualified class name of a PropertyNamingStrategy subclass.
*/
*/
private
String
propertyNamingStrategy
;
private
String
propertyNamingStrategy
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
View file @
1f63b82c
...
@@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
...
@@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.JsonSerializer;
import
com.fasterxml.jackson.databind.MapperFeature
;
import
com.fasterxml.jackson.databind.MapperFeature
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.Module
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrateg
y
.SnakeCaseStrategy
;
import
com.fasterxml.jackson.databind.PropertyNamingStrateg
ies
.SnakeCaseStrategy
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.SerializerProvider
;
import
com.fasterxml.jackson.databind.SerializerProvider
;
import
com.fasterxml.jackson.databind.module.SimpleModule
;
import
com.fasterxml.jackson.databind.module.SimpleModule
;
...
@@ -132,7 +132,7 @@ class JacksonAutoConfigurationTests {
...
@@ -132,7 +132,7 @@ class JacksonAutoConfigurationTests {
@Test
@Test
void
customPropertyNamingStrategyClass
()
{
void
customPropertyNamingStrategyClass
()
{
this
.
contextRunner
.
withPropertyValues
(
this
.
contextRunner
.
withPropertyValues
(
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrateg
y
.SnakeCaseStrategy"
)
"spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrateg
ies
.SnakeCaseStrategy"
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
ObjectMapper
mapper
=
context
.
getBean
(
ObjectMapper
.
class
);
ObjectMapper
mapper
=
context
.
getBean
(
ObjectMapper
.
class
);
assertThat
(
mapper
.
getPropertyNamingStrategy
()).
isInstanceOf
(
SnakeCaseStrategy
.
class
);
assertThat
(
mapper
.
getPropertyNamingStrategy
()).
isInstanceOf
(
SnakeCaseStrategy
.
class
);
...
...
spring-boot-project/spring-boot-dependencies/build.gradle
View file @
1f63b82c
...
@@ -493,7 +493,7 @@ bom {
...
@@ -493,7 +493,7 @@ bom {
]
]
}
}
}
}
library
(
"Jackson Bom"
,
"2.1
1.3
"
)
{
library
(
"Jackson Bom"
,
"2.1
2.0
"
)
{
group
(
"com.fasterxml.jackson"
)
{
group
(
"com.fasterxml.jackson"
)
{
imports
=
[
imports
=
[
"jackson-bom"
"jackson-bom"
...
...
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapper.java
View file @
1f63b82c
...
@@ -18,7 +18,7 @@ package org.springframework.boot.buildpack.platform.json;
...
@@ -18,7 +18,7 @@ package org.springframework.boot.buildpack.platform.json;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrateg
y
;
import
com.fasterxml.jackson.databind.PropertyNamingStrateg
ies
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
...
@@ -37,7 +37,7 @@ public final class SharedObjectMapper {
...
@@ -37,7 +37,7 @@ public final class SharedObjectMapper {
objectMapper
.
registerModule
(
new
ParameterNamesModule
());
objectMapper
.
registerModule
(
new
ParameterNamesModule
());
objectMapper
.
enable
(
SerializationFeature
.
INDENT_OUTPUT
);
objectMapper
.
enable
(
SerializationFeature
.
INDENT_OUTPUT
);
objectMapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
);
objectMapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
false
);
objectMapper
.
setPropertyNamingStrategy
(
PropertyNamingStrateg
y
.
LOWER_CAMEL_CASE
);
objectMapper
.
setPropertyNamingStrategy
(
PropertyNamingStrateg
ies
.
LOWER_CAMEL_CASE
);
INSTANCE
=
objectMapper
;
INSTANCE
=
objectMapper
;
}
}
...
...
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/json/SharedObjectMapperTests.java
View file @
1f63b82c
...
@@ -18,6 +18,7 @@ package org.springframework.boot.buildpack.platform.json;
...
@@ -18,6 +18,7 @@ package org.springframework.boot.buildpack.platform.json;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategies
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.PropertyNamingStrategy
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
import
com.fasterxml.jackson.module.paramnames.ParameterNamesModule
;
...
@@ -42,9 +43,9 @@ class SharedObjectMapperTests {
...
@@ -42,9 +43,9 @@ class SharedObjectMapperTests {
assertThat
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
assertThat
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
.
enabledIn
(
mapper
.
getDeserializationConfig
().
getDeserializationFeatures
())).
isFalse
();
.
enabledIn
(
mapper
.
getDeserializationConfig
().
getDeserializationFeatures
())).
isFalse
();
assertThat
(
mapper
.
getSerializationConfig
().
getPropertyNamingStrategy
())
assertThat
(
mapper
.
getSerializationConfig
().
getPropertyNamingStrategy
())
.
isEqualTo
(
PropertyNamingStrateg
y
.
LOWER_CAMEL_CASE
);
.
isEqualTo
(
PropertyNamingStrateg
ies
.
LOWER_CAMEL_CASE
);
assertThat
(
mapper
.
getDeserializationConfig
().
getPropertyNamingStrategy
())
assertThat
(
mapper
.
getDeserializationConfig
().
getPropertyNamingStrategy
())
.
isEqualTo
(
PropertyNamingStrateg
y
.
LOWER_CAMEL_CASE
);
.
isEqualTo
(
PropertyNamingStrateg
ies
.
LOWER_CAMEL_CASE
);
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment