#56 support recursive structure decoding

Author: taowen

src/main/java/com/jsoniter/Codegen.java

@@ -65,6 +65,7 @@ private synchronized static Decoder gen(String cacheKey, Type type) {
         if (decoder != null) {
             return decoder;
         }
+        addPlaceholderDecoderToSupportRecursiveStructure(cacheKey);
         if (mode == DecodingMode.REFLECTION_MODE) {
             decoder = ReflectionDecoderFactory.create(clazz, typeArgs);
             JsoniterSpi.addNewDecoder(cacheKey, decoder);
@@ -104,6 +105,15 @@ private synchronized static Decoder gen(String cacheKey, Type type) {
         }
     }
 
+    private static void addPlaceholderDecoderToSupportRecursiveStructure(final String cacheKey) {
+        JsoniterSpi.addNewDecoder(cacheKey, new Decoder() {
+            @Override
+            public Object decode(JsonIterator iter) throws IOException {
+                return JsoniterSpi.getDecoder(cacheKey).decode(iter);
+            }
+        });
+    }
+
     public static boolean canStaticAccess(String cacheKey) {
         return generatedClassNames.contains(cacheKey);
     }

src/main/java/com/jsoniter/annotation/JsoniterAnnotationSupport.java

@@ -31,12 +31,16 @@ public void updateClassDescriptor(ClassDescriptor desc) {
             for (String fieldName : jsonObject.unknownPropertiesWhitelist()) {
                 Binding binding = new Binding(desc.clazz, desc.lookup, Object.class);
                 binding.name = fieldName;
+                binding.fromNames = new String[]{binding.name};
+                binding.toNames = new String[0];
                 binding.shouldSkip = true;
                 desc.fields.add(binding);
             }
             for (String fieldName : jsonObject.unknownPropertiesBlacklist()) {
                 Binding binding = new Binding(desc.clazz, desc.lookup, Object.class);
                 binding.name = fieldName;
+                binding.fromNames = new String[]{binding.name};
+                binding.toNames = new String[0];
                 binding.asExtraWhenPresent = true;
                 desc.fields.add(binding);
             }
@@ -88,6 +92,8 @@ private void detectWrappers(ClassDescriptor desc, List<Method> allMethods) {
                 if (binding.name == null || binding.name.length() == 0) {
                     binding.name = paramNames[i];
                 }
+                binding.fromNames = new String[]{binding.name};
+                binding.toNames = new String[]{binding.name};
                 binding.annotations = paramAnnotations;
                 setter.parameters.add(binding);
             }
@@ -136,6 +142,8 @@ private void detectStaticFactory(ClassDescriptor desc, List<Method> allMethods)
                 if (binding.name == null || binding.name.length() == 0) {
                     binding.name = paramNames[i];
                 }
+                binding.fromNames = new String[]{binding.name};
+                binding.toNames = new String[]{binding.name};
                 binding.annotations = paramAnnotations;
                 desc.ctor.parameters.add(binding);
             }
@@ -163,6 +171,8 @@ private void detectCtor(ClassDescriptor desc) {
                 if (binding.name == null || binding.name.length() == 0) {
                     binding.name = paramNames[i];
                 }
+                binding.fromNames = new String[]{binding.name};
+                binding.toNames = new String[]{binding.name};
                 binding.annotations = paramAnnotations;
                 desc.ctor.parameters.add(binding);
             }

src/main/java/com/jsoniter/output/Codegen.java

@@ -93,6 +93,7 @@ private static synchronized Encoder gen(final String cacheKey, Type type) {
             JsoniterSpi.addNewEncoder(cacheKey, encoder);
             return encoder;
         }
+        addPlaceholderEncoderToSupportRecursiveStructure(cacheKey);
         Type[] typeArgs = new Type[0];
         Class clazz;
         if (type instanceof ParameterizedType) {
@@ -118,7 +119,6 @@ private static synchronized Encoder gen(final String cacheKey, Type type) {
                 }
             }
         }
-        addPlaceholderEncoderToSupportRecursiveStructure(cacheKey);
         clazz = chooseAccessibleSuper(clazz);
         CodegenResult source = genSource(cacheKey, clazz, typeArgs);
         try {

src/test/java/com/jsoniter/TestNested.java

@@ -1,6 +1,10 @@
 package com.jsoniter;
 
+import com.jsoniter.annotation.JsonProperty;
+import com.jsoniter.annotation.JsoniterAnnotationSupport;
 import com.jsoniter.any.Any;
+import com.jsoniter.output.EncodingMode;
+import com.jsoniter.output.JsonStream;
 import junit.framework.TestCase;
 import org.junit.Assert;
 
@@ -58,4 +62,15 @@ public void test_get_all_with_some_invalid_path() throws IOException {
         result = any.get('*', 1);
         assertEquals("{\"field1\":2}", result.toString());
     }
+
+    public static class TestObject3 {
+        public com.jsoniter.output.TestNested.TestObject3 reference;
+    }
+
+    public void test_recursive_class() {
+        // recursive reference will not be supported
+        // however recursive structure is supported
+        com.jsoniter.output.TestNested.TestObject3 obj = new com.jsoniter.output.TestNested.TestObject3();
+        assertNull(JsonIterator.deserialize("{\"reference\":null}", TestObject3.class).reference);
+    }
 }

src/test/java/com/jsoniter/output/TestNested.java

@@ -99,7 +99,6 @@ public void test_recursive_class() {
         // however recursive structure is supported
         JsoniterAnnotationSupport.enable();
         TestObject3 obj = new TestObject3();
-        JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
         assertEquals("{\"reference\":null}", JsonStream.serialize(obj));
     }
 }