apply suggestions

Author: thongdk8

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

@@ -7,7 +7,6 @@
 import com.scalar.db.api.DistributedTransaction;
 import com.scalar.db.api.DistributedTransactionAdmin;
 import com.scalar.db.api.TableMetadata;
-import com.scalar.db.common.CoreError;
 import com.scalar.db.dataloader.core.DataLoaderError;
 import com.scalar.db.dataloader.core.FileFormat;
 import com.scalar.db.dataloader.core.ScalarDbMode;
@@ -272,32 +271,22 @@ void validateTransactionMode(TransactionFactory transactionFactory) {
       // Try to start a read only transaction to verify the transaction manager is properly
       // configured
       transaction = transactionFactory.getTransactionManager().startReadOnly();
-    } catch (Exception e) {
-      // Check for specific error about beginning transaction not allowed
-      if (e.getMessage() != null
-          && e.getMessage()
-              .contains(
-                  CoreError.SINGLE_CRUD_OPERATION_TRANSACTION_BEGINNING_TRANSACTION_NOT_ALLOWED
-                      .buildCode())) {
-        throw new ParameterException(
-            spec.commandLine(),
-            DataLoaderError.INVALID_TRANSACTION_MODE.buildMessage(
-                "The current configuration does not support TRANSACTION mode. "
-                    + "Please try with STORAGE mode or check your ScalarDB configuration. "
-                    + "Error: "
-                    + e.getClass().getSimpleName()
-                    + " - "
-                    + e.getMessage()));
-      }
-
-      // Other exceptions - configuration or runtime error
+    } catch (UnsupportedOperationException e) {
+      // Transaction mode is not supported by the configured transaction manager
       throw new ParameterException(
           spec.commandLine(),
           DataLoaderError.INVALID_TRANSACTION_MODE.buildMessage(
-              "Failed to validate transaction mode compatibility. Error: "
+              "Please try with STORAGE mode or check your ScalarDB configuration. "
+                  + "Error: "
                   + e.getClass().getSimpleName()
                   + " - "
                   + e.getMessage()));
+    } 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()));
     } finally {
       // Ensure transaction is aborted
       if (transaction != null) {

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

@@ -7,11 +7,9 @@
 import static org.mockito.Mockito.when;
 
 import com.scalar.db.api.DistributedTransactionManager;
-import com.scalar.db.common.CoreError;
 import com.scalar.db.dataloader.core.FileFormat;
 import com.scalar.db.dataloader.core.ScalarDbMode;
 import com.scalar.db.dataloader.core.dataimport.ImportMode;
-import com.scalar.db.exception.transaction.TransactionException;
 import com.scalar.db.service.TransactionFactory;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -288,18 +286,14 @@ void call_withoutMaxThreads_shouldDefaultToAvailableProcessors() {
   }
 
   @Test
-  void validateTransactionMode_withInvalidConfig_shouldThrowException() throws Exception {
-    // Arrange - Mock TransactionFactory to throw exception with error
+  void validateTransactionMode_withUnsupportedOperation_shouldThrowException() throws Exception {
+    // Arrange - Mock TransactionFactory to throw UnsupportedOperationException
     TransactionFactory mockFactory = mock(TransactionFactory.class);
     DistributedTransactionManager mockManager = mock(DistributedTransactionManager.class);
 
     when(mockFactory.getTransactionManager()).thenReturn(mockManager);
     when(mockManager.startReadOnly())
-        .thenThrow(
-            new TransactionException(
-                CoreError.SINGLE_CRUD_OPERATION_TRANSACTION_BEGINNING_TRANSACTION_NOT_ALLOWED
-                    .buildMessage(),
-                null));
+        .thenThrow(new UnsupportedOperationException("Transaction mode is not supported"));
 
     ImportCommand command = new ImportCommand();
     CommandLine cmd = new CommandLine(command);
@@ -312,13 +306,8 @@ void validateTransactionMode_withInvalidConfig_shouldThrowException() throws Exc
             CommandLine.ParameterException.class,
             () -> command.validateTransactionMode(mockFactory));
 
-    assertTrue(thrown.getMessage().contains("does not support TRANSACTION mode"));
-    assertTrue(
-        thrown
-            .getMessage()
-            .contains(
-                CoreError.SINGLE_CRUD_OPERATION_TRANSACTION_BEGINNING_TRANSACTION_NOT_ALLOWED
-                    .buildCode()));
+    assertTrue(thrown.getMessage().contains("TRANSACTION mode is not compatible"));
+    assertTrue(thrown.getMessage().contains("UnsupportedOperationException"));
   }
 
   @Test
@@ -341,7 +330,7 @@ void validateTransactionMode_withOtherException_shouldThrowException() throws Ex
             CommandLine.ParameterException.class,
             () -> command.validateTransactionMode(mockFactory));
 
-    assertTrue(thrown.getMessage().contains("Failed to validate transaction mode"));
+    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

@@ -222,6 +222,8 @@ public enum DataLoaderError implements ScalarDbError {
       "TRANSACTION mode is not compatible with the current configuration. %s",
       "",
       ""),
+  TRANSACTION_MODE_VALIDATION_FAILED(
+      Category.USER_ERROR, "0059", "Failed to validate TRANSACTION mode. %s", "", ""),
 
   //
   // Errors for the internal error category