Added changes based on feedback

Author: inv-jishnu

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/processor/ImportProcessorParams.java

@@ -1,6 +1,5 @@
 package com.scalar.db.dataloader.core.dataimport.processor;
 
-import com.scalar.db.api.DistributedStorage;
 import com.scalar.db.api.DistributedTransactionManager;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.dataloader.core.ScalarDbMode;
@@ -36,9 +35,6 @@ public class ImportProcessorParams {
   /** Data Access Object for ScalarDB operations. */
   ScalarDbDao dao;
 
-  /** Storage interface for non-transactional operations. */
-  DistributedStorage distributedStorage;
-
   /** Transaction manager for handling transactional operations. */
   DistributedTransactionManager distributedTransactionManager;
 }

data-loader/core/src/test/java/com/scalar/db/dataloader/core/dataimport/ImportManagerTest.java

@@ -45,8 +45,7 @@ void setUp() {
             options,
             processorFactory,
             ScalarDbMode.STORAGE,
-            distributedStorage,
-            null); // Only one resource present
+            distributedTransactionManager);
     importManager.addListener(listener1);
     importManager.addListener(listener2);
   }
@@ -57,7 +56,7 @@ void onAllDataChunksCompleted_shouldNotifyListenersAndCloseStorage() {
 
     verify(listener1).onAllDataChunksCompleted();
     verify(listener2).onAllDataChunksCompleted();
-    verify(distributedStorage).close();
+    verify(distributedTransactionManager).close();
   }
 
   @Test
@@ -69,7 +68,7 @@ void onAllDataChunksCompleted_shouldAggregateListenerExceptionAndStillCloseResou
 
     assertTrue(thrown.getMessage().contains("Error during completion"));
     assertEquals("Listener1 failed", thrown.getCause().getMessage());
-    verify(distributedStorage).close();
+    verify(distributedTransactionManager).close();
   }
 
   @Test
@@ -81,7 +80,6 @@ void closeResources_shouldCloseTransactionManagerIfStorageIsNull() {
             mock(ImportOptions.class),
             mock(ImportProcessorFactory.class),
             ScalarDbMode.TRANSACTION,
-            null,
             distributedTransactionManager);
 
     managerWithTx.closeResources();
@@ -90,7 +88,7 @@ void closeResources_shouldCloseTransactionManagerIfStorageIsNull() {
 
   @Test
   void closeResources_shouldThrowIfResourceCloseFails() {
-    doThrow(new RuntimeException("Close failed")).when(distributedStorage).close();
+    doThrow(new RuntimeException("Close failed")).when(distributedTransactionManager).close();
 
     RuntimeException ex =
         assertThrows(RuntimeException.class, () -> importManager.closeResources());

data-loader/core/src/test/java/com/scalar/db/dataloader/core/dataimport/processor/ImportProcessorTest.java

@@ -87,7 +87,6 @@ void process_withStorageMode_shouldProcessAllDataChunks() {
     BufferedReader reader = new BufferedReader(new StringReader("test data"));
     when(params.getScalarDbMode()).thenReturn(ScalarDbMode.STORAGE);
     when(params.getDao()).thenReturn(dao);
-    when(params.getDistributedStorage()).thenReturn(distributedStorage);
     when(params.getTableColumnDataTypes()).thenReturn(tableColumnDataTypes);
 
     TestImportProcessor processor = new TestImportProcessor(params);
@@ -150,7 +149,6 @@ void process_withMultipleDataChunks_shouldUseThreadPool() {
     final int maxThreads = 4;
     when(importOptions.getMaxThreads()).thenReturn(maxThreads);
     when(params.getDao()).thenReturn(dao);
-    when(params.getDistributedStorage()).thenReturn(distributedStorage);
     when(params.getTableColumnDataTypes()).thenReturn(tableColumnDataTypes);
     when(params.getTableMetadataByTableName()).thenReturn(tableMetadataByTableName);
 
@@ -205,7 +203,6 @@ void process_withLargeNumberOfTasks_shouldWaitForAllTasksToComplete() {
     final int maxThreads = 2;
     when(importOptions.getMaxThreads()).thenReturn(maxThreads);
     when(params.getDao()).thenReturn(dao);
-    when(params.getDistributedStorage()).thenReturn(distributedStorage);
     when(params.getTableColumnDataTypes()).thenReturn(tableColumnDataTypes);
     when(params.getTableMetadataByTableName()).thenReturn(tableMetadataByTableName);
 
@@ -235,7 +232,6 @@ void process_withShutdown_shouldShutdownExecutorsGracefully() {
     // Arrange
     when(params.getScalarDbMode()).thenReturn(ScalarDbMode.STORAGE);
     when(params.getDao()).thenReturn(dao);
-    when(params.getDistributedStorage()).thenReturn(distributedStorage);
     when(params.getTableColumnDataTypes()).thenReturn(tableColumnDataTypes);
     when(params.getTableMetadataByTableName()).thenReturn(tableMetadataByTableName);