Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't serialize nulls in JsonElementWriter if setSerializeNulls(false)

Browse Source
This commit is contained in:
Jesse Wilson 2011-10-01 00:22:33 +00:00
parent 9b7b49bf0f
commit ed2b25ddef
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gson/src/main/java/com/google/gson/internal/bind/JsonElementWriter.java
View File

@ -71,8 +71,10 @@ public final class JsonElementWriter extends JsonWriter {
private void put(JsonElement value) {
if (pendingName != null) {
JsonObject object = (JsonObject) peek();
object.add(pendingName, value);
if (!value.isJsonNull() || getSerializeNulls()) {
JsonObject object = (JsonObject) peek();
object.add(pendingName, value);
}
pendingName = null;
} else if (stack.isEmpty()) {
product = value;

21
gson/src/test/java/com/google/gson/internal/bind/JsonElementWriterTest.java
View File

@ -23,7 +23,6 @@ public final class JsonElementWriterTest extends TestCase {
// TODO: more tests
// TODO: figure out what should be returned by an empty writer
// TODO: test when serialize nulls is false
public void testArray() throws IOException {
JsonElementWriter writer = new JsonElementWriter();
@ -97,4 +96,24 @@ public final class JsonElementWriterTest extends TestCase {
} catch (IOException expected) {
}
}
public void testSerializeNullsFalse() throws IOException {
JsonElementWriter writer = new JsonElementWriter();
writer.setSerializeNulls(false);
writer.beginObject();
writer.name("A");
writer.nullValue();
writer.endObject();
assertEquals("{}", writer.get().toString());
}
public void testSerializeNullsTrue() throws IOException {
JsonElementWriter writer = new JsonElementWriter();
writer.setSerializeNulls(true);
writer.beginObject();
writer.name("A");
writer.nullValue();
writer.endObject();
assertEquals("{\"A\":null}", writer.get().toString());
}
}