json-iterator#28 avoid reference non public class in codegen

taowen · taowen · commit 113afc7e7694 · 2017-01-11T21:34:50.000+08:00
diff --git a/src/main/java/com/jsoniter/output/Codegen.java b/src/main/java/com/jsoniter/output/Codegen.java
@@ -10,6 +10,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.*;
@@ -114,6 +115,7 @@ private static synchronized Encoder gen(String cacheKey, Type type) {
                 throw new JsonException("static gen should provide the encoder we need, but failed to create the encoder", e);
             }
         }
+        clazz = chooseAccessibleSuper(clazz);
         CodegenResult source = genSource(clazz, typeArgs);
         if ("true".equals(System.getenv("JSONITER_DEBUG"))) {
             System.out.println(">>> " + cacheKey);
@@ -138,6 +140,13 @@ private static synchronized Encoder gen(String cacheKey, Type type) {
         }
     }
 
+    private static Class chooseAccessibleSuper(Class clazz) {
+        if (Modifier.isPublic(clazz.getModifiers())) {
+            return clazz;
+        }
+        return chooseAccessibleSuper(clazz.getSuperclass());
+    }
+
     public static CodegenResult getGeneratedSource(String cacheKey) {
         return generatedSources.get(cacheKey);
     }
diff --git a/src/test/java/com/jsoniter/output/TestArray.java b/src/test/java/com/jsoniter/output/TestArray.java
@@ -5,10 +5,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 
 public class TestArray extends TestCase {
 
@@ -111,4 +108,12 @@ public void test_hash_set() throws IOException {
         set.add(1);
         assertEquals("[1]", JsonStream.serialize(set));
     }
+
+    public void test_arrays_as_list() throws IOException {
+        assertEquals("[1,2,3]", JsonStream.serialize(Arrays.asList(1, 2, 3)));
+    }
+
+    public void test_default_empty_collection() throws IOException {
+        assertEquals("[]", JsonStream.serialize(Collections.emptySet()));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import java.io.FileOutputStream;`
`11`	`11`	`import java.io.IOException;`
`12`	`12`	`import java.io.OutputStreamWriter;`
	`13`	`+import java.lang.reflect.Modifier;`
`13`	`14`	`import java.lang.reflect.ParameterizedType;`
`14`	`15`	`import java.lang.reflect.Type;`
`15`	`16`	`import java.util.*;`
`@@ -114,6 +115,7 @@ private static synchronized Encoder gen(String cacheKey, Type type) {`
`114`	`115`	`throw new JsonException("static gen should provide the encoder we need, but failed to create the encoder", e);`
`115`	`116`	`}`
`116`	`117`	`}`
	`118`	`+ clazz = chooseAccessibleSuper(clazz);`
`117`	`119`	`CodegenResult source = genSource(clazz, typeArgs);`
`118`	`120`	`if ("true".equals(System.getenv("JSONITER_DEBUG"))) {`
`119`	`121`	`System.out.println(">>> " + cacheKey);`
`@@ -138,6 +140,13 @@ private static synchronized Encoder gen(String cacheKey, Type type) {`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`
	`143`	`+ private static Class chooseAccessibleSuper(Class clazz) {`
	`144`	`+ if (Modifier.isPublic(clazz.getModifiers())) {`
	`145`	`+ return clazz;`
	`146`	`+ }`
	`147`	`+ return chooseAccessibleSuper(clazz.getSuperclass());`
	`148`	`+ }`
	`149`	`+`
`141`	`150`	`public static CodegenResult getGeneratedSource(String cacheKey) {`
`142`	`151`	`return generatedSources.get(cacheKey);`
`143`	`152`	`}`