Don't print new lines when no data

Author: pontusmelke

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java

@@ -228,4 +228,24 @@ public void shouldShowTheNumberOfRows() throws CommandException {
         String actual = linePrinter.output();
         assertThat(actual, containsString("3 rows available"));
     }
+
+    @Test
+    public void shouldNotContainUnnecessaryNewLines() throws CommandException {
+        //when
+        shell.execute("UNWIND [1,2,3] AS row RETURN row");
+
+        //then
+        String actual = linePrinter.output();
+        assertThat(actual,
+                containsString( String.format(
+                        "+-----+%n" +
+                        "| row |%n" +
+                        "+-----+%n" +
+                        "| 1   |%n" +
+                        "| 2   |%n" +
+                        "| 3   |%n" +
+                        "+-----+%n" +
+                        "%n" +
+                        "3 rows available after")));
+    }
 }

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/PrettyPrinter.java

@@ -28,10 +28,10 @@ public void format(@Nonnull final BoltResult result, LinePrinter linePrinter) {
             numberOfRows = outputFormatter.formatAndCount(result, linePrinter);
         }
 
-        if (capabilities.contains(INFO)) linePrinter.printOut(outputFormatter.formatInfo(result.getSummary()));
-        if (capabilities.contains(PLAN)) linePrinter.printOut(outputFormatter.formatPlan(result.getSummary()));
-        if (capabilities.contains(FOOTER)) linePrinter.printOut(outputFormatter.formatFooter(result, numberOfRows));
-        if (capabilities.contains(STATISTICS)) linePrinter.printOut(statisticsCollector.collect(result.getSummary()));
+        if (capabilities.contains(INFO)) printIfNotEmpty(outputFormatter.formatInfo(result.getSummary()), linePrinter);
+        if (capabilities.contains(PLAN)) printIfNotEmpty(outputFormatter.formatPlan(result.getSummary()), linePrinter);
+        if (capabilities.contains(FOOTER)) printIfNotEmpty(outputFormatter.formatFooter(result, numberOfRows), linePrinter);
+        if (capabilities.contains(STATISTICS)) printIfNotEmpty(statisticsCollector.collect(result.getSummary()), linePrinter);
     }
 
     // Helper for testing
@@ -41,6 +41,12 @@ String format(@Nonnull final BoltResult result) {
         return sb.toString();
     }
 
+    private void printIfNotEmpty( String s, LinePrinter linePrinter ) {
+        if (!s.isEmpty()) {
+            linePrinter.printOut( s );
+        }
+    }
+
     private OutputFormatter selectFormatter(PrettyConfig prettyConfig) {
         if (prettyConfig.format == Format.VERBOSE) {
             return new TableOutputFormatter(prettyConfig.wrap, prettyConfig.numSampleRows);

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

@@ -72,7 +72,7 @@ private int formatResultAndCountRows(String[] columns,
             output.printOut(formatRecord(builder, columnSizes, records.next()));
             numberOfRows++;
         }
-        output.printOut(dashes);
+        output.printOut(String.format("%s%n", dashes));
         return numberOfRows;
     }
 

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java

@@ -290,7 +290,7 @@ public void wrapContent()
                 "| \"eee |",
                 "| ee\"  |",
                 "+------+",
-                "")));
+                NEWLINE)));
     }
 
     @Test
@@ -313,7 +313,7 @@ public void truncateContent()
                 "| \"dd… |",
                 "| \"ee… |",
                 "+------+",
-                "")));
+                NEWLINE)));
     }
 
     @Test