CSV: fix issue in setSchema (#481)

FasterXML · Jun 26, 2024 · e51d723 · e51d723
1 parent ff5d1d6
commit e51d723
Showing 1 changed file with 5 additions and 9 deletions.
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
@@ -509,14 +509,13 @@ public void setCodec(ObjectCodec c) {
  }
 
  @Override
- public void setSchema(FormatSchema schema)
+ public void setSchema(final FormatSchema schema)
  {
  if (schema instanceof CsvSchema) {
  _schema = (CsvSchema) schema;
- String str = _schema.getNullValueString();
- _nullValue = str;
+ _nullValue = _schema.getNullValueString();
  } else if (schema == null) {
- schema = EMPTY_SCHEMA;
+ _schema = EMPTY_SCHEMA;
  } else {
  super.setSchema(schema);
  }
@@ -931,7 +930,7 @@ protected void _readHeaderLine() throws IOException {
  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()) {
  _reportCsvMappingError("Empty header line: can not bind data");
  }
  }
@@ -1475,9 +1474,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();
  }
 }