#81 support indention in dynamic codegen, part 5: collection

Author: taowen

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

@@ -8,6 +8,31 @@
 
 class CodegenImplArray {
 
+    public static CodegenResult genCollection(String cacheKey, ClassInfo classInfo) {
+        Type[] typeArgs = classInfo.typeArgs;
+        Class clazz = classInfo.clazz;
+        Type compType = Object.class;
+        if (typeArgs.length == 0) {
+            // default to List<Object>
+        } else if (typeArgs.length == 1) {
+            compType = typeArgs[0];
+        } else {
+            throw new IllegalArgumentException(
+                    "can not bind to generic collection without argument types, " +
+                            "try syntax like TypeLiteral<List<Integer>>{}");
+        }
+        if (clazz == List.class) {
+            clazz = ArrayList.class;
+        } else if (clazz == Set.class) {
+            clazz = HashSet.class;
+        }
+        if (List.class.isAssignableFrom(clazz)) {
+            return genList(cacheKey, clazz, compType);
+        } else {
+            return genCollection(cacheKey, clazz, compType);
+        }
+    }
+
     public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
         boolean noIndention = JsoniterSpi.getCurrentConfig().indentionStep() == 0;
         Class clazz = classInfo.clazz;
@@ -27,12 +52,9 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
         ctx.append(String.format("%s[] arr = (%s[])obj;", compType.getCanonicalName(), compType.getCanonicalName()));
         if (noIndention) {
             ctx.append("if (arr.length == 0) { return; }");
-        } else {
-            ctx.append("if (arr.length == 0) { stream.write((byte)'[', (byte)']'); return; }");
-        }
-        if (noIndention) {
             ctx.buffer('[');
         } else {
+            ctx.append("if (arr.length == 0) { stream.write((byte)'[', (byte)']'); return; }");
             ctx.append("stream.writeArrayStart(); stream.writeIndention();");
         }
         ctx.append("int i = 0;");
@@ -68,31 +90,6 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
         return ctx;
     }
 
-    public static CodegenResult genCollection(String cacheKey, ClassInfo classInfo) {
-        Type[] typeArgs = classInfo.typeArgs;
-        Class clazz = classInfo.clazz;
-        Type compType = Object.class;
-        if (typeArgs.length == 0) {
-            // default to List<Object>
-        } else if (typeArgs.length == 1) {
-            compType = typeArgs[0];
-        } else {
-            throw new IllegalArgumentException(
-                    "can not bind to generic collection without argument types, " +
-                            "try syntax like TypeLiteral<List<Integer>>{}");
-        }
-        if (clazz == List.class) {
-            clazz = ArrayList.class;
-        } else if (clazz == Set.class) {
-            clazz = HashSet.class;
-        }
-        if (List.class.isAssignableFrom(clazz)) {
-            return genList(cacheKey, clazz, compType);
-        } else {
-            return genCollection(cacheKey, clazz, compType);
-        }
-    }
-
     private static CodegenResult genList(String cacheKey, Class clazz, Type compType) {
         boolean isCollectionValueNullable = true;
         if (cacheKey.endsWith("__value_not_nullable")) {
@@ -129,15 +126,21 @@ private static CodegenResult genList(String cacheKey, Class clazz, Type compType
     }
 
     private static CodegenResult genCollection(String cacheKey, Class clazz, Type compType) {
+        boolean noIndention = JsoniterSpi.getCurrentConfig().indentionStep() == 0;
         boolean isCollectionValueNullable = true;
         if (cacheKey.endsWith("__value_not_nullable")) {
             isCollectionValueNullable = false;
         }
         CodegenResult ctx = new CodegenResult();
         ctx.append("public static void encode_(java.lang.Object obj, com.jsoniter.output.JsonStream stream) throws java.io.IOException {");
         ctx.append("java.util.Iterator iter = ((java.util.Collection)obj).iterator();");
-        ctx.append("if (!iter.hasNext()) { return; }");
-        ctx.buffer('[');
+        if (noIndention) {
+            ctx.append("if (!iter.hasNext()) { return; }");
+            ctx.buffer('[');
+        } else {
+            ctx.append("if (!iter.hasNext()) { stream.write((byte)'[', (byte)']'); return; }");
+            ctx.append("stream.writeArrayStart(); stream.writeIndention();");
+        }
         ctx.append("java.lang.Object e = iter.next();");
         if (isCollectionValueNullable) {
             ctx.append("if (e == null) { stream.writeNull(); } else {");
@@ -147,7 +150,11 @@ private static CodegenResult genCollection(String cacheKey, Class clazz, Type co
             CodegenImplNative.genWriteOp(ctx, "e", compType, false);
         }
         ctx.append("while (iter.hasNext()) {");
-        ctx.append("stream.write(',');");
+        if (noIndention) {
+            ctx.append("stream.write(',');");
+        } else {
+            ctx.append("stream.writeMore();");
+        }
         ctx.append("e = iter.next();");
         if (isCollectionValueNullable) {
             ctx.append("if (e == null) { stream.writeNull(); } else {");
@@ -157,7 +164,11 @@ private static CodegenResult genCollection(String cacheKey, Class clazz, Type co
             CodegenImplNative.genWriteOp(ctx, "e", compType, false);
         }
         ctx.append("}"); // while
-        ctx.buffer(']');
+        if (noIndention) {
+            ctx.buffer(']');
+        } else {
+            ctx.append("stream.writeArrayEnd();");
+        }
         ctx.append("}"); // public static void encode_
         return ctx;
     }

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

@@ -34,6 +34,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
             return;
         }
         stream.writeArrayStart();
+        stream.writeIndention();
         stream.writeVal(compTypeLiteral, iter.next());
         while (iter.hasNext()) {
             stream.writeMore();

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

@@ -0,0 +1,41 @@
+package com.jsoniter.output;
+
+import com.jsoniter.spi.Config;
+import junit.framework.TestCase;
+
+import java.util.HashSet;
+
+public class TestCollection extends TestCase {
+
+    public void test_indention() {
+        HashSet<Integer> set = new HashSet<Integer>();
+        set.add(1);
+        Config cfg = new Config.Builder()
+                .encodingMode(EncodingMode.REFLECTION_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[\n" +
+                "  1\n" +
+                "]", JsonStream.serialize(cfg, set));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[\n" +
+                "  1\n" +
+                "]", JsonStream.serialize(cfg, set));
+    }
+
+    public void test_indention_with_empty_array() {
+        Config cfg = new Config.Builder()
+                .encodingMode(EncodingMode.REFLECTION_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[]", JsonStream.serialize(cfg, new HashSet<Integer>()));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[]", JsonStream.serialize(cfg, new HashSet<Integer>()));
+    }
+}

src/test/java/com/jsoniter/suite/AllTestCases.java

@@ -48,6 +48,7 @@
         TestSpiPropertyDecoder.class,
         TestGson.class,
         com.jsoniter.output.TestGson.class,
-        TestStreamBuffer.class})
+        TestStreamBuffer.class,
+        TestCollection.class})
 public abstract class AllTestCases {
 }