From 731f686dca800da12f8a17b258ea579210aa5f84 Mon Sep 17 00:00:00 2001
From: amihaiemil <amihaiemil@gmail.com>
Date: Sat, 13 Apr 2024 08:47:05 +0300
Subject: [PATCH] #605 printFlowMapping

---
 .../amihaiemil/eoyaml/YamlPrintVisitor.java   | 117 ++++++++++++------
 .../eoyaml/ReadFlowMappingTestCase.java       |   6 +-
 2 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/amihaiemil/eoyaml/YamlPrintVisitor.java b/src/main/java/com/amihaiemil/eoyaml/YamlPrintVisitor.java
index 38134907..586c3d28 100644
--- a/src/main/java/com/amihaiemil/eoyaml/YamlPrintVisitor.java
+++ b/src/main/java/com/amihaiemil/eoyaml/YamlPrintVisitor.java
@@ -30,6 +30,7 @@
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Visitor which prints the YAML in block format.
@@ -84,44 +85,23 @@ final class YamlPrintVisitor implements YamlVisitor<String> {
     }
     @Override
     public String visitYamlMapping(final YamlMapping node) {
-        final StringWriter writer = new StringWriter();
-        for (final YamlNode key : node.keys()) {
-            final YamlNode value = node.value(key);
-            writer.append(this.printPossibleComment(value));
-            if(key.type().equals(Node.SCALAR)) {
-                writer.append(this.visitYamlNode(key));
-            } else {
-                writer.append("?").append(this.lineSeparator);
-                final String printedValue = this.visitYamlNode(key);
-                writer.append(this.indent(printedValue, this.indentation));
-                writer.append(this.lineSeparator);
-            }
-            if(value == null || value.type().equals(Node.SCALAR)) {
-                writer.append(": ");
-                writer.append(this.visitYamlNode(value));
+        StringWriter writer = new StringWriter();
+        final String printed;
+        if(node instanceof ReadFlowMapping) {
+            writer = this.printFlowMapping(node, writer);
+            printed = writer.toString();
+        } else {
+            writer = this.printBlockMapping(node, writer);
+            final String printedMapping = writer.toString();
+            if (printedMapping.length() > 0)  {
+                printed = printedMapping.substring(
+                    0, printedMapping.length() - 1
+                );
             } else {
-                final String printedValue = this.visitYamlNode(value);
-                if("null".equals(printedValue) || "[]".equals(printedValue)
-                    || "{}".equals(printedValue)
-                ) {
-                    writer.append(": ");
-                    writer.append(printedValue);
-                } else {
-                    writer.append(":");
-                    writer.append(this.lineSeparator);
-                    writer.append(this.indent(printedValue, this.indentation));
-                }
+                printed = printedMapping;
             }
-            writer.append(this.lineSeparator);
         }
-        final String printedMapping = writer.toString();
-        final String trimmed;
-        if (printedMapping.length() > 0)  {
-            trimmed = printedMapping.substring(0, printedMapping.length() - 1);
-        } else {
-            trimmed = printedMapping;
-        }
-        return trimmed;
+        return printed;
     }
 
     @Override
@@ -326,6 +306,73 @@ private String printPossibleComment(final YamlNode node) {
         return writer.toString();
     }
 
+    /**
+     * Write a block mapping to the given StringWriter.
+     * @param node Block YamlMapping to print.
+     * @param writer String writer.
+     * @return String writer.
+     */
+    private StringWriter printBlockMapping(
+        final YamlMapping node, final StringWriter writer
+    ) {
+        for (final YamlNode key : node.keys()) {
+            final YamlNode value = node.value(key);
+            writer.append(this.printPossibleComment(value));
+            if(key.type().equals(Node.SCALAR)) {
+                writer.append(this.visitYamlNode(key));
+            } else {
+                writer.append("?").append(this.lineSeparator);
+                final String printedValue = this.visitYamlNode(key);
+                writer.append(this.indent(printedValue, this.indentation));
+                writer.append(this.lineSeparator);
+            }
+            if(value == null || value.type().equals(Node.SCALAR)) {
+                writer.append(": ");
+                writer.append(this.visitYamlNode(value));
+            } else {
+                final String printedValue = this.visitYamlNode(value);
+                if("null".equals(printedValue) || "[]".equals(printedValue)
+                    || "{}".equals(printedValue)
+                ) {
+                    writer.append(": ");
+                    writer.append(printedValue);
+                } else {
+                    writer.append(":");
+                    writer.append(this.lineSeparator);
+                    writer.append(this.indent(printedValue, this.indentation));
+                }
+            }
+            writer.append(this.lineSeparator);
+        }
+        return writer;
+    }
+
+    /**
+     * Write a flow mapping to the given StringWriter.
+     * @param node Flow YamlMapping to print.
+     * @param writer String writer.
+     * @return String writer.
+     */
+    private StringWriter printFlowMapping(
+        final YamlMapping node, final StringWriter writer
+    ) {
+        writer.append("{");
+        int i=0;
+        final Set<YamlNode> keys = node.keys();
+        for (final YamlNode key : keys) {
+            final YamlNode value = node.value(key);
+            writer.append(this.visitYamlNode(key));
+            writer.append(": ");
+            writer.append(this.visitYamlNode(value));
+            i++;
+            if(i<keys.size()) {
+                writer.append(", ");
+            }
+        }
+        writer.append("}");
+        return writer;
+    }
+
     /**
      * A scalar which escapes its value.
      * @author Mihai Andronache (amihaiemil@gmail.com)
diff --git a/src/test/java/com/amihaiemil/eoyaml/ReadFlowMappingTestCase.java b/src/test/java/com/amihaiemil/eoyaml/ReadFlowMappingTestCase.java
index 0be460cf..a44999d3 100644
--- a/src/test/java/com/amihaiemil/eoyaml/ReadFlowMappingTestCase.java
+++ b/src/test/java/com/amihaiemil/eoyaml/ReadFlowMappingTestCase.java
@@ -107,7 +107,7 @@ public void returnsKeys() {
         );
         MatcherAssert.assertThat(
             iterator.next().toString(),
-            Matchers.equalTo("y: r")
+            Matchers.equalTo("{y: r}")
         );
         MatcherAssert.assertThat(
             iterator.next().toString(),
@@ -197,7 +197,7 @@ public void returnsAllValues() {
         );
         MatcherAssert.assertThat(
             iterator.next().toString(),
-            Matchers.equalTo("h: i")
+            Matchers.equalTo("{h: i}")
         );
         MatcherAssert.assertThat(
             iterator.next().toString(),
@@ -220,7 +220,7 @@ public void returnsAllValues() {
                 + System.lineSeparator()
                 + "-"
                 + System.lineSeparator()
-                + "  ii: \"5,6,7\""
+                + "  {ii: \"5,6,7\"}"
                 + System.lineSeparator()
                 + "- b"
                 + System.lineSeparator()