diff --git a/gson/pom.xml b/gson/pom.xml index bbf4032a..fb65548b 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -4,7 +4,7 @@ com.google.code.gson gson jar - 1.5 + 1.6 2008 Gson http://code.google.com/p/google-gson/ diff --git a/gson/src/main/java/com/google/gson/GsonBuilder.java b/gson/src/main/java/com/google/gson/GsonBuilder.java index b896ce8c..ecb8d8cd 100644 --- a/gson/src/main/java/com/google/gson/GsonBuilder.java +++ b/gson/src/main/java/com/google/gson/GsonBuilder.java @@ -429,9 +429,9 @@ public final class GsonBuilder { * @param typeAdapter This object must implement at least one of the {@link InstanceCreator}, * {@link JsonSerializer}, and a {@link JsonDeserializer} interfaces. * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern - * @since 1.5 + * @since 1.6 */ - GsonBuilder registerTypeHierarchyAdapter(Class baseType, Object typeAdapter) { + public GsonBuilder registerTypeHierarchyAdapter(Class baseType, Object typeAdapter) { Preconditions.checkArgument(typeAdapter instanceof JsonSerializer || typeAdapter instanceof JsonDeserializer || typeAdapter instanceof InstanceCreator); if (typeAdapter instanceof InstanceCreator) { diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java index df788c08..1a6811c4 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonReader.java +++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java @@ -179,8 +179,9 @@ import java.util.List; * *

Each {@code JsonReader} may be used to read a single JSON stream. Instances * of this class are not thread safe. - * + * * @author Jesse Wilson + * @since 1.6 */ public final class JsonReader implements Closeable { diff --git a/gson/src/main/java/com/google/gson/stream/JsonScope.java b/gson/src/main/java/com/google/gson/stream/JsonScope.java index 5fea655e..bb11d020 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonScope.java +++ b/gson/src/main/java/com/google/gson/stream/JsonScope.java @@ -20,6 +20,7 @@ package com.google.gson.stream; * Lexical scoping elements within a JSON reader or writer. * * @author Jesse Wilson + * @since 1.6 */ enum JsonScope { diff --git a/gson/src/main/java/com/google/gson/stream/JsonToken.java b/gson/src/main/java/com/google/gson/stream/JsonToken.java index 5ab39345..144686f6 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonToken.java +++ b/gson/src/main/java/com/google/gson/stream/JsonToken.java @@ -20,6 +20,7 @@ package com.google.gson.stream; * A structure, name or value type in a JSON-encoded string. * * @author Jesse Wilson + * @since 1.6 */ public enum JsonToken { diff --git a/gson/src/main/java/com/google/gson/stream/JsonWriter.java b/gson/src/main/java/com/google/gson/stream/JsonWriter.java index bace4399..dba653a1 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonWriter.java +++ b/gson/src/main/java/com/google/gson/stream/JsonWriter.java @@ -116,8 +116,9 @@ import java.util.List; *

Each {@code JsonWriter} may be used to write a single JSON stream. * Instances of this class are not thread safe. Calls that would result in a * malformed JSON string will fail with an {@link IllegalStateException}. - * + * * @author Jesse Wilson + * @since 1.6 */ public final class JsonWriter implements Closeable {