You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2024/01/09 22:56:26 UTC

(nifi) branch support/nifi-1.x updated: NIFI-12587 - improve error message in ValidateCSV

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new dd8f4a3c95 NIFI-12587 - improve error message in ValidateCSV
dd8f4a3c95 is described below

commit dd8f4a3c95caebd95e8024118d3f18173586a1be
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Tue Jan 9 11:32:48 2024 +0400

    NIFI-12587 - improve error message in ValidateCSV
    
    review - removed row source from logging
    
    Update nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
    
    Co-authored-by: dan-s1 <ds...@gmail.com>
    
    Update nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
    
    Co-authored-by: dan-s1 <ds...@gmail.com>
    
    Update nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
    
    Co-authored-by: dan-s1 <ds...@gmail.com>
    
    Update nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
    
    Signed-off-by: Matt Burgess <ma...@apache.org>
    
    Co-authored-by: dan-s1 <ds...@gmail.com>
---
 .../main/java/org/apache/nifi/processors/standard/ValidateCsv.java | 7 +++++--
 .../java/org/apache/nifi/processors/standard/TestValidateCsv.java  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
index 030cc9ce66..2077d19123 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java
@@ -516,8 +516,11 @@ public class ValidateCsv extends AbstractProcessor {
 
                         } catch (final SuperCsvException e) {
                             valid.set(false);
+                            final String coordinates = String.format("{line=%d, row=%d, column=%d}", e.getCsvContext().getLineNumber(),
+                                    e.getCsvContext().getRowNumber(), e.getCsvContext().getColumnNumber());
+                            final String errorMessage = e.getLocalizedMessage() + " at " + coordinates;
                             if(isWholeFFValidation) {
-                                validationError.set(e.getLocalizedMessage());
+                                validationError.set(errorMessage);
                                 logger.debug("Failed to validate {} against schema due to {}; routing to 'invalid'", flowFile, e);
                                 break;
                             } else {
@@ -534,7 +537,7 @@ public class ValidateCsv extends AbstractProcessor {
                                 }
 
                                 if(validationError.get() == null) {
-                                    validationError.set(e.getLocalizedMessage());
+                                    validationError.set(errorMessage);
                                 }
                             }
                         } finally {
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
index 128a39f607..c1d9059783 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateCsv.java
@@ -122,7 +122,7 @@ public class TestValidateCsv {
         runner.run();
         runner.assertTransferCount(ValidateCsv.REL_INVALID, 1);
         runner.getFlowFilesForRelationship(ValidateCsv.REL_INVALID).get(0).assertAttributeEquals("validation.error.message",
-                "'22/111954' could not be parsed as a Date");
+                "'22/111954' could not be parsed as a Date at {line=1, row=1, column=2}");
     }
 
     @Test
@@ -200,7 +200,7 @@ public class TestValidateCsv {
         runner.run();
         runner.assertTransferCount(ValidateCsv.REL_INVALID, 1);
         runner.getFlowFilesForRelationship(ValidateCsv.REL_INVALID).get(0).assertAttributeEquals("validation.error.message",
-                "'testapache.org' does not match the regular expression '[a-z0-9\\._]+@[a-z0-9\\.]+'");
+                "'testapache.org' does not match the regular expression '[a-z0-9\\._]+@[a-z0-9\\.]+' at {line=1, row=1, column=3}");
     }
 
     @Test