From 6263c9bec9f2655d0388d3d2933fb079f4a79381 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Fri, 15 Oct 2021 11:56:13 +0200
Subject: Minore refactoring

---
 .../vespa/filedistribution/FileDownloader.java     | 23 ++++++----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'filedistribution/src')

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index cf3fa5583f5..a7678771f19 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -2,17 +2,14 @@
 package com.yahoo.vespa.filedistribution;
 
 import com.yahoo.config.FileReference;
-import com.yahoo.config.subscription.ConfigSourceSet;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.vespa.config.Connection;
 import com.yahoo.vespa.config.ConnectionPool;
-import com.yahoo.vespa.config.JRTConnectionPool;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.yolean.Exceptions;
 
 import java.io.File;
 import java.time.Duration;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -31,8 +28,10 @@ import java.util.logging.Logger;
  */
 public class FileDownloader implements AutoCloseable {
 
-    private final static Logger log = Logger.getLogger(FileDownloader.class.getName());
-    public static File defaultDownloadDirectory = new File(Defaults.getDefaults().underVespaHome("var/db/vespa/filedistribution"));
+    private static final Logger log = Logger.getLogger(FileDownloader.class.getName());
+    private static final Duration defaultTimeout = Duration.ofMinutes(5);
+    private static final Duration defaultSleepBetweenRetries = Duration.ofSeconds(10);
+    public static final File defaultDownloadDirectory = new File(Defaults.getDefaults().underVespaHome("var/db/vespa/filedistribution"));
 
     private final ConnectionPool connectionPool;
     private final Supervisor supervisor;
@@ -41,16 +40,12 @@ public class FileDownloader implements AutoCloseable {
     private final FileReferenceDownloader fileReferenceDownloader;
     private final Downloads downloads = new Downloads();
 
-    public FileDownloader(List<String> configServers, Supervisor supervisor) {
-        this(getConnectionPool(configServers, supervisor), supervisor);
-    }
-
     public FileDownloader(ConnectionPool connectionPool, Supervisor supervisor) {
-        this(connectionPool, supervisor, defaultDownloadDirectory);
+        this(connectionPool, supervisor, defaultDownloadDirectory, defaultTimeout, defaultSleepBetweenRetries);
     }
 
     public FileDownloader(ConnectionPool connectionPool, Supervisor supervisor, File downloadDirectory) {
-        this(connectionPool, supervisor, downloadDirectory, Duration.ofMinutes(5), Duration.ofSeconds(10));
+        this(connectionPool, supervisor, downloadDirectory, defaultTimeout, defaultSleepBetweenRetries);
     }
 
     public FileDownloader(ConnectionPool connectionPool,
@@ -139,12 +134,6 @@ public class FileDownloader implements AutoCloseable {
         supervisor.transport().shutdown().join();
     }
 
-    private static ConnectionPool getConnectionPool(List<String> configServers, Supervisor supervisor) {
-        return configServers.size() > 0
-                ? new JRTConnectionPool(new ConfigSourceSet(configServers), supervisor)
-                : emptyConnectionPool();
-    }
-
     public static ConnectionPool emptyConnectionPool() {
         return new EmptyConnectionPool();
     }
-- 
cgit v1.2.3