From afa7d83d61c0ac1baaa0413a10166335dc51dba9 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Sun, 17 Oct 2021 22:11:16 +0200
Subject: Move check for non-null file reference to where it belongs

---
 .../src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java  | 2 --
 .../java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java    | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'filedistribution')

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 e5cff0eb2e1..018bc7e6569 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -11,7 +11,6 @@ import com.yahoo.yolean.Exceptions;
 import java.io.File;
 import java.time.Duration;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -83,7 +82,6 @@ public class FileDownloader implements AutoCloseable {
 
     Future<Optional<File>> getFutureFile(FileReferenceDownload fileReferenceDownload) {
         FileReference fileReference = fileReferenceDownload.fileReference();
-        Objects.requireNonNull(fileReference, "file reference cannot be null");
 
         Optional<File> file = getFileFromFileSystem(fileReference);
         return (file.isPresent())
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java
index 470d94ce749..21e35bf67af 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java
@@ -5,6 +5,7 @@ package com.yahoo.vespa.filedistribution;
 import com.yahoo.config.FileReference;
 
 import java.io.File;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
@@ -22,6 +23,7 @@ public class FileReferenceDownload {
     }
 
     public FileReferenceDownload(FileReference fileReference, boolean downloadFromOtherSourceIfNotFound, String client) {
+        Objects.requireNonNull(fileReference, "file reference cannot be null");
         this.fileReference = fileReference;
         this.future = new CompletableFuture<>();
         this.downloadFromOtherSourceIfNotFound = downloadFromOtherSourceIfNotFound;
-- 
cgit v1.2.3