Merge 17a25e8 into 1c1611d

blackducksoftware · Feb 4, 2020 · 4ea7671 · 4ea7671
2 parents 1c1611d + 17a25e8
commit 4ea7671
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...in/java/com/synopsys/integration/detect/tool/signaturescanner/ScanBatchRunnerFactory.java b/...in/java/com/synopsys/integration/detect/tool/signaturescanner/ScanBatchRunnerFactory.java
@@ -33,6 +33,7 @@
 import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility;
 import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScannerZipInstaller;
 import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig;
+import com.synopsys.integration.blackduck.rest.BlackDuckHttpClient;
 import com.synopsys.integration.detect.exception.DetectUserFriendlyException;
 import com.synopsys.integration.rest.client.IntHttpClient;
 import com.synopsys.integration.util.CleanupZipExpander;
@@ -58,7 +59,9 @@ public ScanBatchRunnerFactory(final IntEnvironmentVariables intEnvironmentVariab
 
     public ScanBatchRunner withInstall(final BlackDuckServerConfig blackDuckServerConfig) {
         // will will use the server to download/update the scanner - this is the most likely situation
-        final ScannerZipInstaller scannerZipInstaller = ScannerZipInstaller.defaultUtility(slf4jIntLogger, blackDuckServerConfig, scanPathsUtility, operatingSystemType);
+        BlackDuckHttpClient blackDuckHttpClient = blackDuckServerConfig.createBlackDuckHttpClient(slf4jIntLogger);
+        CleanupZipExpander cleanupZipExpander = new CleanupZipExpander(slf4jIntLogger);
+        ScannerZipInstaller scannerZipInstaller = new ScannerZipInstaller(slf4jIntLogger, blackDuckHttpClient, cleanupZipExpander, scanPathsUtility, blackDuckServerConfig.getBlackDuckUrl().toString(), operatingSystemType);
         final ScanBatchRunner scanBatchManager = ScanBatchRunner.createComplete(intEnvironmentVariables, scannerZipInstaller, scanPathsUtility, scanCommandRunner);
         return scanBatchManager;
     }