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

renamed JsonElementReader to JsonTreeReader

This commit is contained in:
Inderjeet Singh 2011-12-03 02:37:27 +00:00
parent f3c14b4614
commit 8ee2c24f61
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gson/src/main/java/com/google/gson/Gson.java
View File

@ -25,7 +25,7 @@ import com.google.gson.internal.bind.BigDecimalTypeAdapter;
import com.google.gson.internal.bind.BigIntegerTypeAdapter;
import com.google.gson.internal.bind.CollectionTypeAdapterFactory;
import com.google.gson.internal.bind.DateTypeAdapter;
import com.google.gson.internal.bind.JsonElementReader;
import com.google.gson.internal.bind.JsonTreeReader;
import com.google.gson.internal.bind.JsonElementWriter;
import com.google.gson.internal.bind.MapTypeAdapterFactory;
import com.google.gson.internal.bind.ObjectTypeAdapter;
@ -815,7 +815,7 @@ public final class Gson {
if (json == null) {
return null;
}
return (T) fromJson(new JsonElementReader(json), typeOfT);
return (T) fromJson(new JsonTreeReader(json), typeOfT);
}
static class FutureTypeAdapter<T> extends TypeAdapter<T> {

4
gson/src/main/java/com/google/gson/TypeAdapter.java
View File

@ -16,7 +16,7 @@
package com.google.gson;
import com.google.gson.internal.bind.JsonElementReader;
import com.google.gson.internal.bind.JsonTreeReader;
import com.google.gson.internal.bind.JsonElementWriter;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
@ -71,7 +71,7 @@ public abstract class TypeAdapter<T> {
public T fromJsonTree(JsonElement json) {
try {
JsonReader jsonReader = new JsonElementReader(json);
JsonReader jsonReader = new JsonTreeReader(json);
jsonReader.setLenient(true);
return read(jsonReader);
} catch (IOException e) {

4
gson/src/main/java/com/google/gson/internal/bind/JsonElementReader.java → gson/src/main/java/com/google/gson/internal/bind/JsonTreeReader.java
View File

@ -36,7 +36,7 @@ import java.util.Map;
*
* @author Jesse Wilson
*/
public final class JsonElementReader extends JsonReader {
public final class JsonTreeReader extends JsonReader {
private static final Reader UNREADABLE_READER = new Reader() {
@Override public int read(char[] buffer, int offset, int count) throws IOException {
throw new AssertionError();
@ -49,7 +49,7 @@ public final class JsonElementReader extends JsonReader {
private final List<Object> stack = new ArrayList<Object>();
public JsonElementReader(JsonElement element) {
public JsonTreeReader(JsonElement element) {
super(UNREADABLE_READER);
stack.add(element);
}

6
gson/src/main/java/com/google/gson/stream/JsonReader.java
View File

@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import com.google.gson.internal.JsonReaderInternalAccess;
import com.google.gson.internal.bind.JsonElementReader;
import com.google.gson.internal.bind.JsonTreeReader;
/**
* Reads a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>)
@ -1242,8 +1242,8 @@ public class JsonReader implements Closeable {
static {
JsonReaderInternalAccess.INSTANCE = new JsonReaderInternalAccess() {
@Override public void promoteNameToValue(JsonReader reader) throws IOException {
if (reader instanceof JsonElementReader) {
((JsonElementReader)reader).promoteNameToValue();
if (reader instanceof JsonTreeReader) {
((JsonTreeReader)reader).promoteNameToValue();
return;
}
reader.peek();

34
gson/src/test/java/com/google/gson/internal/bind/JsonElementReaderTest.java
View File

@ -26,7 +26,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testNumbers() throws IOException {
JsonElement element = new JsonParser().parse("[1, 2, 3]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals(1, reader.nextInt());
assertEquals(2L, reader.nextLong());
@ -36,7 +36,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testLenientNansAndInfinities() throws IOException {
JsonElement element = new JsonParser().parse("[NaN, -Infinity, Infinity]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.setLenient(true);
reader.beginArray();
assertTrue(Double.isNaN(reader.nextDouble()));
@ -47,7 +47,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testStrictNansAndInfinities() throws IOException {
JsonElement element = new JsonParser().parse("[NaN, -Infinity, Infinity]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.setLenient(false);
reader.beginArray();
try {
@ -73,7 +73,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testNumbersFromStrings() throws IOException {
JsonElement element = new JsonParser().parse("[\"1\", \"2\", \"3\"]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals(1, reader.nextInt());
assertEquals(2L, reader.nextLong());
@ -83,7 +83,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testStringsFromNumbers() throws IOException {
JsonElement element = new JsonParser().parse("[1]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals("1", reader.nextString());
reader.endArray();
@ -91,7 +91,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testBooleans() throws IOException {
JsonElement element = new JsonParser().parse("[true, false]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals(true, reader.nextBoolean());
assertEquals(false, reader.nextBoolean());
@ -100,7 +100,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testNulls() throws IOException {
JsonElement element = new JsonParser().parse("[null,null]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
reader.nextNull();
reader.nextNull();
@ -109,7 +109,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testStrings() throws IOException {
JsonElement element = new JsonParser().parse("[\"A\",\"B\"]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals("A", reader.nextString());
assertEquals("B", reader.nextString());
@ -118,7 +118,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testArray() throws IOException {
JsonElement element = new JsonParser().parse("[1, 2, 3]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
assertEquals(JsonToken.BEGIN_ARRAY, reader.peek());
reader.beginArray();
assertEquals(JsonToken.NUMBER, reader.peek());
@ -134,7 +134,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testObject() throws IOException {
JsonElement element = new JsonParser().parse("{\"A\": 1, \"B\": 2}");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
assertEquals(JsonToken.BEGIN_OBJECT, reader.peek());
reader.beginObject();
assertEquals(JsonToken.NAME, reader.peek());
@ -152,14 +152,14 @@ public final class JsonElementReaderTest extends TestCase {
public void testEmptyArray() throws IOException {
JsonElement element = new JsonParser().parse("[]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
reader.endArray();
}
public void testNestedArrays() throws IOException {
JsonElement element = new JsonParser().parse("[[],[[]]]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
reader.beginArray();
reader.endArray();
@ -172,7 +172,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testNestedObjects() throws IOException {
JsonElement element = new JsonParser().parse("{\"A\":{},\"B\":{\"C\":{}}}");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginObject();
assertEquals("A", reader.nextName());
reader.beginObject();
@ -188,14 +188,14 @@ public final class JsonElementReaderTest extends TestCase {
public void testEmptyObject() throws IOException {
JsonElement element = new JsonParser().parse("{}");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginObject();
reader.endObject();
}
public void testSkipValue() throws IOException {
JsonElement element = new JsonParser().parse("[\"A\",{\"B\":[[]]},\"C\",[[]],\"D\",null]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
assertEquals("A", reader.nextString());
reader.skipValue();
@ -208,7 +208,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testWrongType() throws IOException {
JsonElement element = new JsonParser().parse("[[],\"A\"]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
try {
reader.nextBoolean();
@ -299,7 +299,7 @@ public final class JsonElementReaderTest extends TestCase {
public void testEarlyClose() throws IOException {
JsonElement element = new JsonParser().parse("[1, 2, 3]");
JsonElementReader reader = new JsonElementReader(element);
JsonTreeReader reader = new JsonTreeReader(element);
reader.beginArray();
reader.close();
try {