Yasson Issue #89 - Pretty formatting (#87)

Generator of pretty formatting now prints key and value on the same line
Issue link: eclipse-ee4j/yasson#89

Signed-off-by: David Kral <[email protected]>

Author: Verdent

impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -481,12 +481,16 @@ public JsonGenerator writeEnd() {
     }
 
     protected void writeComma() {
-        if (!currentContext.first && currentContext.scope != Scope.IN_FIELD) {
+        if (isCommaAllowed()) {
             writeChar(',');
         }
         currentContext.first = false;
     }
 
+    boolean isCommaAllowed() {
+        return !currentContext.first && currentContext.scope != Scope.IN_FIELD;
+    }
+
     protected void writeColon() {
         writeChar(':');
     }

impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -88,8 +88,10 @@ private void writeIndent() {
     @Override
     protected void writeComma() {
         super.writeComma();
-        writeChar('\n');
-        writeIndent();
+        if (isCommaAllowed()) {
+            writeChar('\n');
+            writeIndent();
+        }
     }
 
     @Override

tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -211,6 +211,32 @@ public void testPrettyObjectWriter() throws Exception {
         JsonObjectTest.testPerson(person);
     }
 
+    public void testPrettyPrinting() throws Exception {
+        String[][] lines = {{"firstName", "John"}, {"lastName", "Smith"}};
+        StringWriter writer = new StringWriter();
+        Map<String, Object> config = new HashMap<>();
+        config.put(JsonGenerator.PRETTY_PRINTING, true);
+        JsonGenerator generator = Json.createGeneratorFactory(config)
+                .createGenerator(writer);
+        generator.writeStartObject()
+                .write("firstName", "John")
+                .write("lastName", "Smith")
+                .writeEnd();
+        generator.close();
+        writer.close();
+
+        BufferedReader reader = new BufferedReader(new StringReader(writer.toString().trim()));
+        int numberOfLines = 0;
+        String line;
+        while ((line = reader.readLine()) != null) {
+            numberOfLines++;
+            if (numberOfLines > 1 && numberOfLines < 4) {
+                assertTrue(line.contains("\"" + lines[numberOfLines - 2][0] + "\": \"" + lines[numberOfLines - 2][1] + "\""));
+            }
+        }
+        assertEquals(4, numberOfLines);
+    }
+
     public void testPrettyObjectStream() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         Map<String, Object> config = new HashMap<>();