json-iterator#56 recursive structure encoding

taowen · taowen · commit 50400928e2c7 · 2017-05-23T10:24:19.000+08:00
diff --git a/src/main/java/com/jsoniter/output/Codegen.java b/src/main/java/com/jsoniter/output/Codegen.java
@@ -1,5 +1,6 @@
 package com.jsoniter.output;
 
+import com.jsoniter.any.Any;
 import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.Extension;
@@ -74,7 +75,7 @@ public static Encoder getEncoder(String cacheKey, Type type) {
         return gen(cacheKey, type);
     }
 
-    private static synchronized Encoder gen(String cacheKey, Type type) {
+    private static synchronized Encoder gen(final String cacheKey, Type type) {
         Encoder encoder = JsoniterSpi.getEncoder(cacheKey);
         if (encoder != null) {
             return encoder;
@@ -117,6 +118,7 @@ private static synchronized Encoder gen(String cacheKey, Type type) {
                 }
             }
         }
+        addPlaceholderEncoderToSupportRecursiveStructure(cacheKey);
         clazz = chooseAccessibleSuper(clazz);
         CodegenResult source = genSource(cacheKey, clazz, typeArgs);
         try {
@@ -135,6 +137,20 @@ private static synchronized Encoder gen(String cacheKey, Type type) {
         }
     }
 
+    private static void addPlaceholderEncoderToSupportRecursiveStructure(final String cacheKey) {
+        JsoniterSpi.addNewEncoder(cacheKey, new Encoder() {
+            @Override
+            public void encode(Object obj, JsonStream stream) throws IOException {
+                JsoniterSpi.getEncoder(cacheKey).encode(obj, stream);
+            }
+
+            @Override
+            public Any wrap(Object obj) {
+                return JsoniterSpi.getEncoder(cacheKey).wrap(obj);
+            }
+        });
+    }
+
     private static Class chooseAccessibleSuper(Class clazz) {
         if (Modifier.isPublic(clazz.getModifiers())) {
             return clazz;
diff --git a/src/main/java/com/jsoniter/output/JsonStream.java b/src/main/java/com/jsoniter/output/JsonStream.java
@@ -1,8 +1,8 @@
 package com.jsoniter.output;
 
-import com.jsoniter.spi.JsonException;
 import com.jsoniter.any.Any;
 import com.jsoniter.spi.Encoder;
+import com.jsoniter.spi.JsonException;
 import com.jsoniter.spi.TypeLiteral;
 
 import java.io.IOException;
diff --git a/src/test/java/com/jsoniter/output/TestNested.java b/src/test/java/com/jsoniter/output/TestNested.java
@@ -1,5 +1,7 @@
 package com.jsoniter.output;
 
+import com.jsoniter.annotation.JsonProperty;
+import com.jsoniter.annotation.JsoniterAnnotationSupport;
 import com.jsoniter.spi.TypeLiteral;
 import junit.framework.TestCase;
 
@@ -86,4 +88,18 @@ public void test_map_of_objects() throws IOException {
                 "  }\n" +
                 "}".replace('\'', '"'), baos.toString());
     }
+
+    public static class TestObject3 {
+        @JsonProperty(omitNull = false)
+        public TestObject3 reference;
+    }
+
+    public void test_recursive_class() {
+        // recursive reference will not be supported
+        // however recursive structure is supported
+        JsoniterAnnotationSupport.enable();
+        TestObject3 obj = new TestObject3();
+        JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
+        assertEquals("{\"reference\":null}", JsonStream.serialize(obj));
+    }
 }
