From cd5949756354eac04f51abd2bc22fd8e7ad53d2a Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 16 Nov 2022 19:55:33 -0800 Subject: [PATCH] Update release notes wrt #352 (follow-up to #285) --- .../com/fasterxml/jackson/dataformat/csv/CsvParser.java | 2 +- release-notes/CREDITS-2.x | 6 ++++++ release-notes/VERSION-2.x | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java index c8a0c91e..1fbbb2ba 100644 --- a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java +++ b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java @@ -863,7 +863,7 @@ protected void _readHeaderLine() throws IOException { } // [dataformats-text#285]: Are we missing something? int diff = schemaColumnCount - newColumnCount; - if (Feature.FAIL_ON_MISSING_HEADER_COLUMNS.enabledIn(_formatFeatures) && diff > 0) { + if ((diff > 0) && Feature.FAIL_ON_MISSING_HEADER_COLUMNS.enabledIn(_formatFeatures)) { Set oldColumnNames = new LinkedHashSet<>(); _schema.getColumnNames(oldColumnNames); oldColumnNames.removeAll(newSchema.getColumnNames()); diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index d6231d24..b7c7d62f 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -214,7 +214,13 @@ Jim Talbut (Yaytay@github) Simon Dean (msmsimondean@github) * Requested #244: (yaml) Add `YAMLGenerator.Feature.ALLOW_LONG_KEYS` to allow writing keys longer than 128 characters (default) + (2.14.0) Shauni Arima (ShauniArima@github) * Contributed #244: (yaml) Add `YAMLGenerator.Feature.ALLOW_LONG_KEYS` to allow writing keys longer than 128 characters (default) + (2.14.0) + +Matteo Giordano (malteo@github) +* Contributed fix for #352: Disabling `CsvParser.Feature.FAIL_ON_MISSING_HEADER_COLUMNS` has no effect + (2.14.1) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index ed60ca3a..30810e71 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -14,6 +14,11 @@ Active Maintainers: === Releases === ------------------------------------------------------------------------ +2.14.1 (not yet released) + +#352: Disabling `CsvParser.Feature.FAIL_ON_MISSING_HEADER_COLUMNS` has no effect + (fix contributed by Matteo G) + 2.14.0 (05-Nov-2022) #169: (properties) Need a way to escape dots in property keys (add path separator configuration)