Move to its own method

1 files changed, 22 insertions, 18 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
index b6a163a40e5..5621b932332 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
@@ -79,24 +79,7 @@ public class FileDistributionRpcServer {
     @SuppressWarnings({"UnusedDeclaration"})
     public final void getFile(Request req) {
         req.detach();
-        rpcDownloadExecutor.execute(() -> {
-            FileReference fileReference = new FileReference(req.parameters().get(0).asString());
-            log.log(LogLevel.DEBUG, "getFile() called for file reference '" + fileReference.value() + "'");
-            Optional<File> pathToFile = downloader.getFile(fileReference);
-            try {
-                if (pathToFile.isPresent()) {
-                    req.returnValues().add(new StringValue(pathToFile.get().getAbsolutePath()));
-                    log.log(LogLevel.DEBUG, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
-                } else {
-                    log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
-                    req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
-                }
-            } catch (Throwable e) {
-                log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exception: " + e.getMessage());
-                req.setError(fileReferenceInternalError, "File reference '" + fileReference.value() + "' removed");
-            }
-            req.returnRequest();
-        });
+        downloadFile(req);
     }
 
     @SuppressWarnings({"UnusedDeclaration"})
@@ -130,4 +113,25 @@ public class FileDistributionRpcServer {
         req.returnValues().add(new Int32Value(0));
     }
 
+    private void downloadFile(Request req) {
+        rpcDownloadExecutor.execute(() -> {
+            FileReference fileReference = new FileReference(req.parameters().get(0).asString());
+            log.log(LogLevel.DEBUG, "getFile() called for file reference '" + fileReference.value() + "'");
+            Optional<File> pathToFile = downloader.getFile(fileReference);
+            try {
+                if (pathToFile.isPresent()) {
+                    req.returnValues().add(new StringValue(pathToFile.get().getAbsolutePath()));
+                    log.log(LogLevel.DEBUG, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
+                } else {
+                    log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
+                    req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
+                }
+            } catch (Throwable e) {
+                log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exception: " + e.getMessage());
+                req.setError(fileReferenceInternalError, "File reference '" + fileReference.value() + "' removed");
+            }
+            req.returnRequest();
+        });
+    }
+
 }