Commit 6cee5fea authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #16332 from zhanglc

* pr/16332:
  Disable nulls serialization when serialize-nulls property is false
parents 877a47f2 4d1717f1
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -84,7 +84,8 @@ public class GsonAutoConfiguration {
.toCall(builder::generateNonExecutableJson);
map.from(properties::getExcludeFieldsWithoutExposeAnnotation)
.toCall(builder::excludeFieldsWithoutExposeAnnotation);
map.from(properties::getSerializeNulls).toCall(builder::serializeNulls);
map.from(properties::getSerializeNulls).whenTrue()
.toCall(builder::serializeNulls);
map.from(properties::getEnableComplexMapKeySerialization)
.toCall(builder::enableComplexMapKeySerialization);
map.from(properties::getDisableInnerClassSerialization)
......
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -81,7 +81,7 @@ public class GsonAutoConfigurationTests {
}
@Test
public void serializeNulls() {
public void serializeNullsTrue() {
this.contextRunner.withPropertyValues("spring.gson.serialize-nulls:true")
.run((context) -> {
Gson gson = context.getBean(Gson.class);
......@@ -89,6 +89,15 @@ public class GsonAutoConfigurationTests {
});
}
@Test
public void serializeNullsFalse() {
this.contextRunner.withPropertyValues("spring.gson.serialize-nulls:false")
.run((context) -> {
Gson gson = context.getBean(Gson.class);
assertThat(gson.serializeNulls()).isFalse();
});
}
@Test
public void enableComplexMapKeySerialization() {
this.contextRunner
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment