APPS-53008: Enable SnowflakeFileTransferAgent deep tests with mockStatic of StorageClientFactory.getFactory

Author: sfc-gh-jchernandez

src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java

@@ -80,8 +80,6 @@ public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
   private static final SFLogger logger =
       SFLoggerFactory.getLogger(SnowflakeFileTransferAgent.class);
 
-  static final StorageClientFactory storageFactory = StorageClientFactory.getFactory();
-
   private static final ObjectMapper mapper = ObjectMapperFactory.getObjectMapper();
 
   // We will allow buffering of upto 128M data before spilling to disk during
@@ -891,7 +889,8 @@ public SnowflakeFileTransferAgent(String command, SFSession session, SFStatement
     parseCommand();
 
     if (stageInfo.getStageType() != StageInfo.StageType.LOCAL_FS) {
-      storageClient = storageFactory.createClient(stageInfo, parallel, null, session);
+      storageClient =
+          StorageClientFactory.getFactory().createClient(stageInfo, parallel, null, session);
     }
   }
 
@@ -1627,7 +1626,8 @@ private void uploadStream() throws SnowflakeSQLException {
                     fileMetadata,
                     (stageInfo.getStageType() == StageInfo.StageType.LOCAL_FS)
                         ? null
-                        : storageFactory.createClient(stageInfo, parallel, encMat, session),
+                        : StorageClientFactory.getFactory()
+                            .createClient(stageInfo, parallel, encMat, session),
                     session,
                     command,
                     sourceStream,
@@ -1728,7 +1728,7 @@ public InputStream downloadStream(String fileName) throws SnowflakeSQLException
     RemoteStoreFileEncryptionMaterial encMat = srcFileToEncMat.get(sourceLocation);
     String presignedUrl = srcFileToPresignedUrl.get(sourceLocation);
 
-    return storageFactory
+    return StorageClientFactory.getFactory()
         .createClient(stageInfo, parallel, encMat, session)
         .downloadToStream(
             session,
@@ -1772,7 +1772,8 @@ private void downloadFiles() throws SnowflakeSQLException {
                     fileMetadataMap,
                     (stageInfo.getStageType() == StageInfo.StageType.LOCAL_FS)
                         ? null
-                        : storageFactory.createClient(stageInfo, parallel, encMat, session),
+                        : StorageClientFactory.getFactory()
+                            .createClient(stageInfo, parallel, encMat, session),
                     session,
                     command,
                     parallel,
@@ -1878,8 +1879,8 @@ private void uploadFiles(Set<String> fileList, int parallel) throws SnowflakeSQL
                     fileMetadata,
                     (stageInfo.getStageType() == StageInfo.StageType.LOCAL_FS)
                         ? null
-                        : storageFactory.createClient(
-                            stageInfo, parallel, encryptionMaterial.get(0), session),
+                        : StorageClientFactory.getFactory()
+                            .createClient(stageInfo, parallel, encryptionMaterial.get(0), session),
                     session,
                     command,
                     null,
@@ -2174,7 +2175,8 @@ private static void pushFileToRemoteStore(
         (ArgSupplier)
             () -> (encMat == null ? "NULL" : encMat.getSmkId() + "|" + encMat.getQueryId()));
 
-    StorageObjectMetadata meta = storageFactory.createStorageMetadataObj(stage.getStageType());
+    StorageObjectMetadata meta =
+        StorageClientFactory.getFactory().createStorageMetadataObj(stage.getStageType());
     meta.setContentLength(uploadSize);
     if (digest != null) {
       initialClient.addDigestMetadata(meta, digest);
@@ -2312,7 +2314,7 @@ public static void uploadWithoutConnection(SnowflakeFileTransferConfig config) t
           uploadSize);
 
       SnowflakeStorageClient initialClient =
-          storageFactory.createClient(stageInfo, 1, encMat, /* session= */ null);
+          StorageClientFactory.getFactory().createClient(stageInfo, 1, encMat, /* session= */ null);
 
       // Normal flow will never hit here. This is only for testing purposes
       if (isInjectedFileTransferExceptionEnabled()) {
@@ -2428,7 +2430,8 @@ private static void pushFileToRemoteStoreWithPresignedUrl(
         (ArgSupplier)
             () -> (encMat == null ? "NULL" : encMat.getSmkId() + "|" + encMat.getQueryId()));
 
-    StorageObjectMetadata meta = storageFactory.createStorageMetadataObj(stage.getStageType());
+    StorageObjectMetadata meta =
+        StorageClientFactory.getFactory().createStorageMetadataObj(stage.getStageType());
     meta.setContentLength(uploadSize);
     if (digest != null) {
       initialClient.addDigestMetadata(meta, digest);