Remove config and support for non-chunked transfer

1 files changed, 1 insertions, 34 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index 43a5eae90bf..3d6c7bf0a5c 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -33,7 +33,6 @@ import java.util.logging.Logger;
 public class FileReceiver {
 
     private final static Logger log = Logger.getLogger(FileReceiver.class.getName());
-    public final static String RECEIVE_METHOD = "filedistribution.receiveFile";
     public final static String RECEIVE_META_METHOD = "filedistribution.receiveFileMeta";
     public final static String RECEIVE_PART_METHOD = "filedistribution.receiveFilePart";
     public final static String RECEIVE_EOF_METHOD = "filedistribution.receiveFileEof";
@@ -152,7 +151,7 @@ public class FileReceiver {
     }
 
     // Defined here so that it can be added to supervisor used by client (server will use same connection when calling
-    // receiveFile after getting a serveFile method call). handler needs to implement receiveFile method
+    // receiveFile after getting a serveFile method call). handler needs to implement receiveFile* methods
     private List<Method> receiveFileMethod(Object handler) {
         List<Method> methods = new ArrayList<>();
         methods.add(new Method(RECEIVE_META_METHOD, "sssl", "ii", handler,"receiveFileMeta")
@@ -175,41 +174,9 @@ public class FileReceiver {
                 .paramDesc(3, "error-code", "Error code. 0 if none")
                 .paramDesc(4, "error-description", "Error description.")
                 .returnDesc(0, "ret", "0 if success, 1 if crc mismatch, 2 otherwise"));
-        // Temporary method until we have chunking
-        methods.add(new Method(RECEIVE_METHOD, "sssxlis", "i", handler, "receiveFile")
-                .methodDesc("receive file reference content")
-                .paramDesc(0, "file reference", "file reference to download")
-                .paramDesc(1, "filename", "filename")
-                .paramDesc(2, "type", "'file' or 'compressed'")
-                .paramDesc(3, "content", "array of bytes")
-                .paramDesc(4, "hash", "xx64hash of the file content")
-                .paramDesc(5, "errorcode", "Error code. 0 if none")
-                .paramDesc(6, "error-description", "Error description.")
-                .returnDesc(0, "ret", "0 if success, 1 otherwise"));
         return methods;
     }
 
-    @SuppressWarnings({"UnusedDeclaration"})
-    public final void receiveFile(Request req) {
-        FileReference fileReference = new FileReference(req.parameters().get(0).asString());
-        String filename = req.parameters().get(1).asString();
-        String type = req.parameters().get(2).asString();
-        byte[] content = req.parameters().get(3).asData();
-        long xxhash = req.parameters().get(4).asInt64();
-        int errorCode = req.parameters().get(5).asInt32();
-        String errorDescription = req.parameters().get(6).asString();
-
-        if (errorCode == 0) {
-            log.log(LogLevel.DEBUG, "Receiving file reference '" + fileReference.value() + "'");
-            receiveFile(new FileReferenceDataBlob(fileReference, filename, FileReferenceData.Type.valueOf(type), content, xxhash));
-            req.returnValues().add(new Int32Value(0));
-        } else {
-            log.log(LogLevel.WARNING, "Receiving file reference '" + fileReference.value() + "' failed: " + errorDescription);
-            req.returnValues().add(new Int32Value(1));
-            // TODO: Add error description return value here too?
-        }
-    }
-
     void receiveFile(FileReferenceData fileReferenceData) {
         long xxHashFromContent = fileReferenceData.xxhash();
         if (xxHashFromContent != fileReferenceData.xxhash()) {