From d4a1e49e463091ed3793930815fde75bb766d030 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Sun, 1 Jan 2012 12:42:48 +0000 Subject: [PATCH] Delete some obsolete TODOs --- .../internal/bind/CollectionTypeAdapterFactory.java | 2 +- .../internal/bind/ReflectiveTypeAdapterFactory.java | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java index d1bed753..f513d1e5 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapterFactory.java @@ -87,7 +87,7 @@ public final class CollectionTypeAdapterFactory implements TypeAdapterFactory { public void write(JsonWriter out, Collection collection) throws IOException { if (collection == null) { - out.nullValue(); // TODO: better policy here? + out.nullValue(); return; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java index b95e6552..7823b9f5 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java @@ -153,8 +153,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapterFactory { this.boundFields = boundFields; } - @Override - public T read(JsonReader in) throws IOException { + @Override public T read(JsonReader in) throws IOException { if (in.peek() == JsonToken.NULL) { in.nextNull(); return null; @@ -162,15 +161,12 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapterFactory { T instance = constructor.construct(); - // TODO: null out the other fields? - try { in.beginObject(); while (in.hasNext()) { String name = in.nextName(); BoundField field = boundFields.get(name); if (field == null || !field.deserialized) { - // TODO: define a better policy in.skipValue(); } else { field.read(in, instance); @@ -185,10 +181,9 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapterFactory { return instance; } - @Override - public void write(JsonWriter out, T value) throws IOException { + @Override public void write(JsonWriter out, T value) throws IOException { if (value == null) { - out.nullValue(); // TODO: better policy here? + out.nullValue(); return; }