Merge branch '2.18'

Author: cowtowncoder

csv/src/main/java/tools/jackson/dataformat/csv/CsvParser.java

@@ -811,7 +811,7 @@ protected void _readHeaderLine() throws JacksonException {
         int newColumnCount = newSchema.size();
         if (newColumnCount < 2) { // 1 just because we may get 'empty' header name
             String first = (newColumnCount == 0) ? "" : newSchema.columnName(0).trim();
-            if (first.length() == 0) {
+            if (first.isEmpty()) {
                 _reportCsvReadError("Empty header line: can not bind data");
             }
         }
@@ -1320,11 +1320,10 @@ public JacksonException _wrapIOFailure(IOException e)  {
     protected void _setSchema(CsvSchema schema)
     {
         if (schema == null) {
-            schema = EMPTY_SCHEMA;
+            _schema = EMPTY_SCHEMA;
         } else {
             _schema = schema;
-            String str = _schema.getNullValueString();
-            _nullValue = str;
+            _nullValue = _schema.getNullValueString();
         }
         _columnCount = _schema.size();            
         _reader.setSchema(_schema);
@@ -1370,9 +1369,6 @@ protected boolean _isNullValue(String value) {
         if (_cfgEmptyStringAsNull && value.isEmpty()) {
             return true;
         }
-        if (_cfgEmptyUnquotedStringAsNull && value.isEmpty() && !_reader.isCurrentTokenQuoted()) {
-            return true;
-        }
-        return false;
+        return _cfgEmptyUnquotedStringAsNull && value.isEmpty() && !_reader.isCurrentTokenQuoted();
     }
 }

release-notes/CREDITS-2.x

@@ -5,7 +5,8 @@ text dataformats project, version 2.x
 (note: for older credits, check out release notes for 1.x versions)
 
 * Jonas Konrad (@yawkat): author of TOML module
-* Tatu Saloranta, [email protected]: author of CSV, Properties and YAML modules
+* Tatu Saloranta (@cowtowncoder): author of CSV, Properties and YAML modules
+* PJ Fanning (@pjfanning): active contributor to most modules
 
 --------------------------------------------------------------------------------
 Credits for specific contributions
@@ -197,6 +198,7 @@ PJ Fanning (pjfanning@github)
  (2.14.0)
 #390: (yaml) Upgrade to Snakeyaml 2.0 (resolves CVE-2022-1471)
  (2.15.0)
+ ... and many, many more not listed here
 
 Falk Hanisch (mrpiggi@github)
 #288: Caching conflict when creating CSV schemas with different views

release-notes/VERSION-2.x

@@ -22,6 +22,11 @@ Active Maintainers:
   fields (foo,,bar vs. foo,"",bar)
  (contributed by David P)
 
+2.17.2 (not yet released)
+
+#481: (csv) Fix issue in `setSchema()`
+ (contributed by @pjfanning)
+
 2.17.1 (04-May-2024)
 
 No changes since 2.17.0