Skip to content

NIFI-3175 Fix a bug in the ValidateCSV processor to handle empty CSV columns #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Wesley-Lawrence wants to merge 1 commit into from
+27 −3
Closed

NIFI-3175 Fix a bug in the ValidateCSV processor to handle empty CSV columns #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...fi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,16 @@ private byte[] print(List<?> list, CsvPreference csvPref, boolean isFirstLine) {
}

final int size = list.size();
for(int i = 0; i < size; i++) {
buffer.append(list.get(i).toString());
if(i != size - 1) {
int i = 0;
for (Object item : list) {
if (item != null) {
buffer.append(item.toString());
}

if (i < size - 1) {
buffer.append((char) csvPref.getDelimiterChar());
}
i++;
}

return buffer.toString().getBytes();
Expand Down
19 changes: 19 additions & 0 deletions ...tandard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,25 @@ public void testHeaderAndSplit() {
runner.getFlowFilesForRelationship(ValidateCsv.REL_INVALID).get(0).assertContentEquals("Name,Birthdate,Weight\nJohn,22/111954,63.2");
}

@Test
public void testNullValues() {
final TestRunner runner = TestRunners.newTestRunner(new ValidateCsv());
runner.setProperty(ValidateCsv.DELIMITER_CHARACTER, ",");
runner.setProperty(ValidateCsv.END_OF_LINE_CHARACTER, "\n");
runner.setProperty(ValidateCsv.QUOTE_CHARACTER, "\"");
runner.setProperty(ValidateCsv.HEADER, "true");
runner.setProperty(ValidateCsv.VALIDATION_STRATEGY, ValidateCsv.VALIDATE_LINES_INDIVIDUALLY);

runner.setProperty(ValidateCsv.SCHEMA, "Null, Null, Null");

runner.enqueue("#Name,Birthdate,Weight\nJohn,\"\",63.2\nBob,,45.0");
runner.run();

runner.assertTransferCount(ValidateCsv.REL_VALID, 1);
runner.getFlowFilesForRelationship(ValidateCsv.REL_VALID).get(0).assertContentEquals("#Name,Birthdate,Weight\nJohn,,63.2\nBob,,45.0");
runner.assertTransferCount(ValidateCsv.REL_INVALID, 0);
}

@Test
public void testUniqueWithSplit() {
final TestRunner runner = TestRunners.newTestRunner(new ValidateCsv());
Expand Down