#81 support indention in dynamic codegen, part 4: array

Author: taowen

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

@@ -1,13 +1,15 @@
 package com.jsoniter.output;
 
 import com.jsoniter.spi.ClassInfo;
+import com.jsoniter.spi.JsoniterSpi;
 
 import java.lang.reflect.Type;
 import java.util.*;
 
 class CodegenImplArray {
 
     public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
+        boolean noIndention = JsoniterSpi.getCurrentConfig().indentionStep() == 0;
         Class clazz = classInfo.clazz;
         Class compType = clazz.getComponentType();
         if (compType.isArray()) {
@@ -23,8 +25,16 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
         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(String.format("%s[] arr = (%s[])obj;", compType.getCanonicalName(), compType.getCanonicalName()));
-        ctx.append("if (arr.length == 0) { return; }");
-        ctx.buffer('[');
+        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("stream.writeArrayStart(); stream.writeIndention();");
+        }
         ctx.append("int i = 0;");
         ctx.append(String.format("%s e = arr[i++];", compType.getCanonicalName()));
         if (isCollectionValueNullable) {
@@ -35,7 +45,11 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
             CodegenImplNative.genWriteOp(ctx, "e", compType, false);
         }
         ctx.append("while (i < arr.length) {");
-        ctx.append("stream.write(',');");
+        if (noIndention) {
+            ctx.append("stream.write(',');");
+        } else {
+            ctx.append("stream.writeMore();");
+        }
         ctx.append("e = arr[i++];");
         if (isCollectionValueNullable) {
             ctx.append("if (e == null) { stream.writeNull(); } else {");
@@ -45,7 +59,11 @@ public static CodegenResult genArray(String cacheKey, ClassInfo classInfo) {
             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/JsonStream.java

@@ -286,7 +286,6 @@ public final void writeEmptyArray() throws IOException {
     public final void writeArrayStart() throws IOException {
         indention += currentConfig().indentionStep();
         write('[');
-        writeIndention();
     }
 
     public final void writeMore() throws IOException {

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

@@ -28,6 +28,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
             return;
         }
         stream.writeArrayStart();
+        stream.writeIndention();
         stream.writeVal(compTypeLiteral, Array.get(obj, 0));
         for (int i = 1; i < len; i++) {
             stream.writeMore();

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

@@ -1,5 +1,6 @@
 package com.jsoniter.output;
 
+import com.jsoniter.spi.Config;
 import com.jsoniter.spi.TypeLiteral;
 import junit.framework.TestCase;
 
@@ -116,4 +117,36 @@ public void test_arrays_as_list() throws IOException {
     public void test_default_empty_collection() throws IOException {
         assertEquals("[]", JsonStream.serialize(Collections.emptySet()));
     }
+
+    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, new int[]{1, 2}));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[\n" +
+                "  1,\n" +
+                "  2\n" +
+                "]", JsonStream.serialize(cfg, new int[]{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 int[]{}));
+        cfg = new Config.Builder()
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .indentionStep(2)
+                .build();
+        assertEquals("[]", JsonStream.serialize(cfg, new int[]{}));
+    }
 }

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

@@ -41,6 +41,7 @@ public void test_write_indention() throws IOException {
             JsoniterSpi.setCurrentConfig(new Config.Builder().indentionStep(32).build());
             JsonStream jsonStream = new JsonStream(null, 32);
             jsonStream.writeArrayStart();
+            jsonStream.writeIndention();
             assertEquals(34, jsonStream.buffer().len());
         } finally {
             JsoniterSpi.setCurrentConfig(oldConfig);