Add public ctor in FileDownloader that takes a downloadDirectory

+ Use it in the ApplicationPackageMaintainer

1 files changed, 1 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 03abdba643d..9ab65be7dab 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -45,14 +45,13 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
 
         distributeApplicationPackage = Flags.CONFIGSERVER_DISTRIBUTE_APPLICATION_PACKAGE.bindTo(flagSource);
         downloadDirectory = new File(Defaults.getDefaults().underVespaHome(configserverConfig.fileReferencesDir()));
-        if (distributeApplicationPackage.value()) assertDownloadDirectoryIsDefault(downloadDirectory);
     }
 
     @Override
     protected void maintain() {
         if (! distributeApplicationPackage.value()) return;
 
-        var fileDownloader =  new FileDownloader(createConnectionPool(configserverConfig));
+        var fileDownloader =  new FileDownloader(createConnectionPool(configserverConfig), downloadDirectory);
         try {
             for (var applicationId : applicationRepository.listApplications()) {
                 RemoteSession session = applicationRepository.getActiveSession(applicationId);
@@ -76,11 +75,4 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
         return ! fileReferencesOnDisk.contains(applicationPackageReference.value());
     }
 
-    // Required to use FileDownloader because it has no public ctor that takes a directory.
-    private static void assertDownloadDirectoryIsDefault(File fileReferencesDir) {
-        if (fileReferencesDir != FileDownloader.defaultDownloadDirectory) throw new IllegalArgumentException(
-                "Files must be downloaded to the default download directory ("
-                        + FileDownloader.defaultDownloadDirectory +  "), not " + fileReferencesDir);
-    }
-
 }