#81 #84 support indention in dynamic codegen, part 2: empty object

Author: taowen

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

@@ -41,7 +41,7 @@ public static CodegenResult genObject(ClassInfo classInfo) {
             if (supportBuffer) {
                 ctx.buffer('}');
             } else {
-                ctx.append("stream.writeObjectEnd();");
+                ctx.append("if (notFirst) { stream.writeObjectEnd(); } else { stream.write('}'); }");
             }
         } else {
             ctx.buffer("{}");
@@ -139,10 +139,13 @@ private static int appendComma(CodegenResult ctx, int notFirst) {
             if (supportBuffer) {
                 ctx.append("if (notFirst) { stream.write(','); } else { notFirst = true; }");
             } else {
-                ctx.append("if (notFirst) { stream.writeMore(); } else { notFirst = true; }");
+                ctx.append("if (notFirst) { stream.writeMore(); } else { stream.writeIndention(); notFirst = true; }");
             }
         } else { // this is the first, do not write comma
             notFirst = 1;
+            if (!supportBuffer) {
+                ctx.append("stream.writeIndention();");
+            }
         }
         return notFirst;
     }

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

@@ -10,7 +10,7 @@
 public class JsonStream extends OutputStream {
 
     public Config configCache;
-    private int indention = 0;
+    int indention = 0;
     private OutputStream out;
     byte buf[];
     int count;
@@ -294,7 +294,7 @@ public final void writeMore() throws IOException {
         writeIndention();
     }
 
-    private void writeIndention() throws IOException {
+    public void writeIndention() throws IOException {
         writeIndention(0);
     }
 
@@ -321,7 +321,6 @@ public final void writeObjectStart() throws IOException {
         int indentionStep = currentConfig().indentionStep();
         indention += indentionStep;
         write('{');
-        writeIndention();
     }
 
     public final void writeObjectField(String field) throws IOException {

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

@@ -27,6 +27,7 @@ public static JsonStream borrowJsonStream() {
 
     public static void returnJsonStream(JsonStream jsonStream) {
         jsonStream.configCache = null;
+        jsonStream.indention = 0;
         if (slot1.get() == null) {
             slot1.set(jsonStream);
             return;

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

@@ -40,6 +40,7 @@ public void encode(Object obj, JsonStream stream) throws IOException {
             if (notFirst) {
                 stream.writeMore();
             } else {
+                stream.writeIndention();
                 notFirst = true;
             }
             if (mapKeyEncoder == null) {

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

@@ -95,14 +95,19 @@ private void enocde_(Object obj, JsonStream stream) throws Exception {
                 unwrapper.method.invoke(obj, stream);
             }
         }
-        stream.writeObjectEnd();
+        if (notFirst) {
+            stream.writeObjectEnd();
+        } else {
+            stream.write('}');
+        }
     }
 
     private boolean writeEncodeTo(JsonStream stream, boolean notFirst, EncodeTo encodeTo, Object val) throws IOException {
         if (!(encodeTo.binding.shouldOmitNull && val == null)) {
             if (notFirst) {
                 stream.writeMore();
             } else {
+                stream.writeIndention();
                 notFirst = true;
             }
             stream.writeObjectField(encodeTo.toName);

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

@@ -303,4 +303,22 @@ public void test_indention() {
                 "  \"field3\": null\n" +
                 "}", output);
     }
+
+    public static class TestObject15 {
+        public Integer i1;
+        public Integer i2;
+    }
+
+    public void test_indention_with_empty_object() {
+        Config config = JsoniterSpi.getCurrentConfig().copyBuilder()
+                .indentionStep(2)
+                .encodingMode(EncodingMode.REFLECTION_MODE)
+                .build();
+        assertEquals("{}", JsonStream.serialize(config, new TestObject15()));
+        config = JsoniterSpi.getCurrentConfig().copyBuilder()
+                .indentionStep(2)
+                .encodingMode(EncodingMode.DYNAMIC_MODE)
+                .build();
+        assertEquals("{}", JsonStream.serialize(config, new TestObject15()));
+    }
 }