debug output of CSV column separator characters

forcedotcom · Jul 10, 2023 · dd2e858 · dd2e858
1 parent b65e3a7
commit dd2e858
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/dao/csv/CSVFileReader.java b/src/main/java/com/salesforce/dataloader/dao/csv/CSVFileReader.java
@@ -95,18 +95,19 @@ public CSVFileReader(File file, Config config, boolean custDelimiter) {
         if (custDelimiter) {
             if (config.getBoolean(Config.CSV_DELIMETER_COMMA)) {
                 separator.append(",");
-                LOGGER.debug("comma is a CSV delimiter character");
+                LOGGER.debug(Messages.getString("CSVFileDAO.debugMessageCommaSeparator"));
             }
             if (config.getBoolean(Config.CSV_DELIMETER_TAB)) {
                 separator.append("\t");
-                LOGGER.debug("tab is a CSV delimiter character");
+                LOGGER.debug(Messages.getString("CSVFileDAO.debugMessageTabSeparator"));
             }
             if (config.getBoolean(Config.CSV_DELIMETER_OTHER)) {
                 separator.append(config.getString(Config.CSV_DELIMETER_OTHER_VALUE));
-                LOGGER.debug("CSV delimiter character: \"" + config.getString(Config.CSV_DELIMETER_OTHER_VALUE) + "\"");
+                LOGGER.debug(Messages.getFormattedString("CSVFileDAO.debugMessageSeparatorChar", separator));
             }
         } else {
             separator.append(",");
+            LOGGER.debug(Messages.getString("CSVFileDAO.debugMessageCommaSeparator"));
         }
         csvDelimiters = separator.toString().toCharArray();
 

diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
@@ -176,6 +176,9 @@ CSVFileDAO.errorRowTooLarge=Error reading data row #{0}: the number of columns (
 CSVFileDAO.errorRowTooSmall=Error reading data row #{0}: the number of columns ({1}) is less than the number of columns in the header ({2})
 CSVFileDAO.debugMessageRowSize=Data row #{0}: number of columns = {1}
 CSVFileDAO.debugMessageHeaderRowSize=Header row: number of columns = {0}
+CSVFileDAO.debugMessageCommaSeparator=comma is a CSV delimiter character
+CSVFileDAO.debugMessageTabSeparator=tab is a CSV delimiter character
+CSVFileDAO.debugMessageSeparatorChar=CSV delimiter character:"{0}"
 
 ProcessConfig.loadingConfig=Loading process configuration from config file: {0}
 ProcessConfig.errorNoProcess=Error loading process: {0} configuration from config file: {1}