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

A few minor fixes and one incompatible Java 1.6 API call.

Browse Source
This commit is contained in:
Joel Leitch 2011-09-16 04:55:52 +00:00
parent 6b2c275b5c
commit b90b43ea47
5 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gson/src/main/java/com/google/gson/DefaultTypeAdapters.java
View File

@ -17,6 +17,7 @@
package com.google.gson; package com.google.gson;
import com.google.gson.internal.ParameterizedTypeHandlerMap; import com.google.gson.internal.ParameterizedTypeHandlerMap;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.sql.Time; import java.sql.Time;
import java.sql.Timestamp; import java.sql.Timestamp;
@ -126,7 +127,6 @@ final class DefaultTypeAdapters {
return map; return map;
} }
@SuppressWarnings("unchecked")
private static ParameterizedTypeHandlerMap<InstanceCreator<?>> createDefaultInstanceCreators() { private static ParameterizedTypeHandlerMap<InstanceCreator<?>> createDefaultInstanceCreators() {
ParameterizedTypeHandlerMap<InstanceCreator<?>> map ParameterizedTypeHandlerMap<InstanceCreator<?>> map
= new ParameterizedTypeHandlerMap<InstanceCreator<?>>(); = new ParameterizedTypeHandlerMap<InstanceCreator<?>>();

24
gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
View File

@ -18,13 +18,14 @@ package com.google.gson.internal.bind;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
import com.google.gson.internal.$Gson$Types; import com.google.gson.internal.$Gson$Types;
import com.google.gson.internal.ConstructorConstructor;
import com.google.gson.internal.ObjectConstructor; import com.google.gson.internal.ObjectConstructor;
import com.google.gson.internal.Primitives; import com.google.gson.internal.Primitives;
import com.google.gson.internal.ConstructorConstructor;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.AccessibleObject; import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -154,7 +155,7 @@ public class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory {
this.boundFields = boundFields; this.boundFields = boundFields;
} }
@SuppressWarnings("unchecked") // the '? super T' is a raw T (the only kind we can construct) @Override
public T read(JsonReader reader) throws IOException { public T read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -180,12 +181,13 @@ public class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory {
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
throw new JsonSyntaxException(e); throw new JsonSyntaxException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
throw new AssertionError(); throw new AssertionError(e);
} }
reader.endObject(); reader.endObject();
return instance; return instance;
} }
@Override
public void write(JsonWriter writer, T value) throws IOException { public void write(JsonWriter writer, T value) throws IOException {
if (value == null) { if (value == null) {
writer.nullValue(); // TODO: better policy here? writer.nullValue(); // TODO: better policy here?
@ -193,14 +195,14 @@ public class ReflectiveTypeAdapterFactory implements TypeAdapter.Factory {
} }
// TODO: GSON includes subclass fields during serialization // TODO: GSON includes subclass fields during serialization
if (false) { // if (false) {
Class<?> runtimeType = value.getClass(); // Class<?> runtimeType = value.getClass();
if (runtimeType != type.getRawType()) { // if (runtimeType != type.getRawType()) {
TypeAdapter<?> adapter = context.getAdapter(runtimeType); // TypeAdapter<?> adapter = context.getAdapter(runtimeType);
((TypeAdapter) adapter).write(writer, value); // ((TypeAdapter) adapter).write(writer, value);
return; // return;
} // }
} // }
writer.beginObject(); writer.beginObject();
try { try {

34
gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
View File

@ -16,11 +16,13 @@
package com.google.gson.internal.bind; package com.google.gson.internal.bind;
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URI; import java.net.URI;
@ -37,6 +39,7 @@ public final class TypeAdapters {
private TypeAdapters() {} private TypeAdapters() {}
public static final TypeAdapter<Boolean> BOOLEAN = new TypeAdapter<Boolean>() { public static final TypeAdapter<Boolean> BOOLEAN = new TypeAdapter<Boolean>() {
@Override
public Boolean read(JsonReader reader) throws IOException { public Boolean read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -44,6 +47,7 @@ public final class TypeAdapters {
} }
return reader.nextBoolean(); return reader.nextBoolean();
} }
@Override
public void write(JsonWriter writer, Boolean value) throws IOException { public void write(JsonWriter writer, Boolean value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -53,6 +57,7 @@ public final class TypeAdapters {
= newFactory(boolean.class, Boolean.class, BOOLEAN); = newFactory(boolean.class, Boolean.class, BOOLEAN);
public static final TypeAdapter<Number> BYTE = new TypeAdapter<Number>() { public static final TypeAdapter<Number> BYTE = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -65,6 +70,7 @@ public final class TypeAdapters {
throw new JsonSyntaxException(e); throw new JsonSyntaxException(e);
} }
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -74,6 +80,7 @@ public final class TypeAdapters {
= newFactory(byte.class, Byte.class, BYTE); = newFactory(byte.class, Byte.class, BYTE);
public static final TypeAdapter<Number> SHORT = new TypeAdapter<Number>() { public static final TypeAdapter<Number> SHORT = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -85,6 +92,7 @@ public final class TypeAdapters {
throw new JsonSyntaxException(e); throw new JsonSyntaxException(e);
} }
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -94,6 +102,7 @@ public final class TypeAdapters {
= newFactory(short.class, Short.class, SHORT); = newFactory(short.class, Short.class, SHORT);
public static final TypeAdapter<Number> INTEGER = new TypeAdapter<Number>() { public static final TypeAdapter<Number> INTEGER = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -105,6 +114,7 @@ public final class TypeAdapters {
throw new JsonSyntaxException(e); throw new JsonSyntaxException(e);
} }
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -114,6 +124,7 @@ public final class TypeAdapters {
= newFactory(int.class, Integer.class, INTEGER); = newFactory(int.class, Integer.class, INTEGER);
public static final TypeAdapter<Number> LONG = new TypeAdapter<Number>() { public static final TypeAdapter<Number> LONG = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -125,6 +136,7 @@ public final class TypeAdapters {
throw new JsonSyntaxException(e); throw new JsonSyntaxException(e);
} }
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -134,6 +146,7 @@ public final class TypeAdapters {
= newFactory(long.class, Long.class, LONG); = newFactory(long.class, Long.class, LONG);
public static final TypeAdapter<Number> FLOAT = new TypeAdapter<Number>() { public static final TypeAdapter<Number> FLOAT = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -141,6 +154,7 @@ public final class TypeAdapters {
} }
return (float) reader.nextDouble(); return (float) reader.nextDouble();
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -150,6 +164,7 @@ public final class TypeAdapters {
= newFactory(float.class, Float.class, FLOAT); = newFactory(float.class, Float.class, FLOAT);
public static final TypeAdapter<Number> DOUBLE = new TypeAdapter<Number>() { public static final TypeAdapter<Number> DOUBLE = new TypeAdapter<Number>() {
@Override
public Number read(JsonReader reader) throws IOException { public Number read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -157,6 +172,7 @@ public final class TypeAdapters {
} }
return reader.nextDouble(); return reader.nextDouble();
} }
@Override
public void write(JsonWriter writer, Number value) throws IOException { public void write(JsonWriter writer, Number value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -166,6 +182,7 @@ public final class TypeAdapters {
= newFactory(double.class, Double.class, DOUBLE); = newFactory(double.class, Double.class, DOUBLE);
public static final TypeAdapter<String> STRING = new TypeAdapter<String>() { public static final TypeAdapter<String> STRING = new TypeAdapter<String>() {
@Override
public String read(JsonReader reader) throws IOException { public String read(JsonReader reader) throws IOException {
JsonToken peek = reader.peek(); JsonToken peek = reader.peek();
if (peek == JsonToken.NULL) { if (peek == JsonToken.NULL) {
@ -178,6 +195,7 @@ public final class TypeAdapters {
} }
return reader.nextString(); return reader.nextString();
} }
@Override
public void write(JsonWriter writer, String value) throws IOException { public void write(JsonWriter writer, String value) throws IOException {
writer.value(value); writer.value(value);
} }
@ -186,6 +204,7 @@ public final class TypeAdapters {
public static final TypeAdapter.Factory STRING_FACTORY = newFactory(String.class, STRING); public static final TypeAdapter.Factory STRING_FACTORY = newFactory(String.class, STRING);
public static final TypeAdapter<StringBuilder> STRING_BUILDER = new TypeAdapter<StringBuilder>() { public static final TypeAdapter<StringBuilder> STRING_BUILDER = new TypeAdapter<StringBuilder>() {
@Override
public StringBuilder read(JsonReader reader) throws IOException { public StringBuilder read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -193,6 +212,7 @@ public final class TypeAdapters {
} }
return new StringBuilder(reader.nextString()); return new StringBuilder(reader.nextString());
} }
@Override
public void write(JsonWriter writer, StringBuilder value) throws IOException { public void write(JsonWriter writer, StringBuilder value) throws IOException {
writer.value(value.toString()); writer.value(value.toString());
} }
@ -202,6 +222,7 @@ public final class TypeAdapters {
newFactory(StringBuilder.class, STRING_BUILDER); newFactory(StringBuilder.class, STRING_BUILDER);
public static final TypeAdapter<StringBuffer> STRING_BUFFER = new TypeAdapter<StringBuffer>() { public static final TypeAdapter<StringBuffer> STRING_BUFFER = new TypeAdapter<StringBuffer>() {
@Override
public StringBuffer read(JsonReader reader) throws IOException { public StringBuffer read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -209,6 +230,7 @@ public final class TypeAdapters {
} }
return new StringBuffer(reader.nextString()); return new StringBuffer(reader.nextString());
} }
@Override
public void write(JsonWriter writer, StringBuffer value) throws IOException { public void write(JsonWriter writer, StringBuffer value) throws IOException {
writer.value(value.toString()); writer.value(value.toString());
} }
@ -218,6 +240,7 @@ public final class TypeAdapters {
newFactory(StringBuffer.class, STRING_BUFFER); newFactory(StringBuffer.class, STRING_BUFFER);
public static final TypeAdapter<URL> URL = new TypeAdapter<URL>() { public static final TypeAdapter<URL> URL = new TypeAdapter<URL>() {
@Override
public URL read(JsonReader reader) throws IOException { public URL read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -226,6 +249,7 @@ public final class TypeAdapters {
String nextString = reader.nextString(); String nextString = reader.nextString();
return "null".equals(nextString) ? null : new URL(nextString); return "null".equals(nextString) ? null : new URL(nextString);
} }
@Override
public void write(JsonWriter writer, URL value) throws IOException { public void write(JsonWriter writer, URL value) throws IOException {
writer.value(value == null ? null : value.toExternalForm()); writer.value(value == null ? null : value.toExternalForm());
} }
@ -234,6 +258,7 @@ public final class TypeAdapters {
public static final TypeAdapter.Factory URL_FACTORY = newFactory(URL.class, URL); public static final TypeAdapter.Factory URL_FACTORY = newFactory(URL.class, URL);
public static final TypeAdapter<URI> URI = new TypeAdapter<URI>() { public static final TypeAdapter<URI> URI = new TypeAdapter<URI>() {
@Override
public URI read(JsonReader reader) throws IOException { public URI read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -243,9 +268,10 @@ public final class TypeAdapters {
String nextString = reader.nextString(); String nextString = reader.nextString();
return "null".equals(nextString) ? null : new URI(nextString); return "null".equals(nextString) ? null : new URI(nextString);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
throw new IOException(e); throw new JsonIOException(e);
} }
} }
@Override
public void write(JsonWriter writer, URI value) throws IOException { public void write(JsonWriter writer, URI value) throws IOException {
writer.value(value == null ? null : value.toASCIIString()); writer.value(value == null ? null : value.toASCIIString());
} }
@ -254,6 +280,7 @@ public final class TypeAdapters {
public static final TypeAdapter.Factory URI_FACTORY = newFactory(URI.class, URI); public static final TypeAdapter.Factory URI_FACTORY = newFactory(URI.class, URI);
public static final TypeAdapter<InetAddress> INET_ADDRESS = new TypeAdapter<InetAddress>() { public static final TypeAdapter<InetAddress> INET_ADDRESS = new TypeAdapter<InetAddress>() {
@Override
public InetAddress read(JsonReader reader) throws IOException { public InetAddress read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -261,6 +288,7 @@ public final class TypeAdapters {
} }
return InetAddress.getByName(reader.nextString()); return InetAddress.getByName(reader.nextString());
} }
@Override
public void write(JsonWriter writer, InetAddress value) throws IOException { public void write(JsonWriter writer, InetAddress value) throws IOException {
writer.value(value.getHostAddress()); writer.value(value.getHostAddress());
} }
@ -270,6 +298,7 @@ public final class TypeAdapters {
newTypeHierarchyFactory(InetAddress.class, INET_ADDRESS); newTypeHierarchyFactory(InetAddress.class, INET_ADDRESS);
public static final TypeAdapter<UUID> UUID = new TypeAdapter<UUID>() { public static final TypeAdapter<UUID> UUID = new TypeAdapter<UUID>() {
@Override
public UUID read(JsonReader reader) throws IOException { public UUID read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -277,6 +306,7 @@ public final class TypeAdapters {
} }
return java.util.UUID.fromString(reader.nextString()); return java.util.UUID.fromString(reader.nextString());
} }
@Override
public void write(JsonWriter writer, UUID value) throws IOException { public void write(JsonWriter writer, UUID value) throws IOException {
writer.value(value.toString()); writer.value(value.toString());
} }
@ -285,6 +315,7 @@ public final class TypeAdapters {
public static final TypeAdapter.Factory UUID_FACTORY = newFactory(UUID.class, UUID); public static final TypeAdapter.Factory UUID_FACTORY = newFactory(UUID.class, UUID);
public static final TypeAdapter<Locale> LOCALE = new TypeAdapter<Locale>() { public static final TypeAdapter<Locale> LOCALE = new TypeAdapter<Locale>() {
@Override
public Locale read(JsonReader reader) throws IOException { public Locale read(JsonReader reader) throws IOException {
if (reader.peek() == JsonToken.NULL) { if (reader.peek() == JsonToken.NULL) {
reader.nextNull(); // TODO: does this belong here? reader.nextNull(); // TODO: does this belong here?
@ -312,6 +343,7 @@ public final class TypeAdapters {
return new Locale(language, country, variant); return new Locale(language, country, variant);
} }
} }
@Override
public void write(JsonWriter writer, Locale value) throws IOException { public void write(JsonWriter writer, Locale value) throws IOException {
writer.value(value.toString()); writer.value(value.toString());
} }

1
gson/src/test/java/com/google/gson/functional/ArrayTest.java
View File

@ -22,7 +22,6 @@ import com.google.gson.JsonParseException;
import com.google.gson.common.MoreAsserts; import com.google.gson.common.MoreAsserts;
import com.google.gson.common.TestTypes.BagOfPrimitives; import com.google.gson.common.TestTypes.BagOfPrimitives;
import com.google.gson.common.TestTypes.ClassWithObjects; import com.google.gson.common.TestTypes.ClassWithObjects;
import com.google.gson.common.TestTypes.CrazyLongTypeAdapter;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import junit.framework.TestCase; import junit.framework.TestCase;

15
gson/src/test/java/com/google/gson/functional/CollectionTest.java
View File

@ -16,6 +16,13 @@
package com.google.gson.functional; package com.google.gson.functional;
import com.google.gson.Gson;
import com.google.gson.common.MoreAsserts;
import com.google.gson.common.TestTypes.BagOfPrimitives;
import com.google.gson.reflect.TypeToken;
import junit.framework.TestCase;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -28,14 +35,6 @@ import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
import junit.framework.TestCase;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import com.google.gson.common.MoreAsserts;
import com.google.gson.common.TestTypes.BagOfPrimitives;
import com.google.gson.reflect.TypeToken;
/** /**
* Functional tests for Json serialization and deserialization of collections. * Functional tests for Json serialization and deserialization of collections.
* *