rename readAnyObject to read

taowen · taowen · commit 64498f671096 · 2016-12-29T23:09:44.000+08:00
diff --git a/src/main/java/com/jsoniter/CodegenAccess.java b/src/main/java/com/jsoniter/CodegenAccess.java
@@ -67,7 +67,7 @@ public static final <T> T read(JsonIterator iter, TypeLiteral<T> typeLiteral) th
                 case STRING:
                     return (T) iter.readString();
                 case OBJECT:
-                    return (T) iter.readAnyObject();
+                    return (T) iter.read();
                 case ANY:
                     return (T) iter.readAny();
                 default:
diff --git a/src/main/java/com/jsoniter/CodegenImplNative.java b/src/main/java/com/jsoniter/CodegenImplNative.java
@@ -30,7 +30,7 @@ class CodegenImplNative {
         put(BigDecimal.class.getName(), "iter.readBigDecimal()");
         put(BigInteger.class.getName(), "iter.readBigInteger()");
         put(String.class.getName(), "iter.readString()");
-        put(Object.class.getName(), "iter.readAnyObject()");
+        put(Object.class.getName(), "iter.read()");
         put(Any.class.getName(), "iter.readAny()");
     }};
 
diff --git a/src/main/java/com/jsoniter/JsonIterator.java b/src/main/java/com/jsoniter/JsonIterator.java
@@ -310,7 +310,7 @@ public final Any readAny() throws IOException {
         return new Any(valueType, buf, start, end);
     }
 
-    public final Object readAnyObject() throws IOException {
+    public final Object read() throws IOException {
         ValueType valueType = whatIsNext();
         switch (valueType) {
             case STRING:
@@ -324,17 +324,17 @@ public final Object readAnyObject() throws IOException {
             case ARRAY:
                 ArrayList list = new ArrayList();
                 while (readArray()) {
-                    list.add(readAnyObject());
+                    list.add(read());
                 }
                 return list;
             case OBJECT:
                 Map map = new HashMap();
                 for (String field = readObject(); field != null; field = readObject()) {
-                    map.put(field, readAnyObject());
+                    map.put(field, read());
                 }
                 return map;
             default:
-                throw reportError("readAnyObject", "unexpected value type: " + valueType);
+                throw reportError("read", "unexpected value type: " + valueType);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ public final Any readAny() throws IOException {`
`310`	`310`	`return new Any(valueType, buf, start, end);`
`311`	`311`	`}`
`312`	`312`
`313`		`- public final Object readAnyObject() throws IOException {`
	`313`	`+ public final Object read() throws IOException {`
`314`	`314`	`ValueType valueType = whatIsNext();`
`315`	`315`	`switch (valueType) {`
`316`	`316`	`case STRING:`
`@@ -324,17 +324,17 @@ public final Object readAnyObject() throws IOException {`
`324`	`324`	`case ARRAY:`
`325`	`325`	`ArrayList list = new ArrayList();`
`326`	`326`	`while (readArray()) {`
`327`		`- list.add(readAnyObject());`
	`327`	`+ list.add(read());`
`328`	`328`	`}`
`329`	`329`	`return list;`
`330`	`330`	`case OBJECT:`
`331`	`331`	`Map map = new HashMap();`
`332`	`332`	`for (String field = readObject(); field != null; field = readObject()) {`
`333`		`- map.put(field, readAnyObject());`
	`333`	`+ map.put(field, read());`
`334`	`334`	`}`
`335`	`335`	`return map;`
`336`	`336`	`default:`
`337`		`- throw reportError("readAnyObject", "unexpected value type: " + valueType);`
	`337`	`+ throw reportError("read", "unexpected value type: " + valueType);`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`