feat: merge branch 'master' of https://github.com/google/gson into google-master

Author: DanySK

src/main/java/com/google/gson/extras/examples/rawcollections/RawCollectionsExample.java

@@ -45,8 +45,7 @@ public static void main(String[] args) {
     collection.add(new Event("GREETINGS", "guest"));
     String json = gson.toJson(collection);
     System.out.println("Using Gson.toJson() on a raw collection: " + json);
-    JsonParser parser = new JsonParser();
-    JsonArray array = parser.parse(json).getAsJsonArray();
+    JsonArray array = JsonParser.parseString(json).getAsJsonArray();
     String message = gson.fromJson(array.get(0), String.class);
     int number = gson.fromJson(array.get(1), int.class);
     Event event = gson.fromJson(array.get(2), Event.class);

src/main/java/com/google/gson/graph/GraphAdapterBuilder.java

@@ -52,6 +52,7 @@ public GraphAdapterBuilder() {
   public GraphAdapterBuilder addType(Type type) {
     final ObjectConstructor<?> objectConstructor = constructorConstructor.get(TypeToken.get(type));
     InstanceCreator<Object> instanceCreator = new InstanceCreator<Object>() {
+      @Override
       public Object createInstance(Type type) {
         return objectConstructor.construct();
       }
@@ -83,6 +84,7 @@ static class Factory implements TypeAdapterFactory, InstanceCreator {
       this.instanceCreators = instanceCreators;
     }
 
+    @Override
     public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
       if (!instanceCreators.containsKey(type.getType())) {
         return null;
@@ -212,6 +214,7 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
      * that is only when we've called back into Gson to deserialize a tree.
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Object createInstance(Type type) {
       Graph graph = graphThreadLocal.get();
       if (graph == null || graph.nextCreate == null) {

src/main/java/com/google/gson/interceptors/Intercept.java

@@ -28,8 +28,8 @@
  * after it has been deserialized from Json.
  * Here is an example of how this annotation is used:
  * <p>Here is an example of how this annotation is used:
- * <p><pre>
- * &#64Intercept(postDeserialize=UserValidator.class)
+ * <pre>
+ * &#64;Intercept(postDeserialize=UserValidator.class)
  * public class User {
  *   String name;
  *   String password;
@@ -47,7 +47,7 @@
  *     }
  *   }
  * }
- * </pre></p>
+ * </pre>
  *
  * @author Inderjeet Singh
  */

src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java

@@ -27,7 +27,6 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
-import com.google.gson.internal.Streams;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -204,11 +203,13 @@ public RuntimeTypeAdapterFactory<T> registerSubtype(Class<? extends T> type) {
     return registerSubtype(type, type.getSimpleName());
   }
 
+  @Override
   public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
     if (type.getRawType() != baseType) {
       return null;
     }
 
+    final TypeAdapter<JsonElement> jsonElementAdapter = gson.getAdapter(JsonElement.class);
     final Map<String, TypeAdapter<?>> labelToDelegate
         = new LinkedHashMap<String, TypeAdapter<?>>();
     final Map<Class<?>, TypeAdapter<?>> subtypeToDelegate
@@ -221,7 +222,7 @@ public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
 
     return new TypeAdapter<R>() {
       @Override public R read(JsonReader in) throws IOException {
-        JsonElement jsonElement = Streams.parse(in);
+        JsonElement jsonElement = jsonElementAdapter.read(in);
         JsonElement labelJsonElement;
         if (maintainType) {
             labelJsonElement = jsonElement.getAsJsonObject().get(typeFieldName);
@@ -255,7 +256,7 @@ public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
         JsonObject jsonObject = delegate.toJsonTree(value).getAsJsonObject();
 
         if (maintainType) {
-          Streams.write(jsonObject, out);
+          jsonElementAdapter.write(out, jsonObject);
           return;
         }
 
@@ -270,7 +271,7 @@ public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
         for (Map.Entry<String, JsonElement> e : jsonObject.entrySet()) {
           clone.add(e.getKey(), e.getValue());
         }
-        Streams.write(clone, out);
+        jsonElementAdapter.write(out, clone);
       }
     }.nullSafe();
   }

src/test/java/com/google/gson/graph/GraphAdapterBuilderTest.java

@@ -16,16 +16,22 @@
 
 package com.google.gson.graph;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import junit.framework.TestCase;
 
-public final class GraphAdapterBuilderTest extends TestCase {
+import org.junit.Test;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+
+public final class GraphAdapterBuilderTest {
+  @Test
   public void testSerialization() {
     Roshambo rock = new Roshambo("ROCK");
     Roshambo scissors = new Roshambo("SCISSORS");
@@ -46,6 +52,7 @@ public void testSerialization() {
         gson.toJson(rock).replace('"', '\''));
   }
 
+  @Test
   public void testDeserialization() {
     String json = "{'0x1':{'name':'ROCK','beats':'0x2'}," +
         "'0x2':{'name':'SCISSORS','beats':'0x3'}," +
@@ -66,6 +73,7 @@ public void testDeserialization() {
     assertSame(rock, paper.beats);
   }
 
+  @Test
   public void testSerializationDirectSelfReference() {
     Roshambo suicide = new Roshambo("SUICIDE");
     suicide.beats = suicide;
@@ -87,6 +95,7 @@ public void testSerializationDirectSelfReference() {
 //        gson.toJson(suicide).replace('"', '\''));
   }
 
+  @Test
   public void testDeserializationDirectSelfReference() {
     String json = "{'0x1':{'name':'SUICIDE','beats':'0x1'}}";
 
@@ -101,6 +110,7 @@ public void testDeserializationDirectSelfReference() {
     assertSame(suicide, suicide.beats);
   }
 
+  @Test
   public void testSerializeListOfLists() {
     Type listOfListsType = new TypeToken<List<List<?>>>() {}.getType();
     Type listOfAnyType = new TypeToken<List<?>>() {}.getType();
@@ -120,6 +130,7 @@ public void testSerializeListOfLists() {
     assertEquals("{'0x1':['0x1','0x2'],'0x2':[]}", json.replace('"', '\''));
   }
 
+  @Test
   public void testDeserializeListOfLists() {
     Type listOfAnyType = new TypeToken<List<?>>() {}.getType();
     Type listOfListsType = new TypeToken<List<List<?>>>() {}.getType();
@@ -137,6 +148,7 @@ public void testDeserializeListOfLists() {
     assertEquals(Collections.emptyList(), listOfLists.get(1));
   }
 
+  @Test
   public void testSerializationWithMultipleTypes() {
     Company google = new Company("Google");
     new Employee("Jesse", google);
@@ -155,6 +167,7 @@ public void testSerializationWithMultipleTypes() {
         gson.toJson(google).replace('"', '\''));
   }
 
+  @Test
   public void testDeserializationWithMultipleTypes() {
     GsonBuilder gsonBuilder = new GsonBuilder();
     new GraphAdapterBuilder()