diff options
author | Harald Musum <musum@yahooinc.com> | 2021-10-17 22:11:16 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-10-17 22:11:16 +0200 |
commit | afa7d83d61c0ac1baaa0413a10166335dc51dba9 (patch) | |
tree | c005ef6dd84dd882eee00dc6843b8332e1e734f1 /filedistribution | |
parent | e84ae35d562365a2daa05f95e145435a50431c6d (diff) |
Move check for non-null file reference to where it belongs
Diffstat (limited to 'filedistribution')
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java | 2 | ||||
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownload.java | 2 |
2 files changed, 2 insertions, 2 deletions
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; |