From a5bf8faf07104162a8c7a81e7217d5a40427a959 Mon Sep 17 00:00:00 2001 From: Ryan Caudy Date: Wed, 12 Jun 2024 15:36:25 -0400 Subject: [PATCH] Insist on terminating our CSV files with a line separator. --- extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java | 2 +- extensions/csv/src/test/java/io/deephaven/csv/TestCsvTools.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java b/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java index c4b26f4f85c..9b52b133e14 100644 --- a/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java +++ b/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java @@ -531,7 +531,6 @@ public static void writeCsv(Table[] sources, String destPath, boolean compressed } writeCsvHeader(out, fieldSeparator, columns); - out.write(System.lineSeparator()); for (Table source : sources) { writeCsvContents(source, out, timeZone, null, nullsAsEmpty, fieldSeparator, columns); @@ -647,6 +646,7 @@ public static void writeCsv(Table source, Writer out, ZoneId timeZone, writeCsvHeader(out, separator, columns); writeCsvContents(source, out, timeZone, progress, nullsAsEmpty, separator, columns); + out.write(System.lineSeparator()); out.close(); } diff --git a/extensions/csv/src/test/java/io/deephaven/csv/TestCsvTools.java b/extensions/csv/src/test/java/io/deephaven/csv/TestCsvTools.java index 81f12de9c00..5e073244548 100644 --- a/extensions/csv/src/test/java/io/deephaven/csv/TestCsvTools.java +++ b/extensions/csv/src/test/java/io/deephaven/csv/TestCsvTools.java @@ -272,7 +272,7 @@ public void testWriteCsv() throws Exception { parseZonedDateTime("2022-11-06T03:00:00.000000000 America/New_York") }, new Boolean[] { - null, false, true, true, false, false, false, false, true, false, null, null, true + null, false, true, true, false, false, false, false, true, false, null, null, null } }); final String[] casts = {