Simplify and reorder arguments, no functional changes

4 files changed, 12 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index b6a7efd3d4d..81cd1dd9738 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -166,8 +166,8 @@ public class FileServer {
         try {
             String client = request.target().toString();
             FileReferenceDownload fileReferenceDownload = new FileReferenceDownload(new FileReference(fileReference),
-                                                                                    downloadFromOtherSourceIfNotFound,
-                                                                                    client);
+                                                                                    client,
+                                                                                    downloadFromOtherSourceIfNotFound);
             fileExists = hasFileDownloadIfNeeded(fileReferenceDownload);
             if (fileExists) startFileServing(fileReference, receiver);
         } catch (IllegalArgumentException e) {
@@ -190,8 +190,11 @@ public class FileServer {
         if (fileReferenceDownload.downloadFromOtherSourceIfNotFound()) {
             log.log(Level.FINE, "File not found, downloading from another source");
             // Create new FileReferenceDownload with downloadFromOtherSourceIfNotFound set to false
-            // to avoid config servers requesting a file reference perpetually, e.g. for a file that does not exist anymore
-            FileReferenceDownload newDownload = new FileReferenceDownload(fileReference, false, fileReferenceDownload.client());
+            // to avoid config servers requesting a file reference perpetually, e.g. for a file that
+            // does not exist anymore
+            FileReferenceDownload newDownload = new FileReferenceDownload(fileReference,
+                                                                          fileReferenceDownload.client(),
+                                                                          false);
             boolean fileExists = downloader.getFile(newDownload).isPresent();
             if ( ! fileExists)
                 log.log(Level.WARNING, "Failed downloading '" + fileReferenceDownload + "'");
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 53007566a62..47eabb0347e 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
@@ -76,8 +76,8 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
                     log.fine(() -> "Downloading application package for " + applicationId + " (session " + sessionId + ")");
 
                     FileReferenceDownload download = new FileReferenceDownload(appFileReference,
-                                                                               false,
-                                                                               this.getClass().getSimpleName());
+                                                                               this.getClass().getSimpleName(),
+                                                                               false);
                     if (fileDownloader.getFile(download).isEmpty()) {
                         failures++;
                         log.info("Failed downloading application package (" + appFileReference + ")" +
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 6ea32a32dd1..99ffff6403b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -583,8 +583,8 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
                             .map(FileReference::new)
                             .forEach(fileReference -> downloader.downloadIfNeeded(
                                     new FileReferenceDownload(fileReference,
-                                                              false, /* downloadFromOtherSourceIfNotFound */
-                                                              req.target().toString())));
+                                                              req.target().toString(),
+                                                              false /* downloadFromOtherSourceIfNotFound */)));
                     req.returnValues().add(new Int32Value(0));
                 });
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
index 29ec11bad26..67c40f94b6a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
@@ -56,7 +56,7 @@ public class FileServerTest {
     public void requireThatNonExistingFileWillBeDownloaded() throws IOException {
         String dir = "123";
         assertFalse(fileServer.hasFile(dir));
-        FileReferenceDownload foo = new FileReferenceDownload(new FileReference(dir));
+        FileReferenceDownload foo = new FileReferenceDownload(new FileReference(dir), "test");
         assertFalse(fileServer.hasFileDownloadIfNeeded(foo));
         writeFile(dir);
         assertTrue(fileServer.hasFileDownloadIfNeeded(foo));