alwaysBlock parameter to control printing of original JsonObject nodes

Author: amihaiemil

Diff for: src/main/java/com/amihaiemil/eoyaml/BaseYamlNode.java

@@ -91,7 +91,7 @@ public final <T extends YamlNode> T asClass(final Class<T> clazz,
      *
      */
     @Override
-    public final String toString() {
+    public String toString() {
         final StringWriter writer = new StringWriter();
         final YamlPrinter printer = new RtYamlPrinter(writer);
         try {

Diff for: src/main/java/com/amihaiemil/eoyaml/JsonYamlMapping.java

@@ -27,7 +27,11 @@
  */
 package com.amihaiemil.eoyaml;
 
+import com.amihaiemil.eoyaml.exceptions.YamlPrintException;
+
 import javax.json.JsonObject;
+import java.io.IOException;
+import java.io.StringWriter;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -86,4 +90,18 @@ public String value() {
             }
         };
     }
+
+    @Override
+    public String toString() {
+        final StringWriter writer = new StringWriter();
+        final YamlPrinter printer = new RtYamlPrinter(writer, true);
+        try {
+            printer.print(this);
+            return writer.toString();
+        } catch (final IOException ex) {
+            throw new YamlPrintException(
+                "IOException when printing YAML", ex
+            );
+        }
+    }
 }

Diff for: src/main/java/com/amihaiemil/eoyaml/JsonYamlSequence.java

@@ -27,7 +27,11 @@
  */
 package com.amihaiemil.eoyaml;
 
+import com.amihaiemil.eoyaml.exceptions.YamlPrintException;
+
 import javax.json.JsonArray;
+import java.io.IOException;
+import java.io.StringWriter;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
@@ -73,4 +77,18 @@ public String value() {
             }
         };
     }
+
+    @Override
+    public String toString() {
+        final StringWriter writer = new StringWriter();
+        final YamlPrinter printer = new RtYamlPrinter(writer, true);
+        try {
+            printer.print(this);
+            return writer.toString();
+        } catch (final IOException ex) {
+            throw new YamlPrintException(
+                "IOException when printing YAML", ex
+            );
+        }
+    }
 }

Diff for: src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java

@@ -49,12 +49,26 @@ final class RtYamlPrinter implements YamlPrinter {
      */
     private final String lineSeparator;
 
+    /**
+     * Print all the nodes in block-style.
+     */
+    private final boolean alwaysBlock;
+
     /**
      * Constructor.
      * @param writer Destination writer.
      */
     RtYamlPrinter(final Writer writer) {
-        this(writer, System.lineSeparator());
+        this(writer, false);
+    }
+
+    /**
+     * Constructor.
+     * @param writer Destination writer.
+     * @param alwaysBlock Print all the nodes in block-style.
+     */
+    RtYamlPrinter(final Writer writer, final boolean alwaysBlock) {
+        this(writer, System.lineSeparator(), alwaysBlock);
     }
 
     /**
@@ -63,15 +77,30 @@ final class RtYamlPrinter implements YamlPrinter {
      * @param lineSeparator Line separator.
      */
     RtYamlPrinter(final Writer writer, final String lineSeparator) {
+        this(writer, lineSeparator, false);
+    }
+
+    /**
+     * Constructor.
+     * @param writer Destination writer.
+     * @param lineSeparator Line separator.
+     * @param alwaysBlock Print all the nodes in block-style.
+     */
+    RtYamlPrinter(
+        final Writer writer,
+        final String lineSeparator,
+        final boolean alwaysBlock
+    ) {
         this.writer = writer;
         this.lineSeparator = lineSeparator;
+        this.alwaysBlock = alwaysBlock;
     }
 
     @Override
     public void print(final YamlNode node) throws IOException  {
         try {
             final YamlVisitor<String> visitor = new YamlPrintVisitor(
-                this.lineSeparator
+                this.lineSeparator, this.alwaysBlock
             );
             if (node.type().equals(Node.SCALAR)) {
                 this.writer.append("---")

Diff for: src/main/java/com/amihaiemil/eoyaml/YamlPrintVisitor.java

@@ -53,43 +53,41 @@ final class YamlPrintVisitor implements YamlVisitor<String> {
     private final String lineSeparator;
 
     /**
-     * Ctor. Defaults to indentation 2 and the System line separator.
+     * Print each node as block-style always.
      */
-    YamlPrintVisitor() {
-        this(2, System.lineSeparator());
-    }
-
-    /**
-     * Ctor.
-     * @param indentation Number of indentation spaces.
-     */
-    YamlPrintVisitor(final int indentation) {
-        this(indentation, System.lineSeparator());
-    }
+    private final boolean alwaysBlock;
 
     /**
      * Ctor.
      * @param lineSeparator Line separator.
+     * @param alwaysBlock Print each node as block-style always.
      */
-    YamlPrintVisitor(final String lineSeparator) {
-        this(2, lineSeparator);
+    YamlPrintVisitor(final String lineSeparator, final boolean alwaysBlock) {
+        this(2, lineSeparator, alwaysBlock);
     }
 
     /**
      * Ctor.
      * @param indentation Number of spaces to use for indentation.
      * @param lineSeparator Line separator.
+     * @param alwaysBlock Print each node as block-style always.
      */
-    YamlPrintVisitor(final int indentation, final String lineSeparator) {
+    YamlPrintVisitor(
+        final int indentation,
+        final String lineSeparator,
+        final boolean alwaysBlock
+    ) {
         this.indentation = indentation;
         this.lineSeparator = lineSeparator;
+        this.alwaysBlock = alwaysBlock;
     }
     @Override
     public String visitYamlMapping(final YamlMapping node) {
         final StringWriter writer = new StringWriter();
         final String printed;
-        if(node instanceof ReadFlowMapping
-            || node instanceof JsonYamlMapping) {
+        if((node instanceof ReadFlowMapping
+            || node instanceof JsonYamlMapping)
+            && !this.alwaysBlock) {
             this.printFlowMapping(node, writer);
             printed = writer.toString();
         } else {
@@ -110,8 +108,9 @@ public String visitYamlMapping(final YamlMapping node) {
     public String visitYamlSequence(final YamlSequence node) {
         final StringWriter writer = new StringWriter();
         final String printed;
-        if(node instanceof ReadFlowSequence
-            || node instanceof JsonYamlSequence) {
+        if((node instanceof ReadFlowSequence
+            || node instanceof JsonYamlSequence)
+            && !this.alwaysBlock) {
             this.printFlowSequence(node, writer);
             printed = writer.toString();
         } else {

Diff for: src/test/java/com/amihaiemil/eoyaml/JsonYamlMappingTest.java

@@ -132,6 +132,7 @@ public void canMapJsonObject(){
         MatcherAssert.assertThat(
             jsonMapping, Matchers.equalTo(expected)
         );
+        System.out.println(jsonMapping);
     }
 
     /**