Add method to use Duration as timeout to make unit explicit, and avoid many magic conversions.

3 files changed, 6 insertions, 4 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index 7078c5aae6c..f6ebfcc416c 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -113,7 +113,7 @@ public class FileReferenceDownloader {
     private boolean startDownloadRpc(FileReferenceDownload fileReferenceDownload, int retryCount, Connection connection) {
         Request request = createRequest(fileReferenceDownload);
         Duration rpcTimeout = rpcTimeout(retryCount);
-        connection.invokeSync(request, rpcTimeout.getSeconds());
+        connection.invokeSync(request, rpcTimeout);
 
         Level logLevel = (retryCount > 3 ? Level.INFO : Level.FINE);
         FileReference fileReference = fileReferenceDownload.fileReference();
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java
index f3b166c60fe..571c1f3a81f 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/RpcTester.java
@@ -13,6 +13,8 @@ import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
+
+import java.time.Duration;
 import java.util.logging.Level;
 import net.jpountz.xxhash.XXHash64;
 import net.jpountz.xxhash.XXHashFactory;
@@ -91,7 +93,7 @@ public class RpcTester {
             fileBlob.parameters().add(new Int32Value(0));
             fileBlob.parameters().add(new StringValue("OK"));
             log.log(Level.INFO, "Doing invokeSync");
-            target.invokeSync(fileBlob, 5);
+            target.invokeSync(fileBlob, Duration.ofSeconds(5));
             log.log(Level.INFO, "Done with invokeSync");
         }
     }
diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
index 629ea5915df..ffef06e6367 100644
--- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
+++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
@@ -334,12 +334,12 @@ public class FileDownloaderTest {
         }
 
         @Override
-        public void invokeAsync(Request request, double jrtTimeout, RequestWaiter requestWaiter) {
+        public void invokeAsync(Request request, Duration jrtTimeout, RequestWaiter requestWaiter) {
             responseHandler.request(request);
         }
 
         @Override
-        public void invokeSync(Request request, double jrtTimeout) {
+        public void invokeSync(Request request, Duration jrtTimeout) {
             responseHandler.request(request);
         }