json-iterator#81 support indention in dynamic codegen, part 6: list

taowen · taowen · commit 1f920d819694 · 2017-06-24T14:24:17.000+08:00
diff --git a/src/main/java/com/jsoniter/output/CodegenImplArray.java b/src/main/java/com/jsoniter/output/CodegenImplArray.java
@@ -91,6 +91,7 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
     }
 
     private static CodegenResult genList(String cacheKey, Class clazz, Type compType) {
+        boolean noIndention = JsoniterSpi.getCurrentConfig().indentionStep() == 0;
         boolean isCollectionValueNullable = true;
         if (cacheKey.endsWith("__value_not_nullable")) {
             isCollectionValueNullable = false;
@@ -99,8 +100,13 @@ private static CodegenResult genList(String cacheKey, Class clazz, Type compType
         ctx.append("public static void encode_(java.lang.Object obj, com.jsoniter.output.JsonStream stream) throws java.io.IOException {");
         ctx.append("java.util.List list = (java.util.List)obj;");
         ctx.append("int size = list.size();");
-        ctx.append("if (size == 0) { return; }");
-        ctx.buffer('[');
+        if (noIndention) {
+            ctx.append("if (size == 0) { return; }");
+            ctx.buffer('[');
+        } else {
+            ctx.append("if (size == 0) { stream.write((byte)'[', (byte)']'); return; }");
+            ctx.append("stream.writeArrayStart(); stream.writeIndention();");
+        }
         ctx.append("java.lang.Object e = list.get(0);");
         if (isCollectionValueNullable) {
             ctx.append("if (e == null) { stream.writeNull(); } else {");
@@ -110,7 +116,11 @@ private static CodegenResult genList(String cacheKey, Class clazz, Type compType
             CodegenImplNative.genWriteOp(ctx, "e", compType, false);
         }
         ctx.append("for (int i = 1; i < size; i++) {");
-        ctx.append("stream.write(',');");
+        if (noIndention) {
+            ctx.append("stream.write(',');");
+        } else {
+            ctx.append("stream.writeMore();");
+        }
         ctx.append("e = list.get(i);");
         if (isCollectionValueNullable) {
             ctx.append("if (e == null) { stream.writeNull(); } else {");
@@ -120,7 +130,11 @@ private static CodegenResult genList(String cacheKey, Class clazz, Type compType
             CodegenImplNative.genWriteOp(ctx, "e", compType, false);
         }
         ctx.append("}"); // for
-        ctx.buffer(']');
+        if (noIndention) {
+            ctx.buffer(']');
+        } else {
+            ctx.append("stream.writeArrayEnd();");
+        }
         ctx.append("}"); // public static void encode_
         return ctx;
     }
diff --git a/src/main/java/com/jsoniter/output/ReflectionListEncoder.java b/src/main/java/com/jsoniter/output/ReflectionListEncoder.java
@@ -32,6 +32,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
             return;
         }
         stream.writeArrayStart();
+        stream.writeIndention();
         stream.writeVal(compTypeLiteral, list.get(0));
         for (int i = 1; i < list.size(); i++) {
             stream.writeMore();
diff --git a/src/test/java/com/jsoniter/output/TestList.java b/src/test/java/com/jsoniter/output/TestList.java
@@ -0,0 +1,42 @@
+package com.jsoniter.output;
+
+import com.jsoniter.spi.Config;
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class TestList extends TestCase {
+
+    public void test_indention() {
+        Config cfg = new Config.Builder()
+                .encodingMode(EncodingMode.REFLECTION_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[\n" +
+                "  1,\n" +
+                "  2\n" +
+                "]", JsonStream.serialize(cfg, Arrays.asList(1, 2)));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[\n" +
+                "  1,\n" +
+                "  2\n" +
+                "]", JsonStream.serialize(cfg, Arrays.asList(1, 2)));
+    }
+
+    public void test_indention_with_empty_array() {
+        Config cfg = new Config.Builder()
+                .encodingMode(EncodingMode.REFLECTION_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[]", JsonStream.serialize(cfg, new ArrayList<Integer>()));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[]", JsonStream.serialize(cfg, new ArrayList<Integer>()));
+    }
+}
diff --git a/src/test/java/com/jsoniter/suite/AllTestCases.java b/src/test/java/com/jsoniter/suite/AllTestCases.java
@@ -49,6 +49,7 @@
         TestGson.class,
         com.jsoniter.output.TestGson.class,
         TestStreamBuffer.class,
-        TestCollection.class})
+        TestCollection.class,
+        TestList.class})
 public abstract class AllTestCases {
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`	`stream.writeArrayStart();`
	`35`	`+ stream.writeIndention();`
`35`	`36`	`stream.writeVal(compTypeLiteral, list.get(0));`
`36`	`37`	`for (int i = 1; i < list.size(); i++) {`
`37`	`38`	`stream.writeMore();`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`TestGson.class,`
`50`	`50`	`com.jsoniter.output.TestGson.class,`
`51`	`51`	`TestStreamBuffer.class,`
`52`		`- TestCollection.class})`
	`52`	`+ TestCollection.class,`
	`53`	`+ TestList.class})`
`53`	`54`	`public abstract class AllTestCases {`
`54`	`55`	`}`