Changed version to 1.3
Made JsonParser.parse a non-static method.
diff --git a/gson/pom.xml b/gson/pom.xml
index b908fca..0557335 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<packaging>jar</packaging>
- <version>1.3b3</version>
+ <version>1.3</version>
<inceptionYear>2008</inceptionYear>
<name>Gson</name>
<url>http://code.google.com/p/google-gson/</url>
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
index 1c0342d..dcb4fb7 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 @@
@SuppressWarnings("unchecked")
public <T> 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 995711a..c1868cd 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 @@
* @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 @@
* @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 25db3f2..76cb32a 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 @@
}
}
- 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 b349bf3..78f66c5 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 @@
*/
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 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 aaba411..1751db9 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 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);
