root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Allow use of JsonInclude.Value 

Closes gh-24824
This commit is contained in:
Rossen Stoyanchev 2020-05-13 11:14:28 +01:00
parent b31f2bdad2
commit e881d4b144
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
View File

@ -143,7 +143,7 @@ public class Jackson2ObjectMapperBuilder {
private TypeResolverBuilder<?> defaultTyping;
@Nullable
private JsonInclude.Include serializationInclusion;
private JsonInclude.Value serializationInclusion;
@Nullable
private FilterProvider filters;
@ -301,7 +301,16 @@ public class Jackson2ObjectMapperBuilder {
* Set a custom inclusion strategy for serialization.
* @see com.fasterxml.jackson.annotation.JsonInclude.Include
*/
public Jackson2ObjectMapperBuilder serializationInclusion(JsonInclude.Include serializationInclusion) {
public Jackson2ObjectMapperBuilder serializationInclusion(JsonInclude.Include inclusion) {
return serializationInclusion(JsonInclude.Value.construct(inclusion, inclusion));
}
/**
* Set a custom inclusion strategy for serialization.
* @since 5.3
* @see com.fasterxml.jackson.annotation.JsonInclude.Value
*/
public Jackson2ObjectMapperBuilder serializationInclusion(JsonInclude.Value serializationInclusion) {
this.serializationInclusion = serializationInclusion;
return this;
}
@ -703,7 +712,7 @@ public class Jackson2ObjectMapperBuilder {
objectMapper.setDefaultTyping(this.defaultTyping);
}
if (this.serializationInclusion != null) {
objectMapper.setSerializationInclusion(this.serializationInclusion);
objectMapper.setDefaultPropertyInclusion(this.serializationInclusion);
}
if (this.filters != null) {