apply suggestions

Author: thongdk8

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommand.java

@@ -69,14 +69,14 @@ public Integer call() throws Exception {
         spec.commandLine(), dataChunkQueueSize, DataLoaderError.INVALID_DATA_CHUNK_QUEUE_SIZE);
     ControlFile controlFile = parseControlFileFromPath(controlFilePath).orElse(null);
     ImportOptions importOptions = createImportOptions(controlFile);
-    ImportLoggerConfig config =
+    ImportLoggerConfig importLoggerConfig =
         ImportLoggerConfig.builder()
             .logDirectoryPath(logDirectory)
             .isLogRawSourceRecordsEnabled(importOptions.isLogRawRecord())
             .isLogSuccessRecordsEnabled(importOptions.isLogSuccessRecords())
             .prettyPrint(prettyPrint)
             .build();
-    LogWriterFactory logWriterFactory = createLogWriterFactory(config);
+    LogWriterFactory logWriterFactory = createLogWriterFactory(importLoggerConfig);
     File configFile = new File(configFilePath);
     TransactionFactory transactionFactory = TransactionFactory.create(configFile);
 
@@ -92,8 +92,8 @@ public Integer call() throws Exception {
               importOptions,
               tableMetadataMap,
               reader,
+              importLoggerConfig,
               logWriterFactory,
-              config,
               transactionFactory);
       importManager.startImport();
     }
@@ -149,17 +149,17 @@ private Map<String, TableMetadata> createTableMetadataMap(
    * @param importOptions import options
    * @param tableMetadataMap table metadata map
    * @param reader buffered reader with source data
+   * @param importLoggerConfig import logging config
    * @param logWriterFactory log writer factory object
-   * @param config import logging config
    * @param transactionFactory transaction factory to use
    * @return ImportManager object
    */
   private ImportManager createImportManager(
       ImportOptions importOptions,
       Map<String, TableMetadata> tableMetadataMap,
       BufferedReader reader,
+      ImportLoggerConfig importLoggerConfig,
       LogWriterFactory logWriterFactory,
-      ImportLoggerConfig config,
       TransactionFactory transactionFactory)
       throws IOException {
     ImportProcessorFactory importProcessorFactory = new DefaultImportProcessorFactory();
@@ -172,9 +172,10 @@ private ImportManager createImportManager(
             scalarDbMode,
             transactionFactory.getTransactionManager());
     if (importOptions.getLogMode().equals(LogMode.SPLIT_BY_DATA_CHUNK)) {
-      importManager.addListener(new SplitByDataChunkImportLogger(config, logWriterFactory));
+      importManager.addListener(
+          new SplitByDataChunkImportLogger(importLoggerConfig, logWriterFactory));
     } else {
-      importManager.addListener(new SingleFileImportLogger(config, logWriterFactory));
+      importManager.addListener(new SingleFileImportLogger(importLoggerConfig, logWriterFactory));
     }
     return importManager;
   }
@@ -275,18 +276,14 @@ void validateTransactionMode(TransactionFactory transactionFactory) {
       // Transaction mode is not supported by the configured transaction manager
       throw new ParameterException(
           spec.commandLine(),
-          DataLoaderError.INVALID_TRANSACTION_MODE.buildMessage(
-              "Please try with STORAGE mode or check your ScalarDB configuration. "
-                  + "Error: "
-                  + e.getClass().getSimpleName()
-                  + " - "
-                  + e.getMessage()));
+          DataLoaderError.INVALID_TRANSACTION_MODE.buildMessage(e.getMessage()),
+          e);
     } catch (Exception e) {
       // Other exceptions - configuration or runtime error
       throw new ParameterException(
           spec.commandLine(),
-          DataLoaderError.TRANSACTION_MODE_VALIDATION_FAILED.buildMessage(
-              "Error: " + e.getClass().getSimpleName() + " - " + e.getMessage()));
+          DataLoaderError.TRANSACTION_MODE_VALIDATION_FAILED.buildMessage(e.getMessage()),
+          e);
     } finally {
       // Ensure transaction is aborted
       if (transaction != null) {

data-loader/cli/src/test/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandTest.java

@@ -307,7 +307,6 @@ void validateTransactionMode_withUnsupportedOperation_shouldThrowException() thr
             () -> command.validateTransactionMode(mockFactory));
 
     assertTrue(thrown.getMessage().contains("TRANSACTION mode is not compatible"));
-    assertTrue(thrown.getMessage().contains("UnsupportedOperationException"));
   }
 
   @Test
@@ -331,7 +330,6 @@ void validateTransactionMode_withOtherException_shouldThrowException() throws Ex
             () -> command.validateTransactionMode(mockFactory));
 
     assertTrue(thrown.getMessage().contains("Failed to validate TRANSACTION mode"));
-    assertTrue(thrown.getMessage().contains("RuntimeException"));
     assertTrue(thrown.getMessage().contains("Connection failed"));
   }
 }

data-loader/core/src/main/java/com/scalar/db/dataloader/core/DataLoaderError.java

@@ -219,11 +219,11 @@ public enum DataLoaderError implements ScalarDbError {
   INVALID_TRANSACTION_MODE(
       Category.USER_ERROR,
       "0058",
-      "TRANSACTION mode is not compatible with the current configuration. %s",
+      "TRANSACTION mode is not compatible with the current configuration. Please try with STORAGE mode or check your ScalarDB configuration. Details: %s",
       "",
       ""),
   TRANSACTION_MODE_VALIDATION_FAILED(
-      Category.USER_ERROR, "0059", "Failed to validate TRANSACTION mode. %s", "", ""),
+      Category.USER_ERROR, "0059", "Failed to validate TRANSACTION mode. Details: %s", "", ""),
 
   //
   // Errors for the internal error category