fix array

taowen · taowen · commit f195f14caa4b · 2016-12-11T16:38:25.000+08:00
diff --git a/src/main/java/com/jsoniter/Codegen.java b/src/main/java/com/jsoniter/Codegen.java
@@ -60,6 +60,9 @@ private synchronized static Decoder gen(String cacheKey, Type type, Type[] typeA
             clazz = (Class) type;
         }
         String source = genSource(cacheKey, clazz, typeArgs);
+        if (System.getenv("JSONITER_DEBUG") != null) {
+            System.out.println(source);
+        }
         try {
             CtClass ctClass = pool.makeClass(cacheKey);
             ctClass.setInterfaces(new CtClass[]{pool.get(Decoder.class.getName())});
@@ -231,12 +234,12 @@ private static void genField(StringBuilder lines, Field field, String cacheKey)
     private static String genReadOp(Type type) {
         if (type instanceof Class) {
             Class clazz = (Class) type;
-            String nativeRead = NATIVE_READS.get(clazz.getName());
+            String nativeRead = NATIVE_READS.get(clazz.getCanonicalName());
             if (nativeRead != null) {
                 return nativeRead;
             }
             return String.format("(%s)iter.read(\"%s\", %s.class)",
-                    clazz.getName(), TypeLiteral.generateCacheKey(clazz), clazz.getName());
+                    clazz.getCanonicalName(), TypeLiteral.generateCacheKey(clazz), clazz.getCanonicalName());
         }
         if (type instanceof ParameterizedType) {
             ParameterizedType pType = (ParameterizedType) type;
@@ -245,12 +248,12 @@ private static String genReadOp(Type type) {
             switch (args.length) {
                 case 1:
                     return String.format("(%s)iter.read(\"%s\", %s.class, %s.class);",
-                            clazz.getName(), TypeLiteral.generateCacheKey(type),
-                            clazz.getName(), ((Class) args[0]).getName());
+                            clazz.getCanonicalName(), TypeLiteral.generateCacheKey(type),
+                            clazz.getCanonicalName(), ((Class) args[0]).getCanonicalName());
                 case 2:
                     return String.format("(%s)iter.read(\"%s\", %s.class, %s.class, %s.class);",
-                            clazz.getName(), TypeLiteral.generateCacheKey(type),
-                            clazz.getName(), ((Class) args[0]).getName(), ((Class) args[1]).getName());
+                            clazz.getCanonicalName(), TypeLiteral.generateCacheKey(type),
+                            clazz.getCanonicalName(), ((Class) args[0]).getCanonicalName(), ((Class) args[1]).getCanonicalName());
                 default:
                     throw new IllegalArgumentException("unsupported number of type arguments: " + type);
             }
diff --git a/test/main/java/com/jsoniter/ABC.java b/test/main/java/com/jsoniter/ABC.java
@@ -0,0 +1,5 @@
+package com.jsoniter;
+
+public class ABC {
+    public Any a;
+}
diff --git a/test/main/java/com/jsoniter/TestDemo.java b/test/main/java/com/jsoniter/TestDemo.java
@@ -10,16 +10,35 @@ public void test_bind_api() throws IOException {
         int[] val = iter.read(int[].class);
         System.out.println(val[3]);
     }
+
     public void test_any_api() throws IOException {
         Jsoniter iter = Jsoniter.parse("[0,1,2,3]");
         System.out.println(iter.readAny().toInt(3));
     }
+
     public void test_iterator_api() throws IOException {
         Jsoniter iter = Jsoniter.parse("[0,1,2,3]");
         int total = 0;
-        while(iter.readArray()) {
+        while (iter.readArray()) {
             total += iter.readInt();
         }
         System.out.println(total);
     }
+
+    public void test_abc() throws IOException {
+        Jsoniter iter = Jsoniter.parse("{'a': {'b': {'c': 'd'}}}".replace('\'', '"'));
+        ABC abc = iter.read(ABC.class);
+        System.out.println(abc.a.get("b", "c"));
+    }
+
+    public void test_iterator_api_and_bind() throws IOException {
+        Jsoniter iter = Jsoniter.parse("[123, {'name': 'taowen', 'tags': ['crazy', 'hacker']}]".replace('\'', '"'));
+        iter.readArray();
+        int userId = iter.readInt();
+        iter.readArray();
+        User user = iter.read(User.class);
+        user.userId = userId;
+        iter.readArray(); // end of array
+        System.out.println(user);
+    }
 }
diff --git a/test/main/java/com/jsoniter/TestReadAny.java b/test/main/java/com/jsoniter/TestReadAny.java
@@ -14,4 +14,8 @@ public void test_bind_to_any() throws IOException {
         ComplexObject obj = iter.read(ComplexObject.class);
         System.out.println(obj.field3);
     }
+    public void test_read_any_from_string() throws IOException {
+        Jsoniter iter = Jsoniter.parse("{'numbers': ['1', '2', ['3', '4']]}".replace('\'', '"'));
+        assertEquals(3, iter.readAny().toInt("numbers", 2, 0));
+    }
 }
diff --git a/test/main/java/com/jsoniter/User.java b/test/main/java/com/jsoniter/User.java
@@ -0,0 +1,7 @@
+package com.jsoniter;
+
+public class User {
+    public int userId;
+    public String name;
+    public String[] tags;
+}

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,8 @@ public void test_bind_to_any() throws IOException {`
`14`	`14`	`ComplexObject obj = iter.read(ComplexObject.class);`
`15`	`15`	`System.out.println(obj.field3);`
`16`	`16`	`}`
	`17`	`+ public void test_read_any_from_string() throws IOException {`
	`18`	`+ Jsoniter iter = Jsoniter.parse("{'numbers': ['1', '2', ['3', '4']]}".replace('\'', '"'));`
	`19`	`+ assertEquals(3, iter.readAny().toInt("numbers", 2, 0));`
	`20`	`+ }`
`17`	`21`	`}`