diff --git a/gson/pom.xml b/gson/pom.xml index b908fca7..0557335d 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -4,7 +4,7 @@ com.google.code.gson gson jar - 1.3b3 + 1.3 2008 Gson http://code.google.com/p/google-gson/ diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index 1c0342d3..dcb4fb72 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -374,7 +374,7 @@ public final class Gson { @SuppressWarnings("unchecked") public T fromJson(Reader json, Type typeOfT) throws JsonParseException { try { - JsonElement root = JsonParser.parse(json); + JsonElement root = new JsonParser().parse(json); JsonDeserializationContext context = new JsonDeserializationContextDefault( createDefaultObjectNavigatorFactory(), deserializers, objectConstructor); T target = (T) context.deserialize(root, typeOfT); diff --git a/gson/src/main/java/com/google/gson/JsonParser.java b/gson/src/main/java/com/google/gson/JsonParser.java index 995711a0..c1868cdb 100755 --- a/gson/src/main/java/com/google/gson/JsonParser.java +++ b/gson/src/main/java/com/google/gson/JsonParser.java @@ -35,7 +35,7 @@ public final class JsonParser { * @throws JsonParseException if the specified text is not valid JSON * @since 1.3 */ - public static JsonElement parse(String json) throws JsonParseException { + public JsonElement parse(String json) throws JsonParseException { return parse(new StringReader(json)); } @@ -47,7 +47,7 @@ public final class JsonParser { * @throws JsonParseException if the specified text is not valid JSON * @since 1.3 */ - public static JsonElement parse(Reader json) throws JsonParseException { + public JsonElement parse(Reader json) throws JsonParseException { try { JsonParserImpl parser = new JsonParserImpl(json); return parser.parse(); diff --git a/gson/src/main/java/com/google/gson/JsonPrintFormatter.java b/gson/src/main/java/com/google/gson/JsonPrintFormatter.java index 25db3f2e..76cb32a3 100644 --- a/gson/src/main/java/com/google/gson/JsonPrintFormatter.java +++ b/gson/src/main/java/com/google/gson/JsonPrintFormatter.java @@ -228,7 +228,7 @@ final class JsonPrintFormatter implements JsonFormatter { } } - public void endObject(JsonObject object) throws IOException { + public void endObject(JsonObject object) { writer.endObject(); } diff --git a/gson/src/test/java/com/google/gson/JsonParserTest.java b/gson/src/test/java/com/google/gson/JsonParserTest.java index b349bf3d..78f66c59 100644 --- a/gson/src/test/java/com/google/gson/JsonParserTest.java +++ b/gson/src/test/java/com/google/gson/JsonParserTest.java @@ -11,9 +11,17 @@ import java.io.StringReader; */ public class JsonParserTest extends TestCase { + private JsonParser parser; + + @Override + protected void setUp() throws Exception { + super.setUp(); + parser = new JsonParser(); + } + public void testParseString() { String json = "{a:10,b:'c'}"; - JsonElement e = JsonParser.parse(json); + JsonElement e = parser.parse(json); assertTrue(e.isJsonObject()); assertEquals(10, e.getAsJsonObject().get("a").getAsInt()); assertEquals("c", e.getAsJsonObject().get("b").getAsString()); @@ -21,7 +29,7 @@ public class JsonParserTest extends TestCase { public void testParseReader() { StringReader reader = new StringReader("{a:10,b:'c'}"); - JsonElement e = JsonParser.parse(reader); + JsonElement e = parser.parse(reader); assertTrue(e.isJsonObject()); assertEquals(10, e.getAsJsonObject().get("a").getAsInt()); assertEquals("c", e.getAsJsonObject().get("b").getAsString()); diff --git a/gson/src/test/java/com/google/gson/functional/JsonParserTest.java b/gson/src/test/java/com/google/gson/functional/JsonParserTest.java index aaba4110..1751db9d 100644 --- a/gson/src/test/java/com/google/gson/functional/JsonParserTest.java +++ b/gson/src/test/java/com/google/gson/functional/JsonParserTest.java @@ -99,7 +99,7 @@ public class JsonParserTest extends TestCase { public void testChangingCustomTreeAndDeserializing() { StringReader json = new StringReader("{'stringValue':'no message','intValue':10,'longValue':20}"); - JsonObject obj = (JsonObject) JsonParser.parse(json); + JsonObject obj = (JsonObject) new JsonParser().parse(json); obj.remove("stringValue"); obj.addProperty("stringValue", "fooBar"); BagOfPrimitives target = gson.fromJson(obj, BagOfPrimitives.class);