This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new dc6778a775 NIFI-14692 Upgraded FastCSV from 3.7.0 to 4.0.0 (#10047)
dc6778a775 is described below
commit dc6778a775c9028d91ff01d6c8b844cd71042b50
Author: Pierre Villard <[email protected]>
AuthorDate: Thu Jun 26 15:06:01 2025 +0200
NIFI-14692 Upgraded FastCSV from 3.7.0 to 4.0.0 (#10047)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-record-serialization-services/pom.xml | 2 +-
.../src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java | 5 +++--
.../src/main/java/org/apache/nifi/csv/WriteFastCSVResult.java | 7 +++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
index 32e24f1bf5..a104d0b23c 100755
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>de.siegmar</groupId>
<artifactId>fastcsv</artifactId>
- <version>3.7.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.github.palindromicity</groupId>
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java
index e9f53608da..bc46060258 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/FastCSVRecordReader.java
@@ -73,11 +73,12 @@ public class FastCSVRecordReader extends
AbstractCSVRecordReader {
this.csvFormat = csvFormat;
CsvReader.CsvReaderBuilder builder = CsvReader.builder()
- .fieldSeparator(csvFormat.getDelimiterString().charAt(0))
+ .fieldSeparator(csvFormat.getDelimiterString().charAt(0))
.quoteCharacter(csvFormat.getQuoteCharacter())
.commentStrategy(CommentStrategy.SKIP)
.skipEmptyLines(csvFormat.getIgnoreEmptyLines())
-
.ignoreDifferentFieldCount(csvFormat.getAllowMissingColumnNames());
+ .allowExtraFields(csvFormat.getAllowMissingColumnNames())
+ .allowMissingFields(csvFormat.getAllowMissingColumnNames());
if (csvFormat.getCommentMarker() != null) {
builder.commentCharacter(csvFormat.getCommentMarker());
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteFastCSVResult.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteFastCSVResult.java
index 28cadd4d8d..301a86824a 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteFastCSVResult.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteFastCSVResult.java
@@ -50,7 +50,6 @@ public class WriteFastCSVResult extends
AbstractRecordSetWriter implements Recor
private final String timestampFormat;
private final CsvWriter csvWriter;
- private final OutputStreamWriter streamWriter;
private final String[] fieldValues;
private final boolean includeHeaderLine;
@@ -75,10 +74,10 @@ public class WriteFastCSVResult extends
AbstractRecordSetWriter implements Recor
this.timestampFormat = timestampFormat;
this.includeHeaderLine = includeHeaderLine;
- this.streamWriter = new OutputStreamWriter(out, charSet);
+ final OutputStreamWriter streamWriter = new OutputStreamWriter(out,
charSet);
CsvWriter.CsvWriterBuilder builder = CsvWriter.builder()
- .fieldSeparator(csvFormat.getDelimiterString().charAt(0))
+ .fieldSeparator(csvFormat.getDelimiterString().charAt(0))
.quoteCharacter(csvFormat.getQuoteCharacter());
QuoteMode quoteMode = (csvFormat.getQuoteMode() == null) ? MINIMAL :
csvFormat.getQuoteMode();
@@ -133,7 +132,7 @@ public class WriteFastCSVResult extends
AbstractRecordSetWriter implements Recor
@Override
public void flush() throws IOException {
- streamWriter.flush();
+ csvWriter.flush();
}
@Override