From dd2e8581155eaffd59a07eaf904d0cecb00a6825 Mon Sep 17 00:00:00 2001 From: ashitsalesforce Date: Mon, 10 Jul 2023 12:59:46 -0700 Subject: [PATCH] debug output of CSV column separator characters debug output of CSV column separator characters --- .../com/salesforce/dataloader/dao/csv/CSVFileReader.java | 7 ++++--- src/main/resources/messages.properties | 3 +++ 2 files changed, 7 insertions(+), 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 index 56484ae0..1172aed5 100644 --- 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 index af1ed732..ca768c83 100644 --- 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}