Commit 4d1717f

liucheng.zhangsnicoll

liucheng.zhang

authored and

committed

Disable nulls serialization when serialize-nulls property is false

1 parent 877a47f commit 4d1717fCopy full SHA for 4d1717f

File tree

+14

-4

lines changed

spring-boot-project/spring-boot-autoconfigure/src
- main/java/org/springframework/boot/autoconfigure/gson
  - GsonAutoConfiguration.java
- test/java/org/springframework/boot/autoconfigure/gson
  - GsonAutoConfigurationTests.java

+14

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2018 the original author or authors.`
	`2`	`+ * Copyright 2012-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -84,7 +84,8 @@ public void customize(GsonBuilder builder) {`
`84`	`84`	`.toCall(builder::generateNonExecutableJson);`
`85`	`85`	`map.from(properties::getExcludeFieldsWithoutExposeAnnotation)`
`86`	`86`	`.toCall(builder::excludeFieldsWithoutExposeAnnotation);`
`87`		`- map.from(properties::getSerializeNulls).toCall(builder::serializeNulls);`
	`87`	`+ map.from(properties::getSerializeNulls).whenTrue()`
	`88`	`+ .toCall(builder::serializeNulls);`
`88`	`89`	`map.from(properties::getEnableComplexMapKeySerialization)`
`89`	`90`	`.toCall(builder::enableComplexMapKeySerialization);`
`90`	`91`	`map.from(properties::getDisableInnerClassSerialization)`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2018 the original author or authors.`
	`2`	`+ * Copyright 2012-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -81,14 +81,23 @@ public void excludeFieldsWithoutExposeAnnotation() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Test`
`84`		`- public void serializeNulls() {`
	`84`	`+ public void serializeNullsTrue() {`
`85`	`85`	`this.contextRunner.withPropertyValues("spring.gson.serialize-nulls:true")`
`86`	`86`	`.run((context) -> {`
`87`	`87`	`Gson gson = context.getBean(Gson.class);`
`88`	`88`	`assertThat(gson.serializeNulls()).isTrue();`
`89`	`89`	`});`
`90`	`90`	`}`
`91`	`91`
	`92`	`+ @Test`
	`93`	`+ public void serializeNullsFalse() {`
	`94`	`+ this.contextRunner.withPropertyValues("spring.gson.serialize-nulls:false")`
	`95`	`+ .run((context) -> {`
	`96`	`+ Gson gson = context.getBean(Gson.class);`
	`97`	`+ assertThat(gson.serializeNulls()).isFalse();`
	`98`	`+ });`
	`99`	`+ }`
	`100`	`+`
`92`	`101`	`@Test`
`93`	`102`	`public void enableComplexMapKeySerialization() {`
`94`	`103`	`this.contextRunner`

Comments

(0)