diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-05-23 21:27:02 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-05-23 22:01:21 +0200 |
commit | 3cf7a16ab281cc5a2bde4dd608f25e8b074efd7e (patch) | |
tree | 6368e1303ec54610c2bcefd0e4956a8013b9f639 /filedistribution/src | |
parent | f2aaa615ebab15c614d52617268920c8fdfd1a84 (diff) |
Remove usage of deprecated Method constructor
Diffstat (limited to 'filedistribution/src')
2 files changed, 15 insertions, 25 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 bf9201e6cda..d27d7422beb 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java @@ -43,23 +43,19 @@ public class FileDistributionRpcServer { private void declareFileDistributionMethods() { // Legacy method, needs to be the same name as used in filedistributor - supervisor.addMethod(new Method("waitFor", "s", "s", - this, "getFile") + supervisor.addMethod(new Method("waitFor", "s", "s", this::getFile) .methodDesc("get path to file reference") .paramDesc(0, "file reference", "file reference") .returnDesc(0, "path", "path to file")); - supervisor.addMethod(new Method("filedistribution.getFile", "s", "s", - this, "getFile") + supervisor.addMethod(new Method("filedistribution.getFile", "s", "s", this::getFile) .methodDesc("get path to file reference") .paramDesc(0, "file reference", "file reference") .returnDesc(0, "path", "path to file")); - supervisor.addMethod(new Method("filedistribution.getActiveFileReferencesStatus", "", "SD", - this, "getActiveFileReferencesStatus") + supervisor.addMethod(new Method("filedistribution.getActiveFileReferencesStatus", "", "SD", this::getActiveFileReferencesStatus) .methodDesc("download status for file references") .returnDesc(0, "file references", "array of file references") .returnDesc(1, "download status", "percentage downloaded of each file reference in above array")); - supervisor.addMethod(new Method("filedistribution.setFileReferencesToDownload", "S", "i", - this, "setFileReferencesToDownload") + supervisor.addMethod(new Method("filedistribution.setFileReferencesToDownload", "S", "i", this::setFileReferencesToDownload) .methodDesc("set which file references to download") .paramDesc(0, "file references", "file reference to download") .returnDesc(0, "ret", "0 if success, 1 otherwise")); @@ -75,14 +71,12 @@ public class FileDistributionRpcServer { private static final int fileReferenceRemoved = fileReferenceDoesNotExists + 1; private static final int fileReferenceInternalError = fileReferenceRemoved + 1; - @SuppressWarnings({"UnusedDeclaration"}) - public final void getFile(Request req) { + private void getFile(Request req) { req.detach(); rpcDownloadExecutor.execute(() -> downloadFile(req)); } - @SuppressWarnings({"UnusedDeclaration"}) - public final void getActiveFileReferencesStatus(Request req) { + private void getActiveFileReferencesStatus(Request req) { Map<FileReference, Double> downloadStatus = downloader.downloadStatus(); String[] fileRefArray = new String[downloadStatus.keySet().size()]; @@ -101,8 +95,7 @@ public class FileDistributionRpcServer { req.returnValues().add(new DoubleArray(downloadStatusArray)); } - @SuppressWarnings({"UnusedDeclaration"}) - public final void setFileReferencesToDownload(Request req) { + private void setFileReferencesToDownload(Request req) { log.log(LogLevel.DEBUG, () -> "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); Arrays.stream(req.parameters().get(0).asStringArray()) .map(FileReference::new) 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 b9714cf8126..60a5e25b3e0 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java @@ -156,27 +156,27 @@ public class FileReceiver { } private void registerMethods() { - receiveFileMethod(this).forEach(supervisor::addMethod); + receiveFileMethod().forEach(supervisor::addMethod); } // 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* methods - private List<Method> receiveFileMethod(Object handler) { + private List<Method> receiveFileMethod() { List<Method> methods = new ArrayList<>(); - methods.add(new Method(RECEIVE_META_METHOD, "sssl", "ii", handler,"receiveFileMeta") + methods.add(new Method(RECEIVE_META_METHOD, "sssl", "ii", this::receiveFileMeta) .paramDesc(0, "filereference", "file reference to download") .paramDesc(1, "filename", "filename") .paramDesc(2, "type", "'file' or 'compressed'") .paramDesc(3, "filelength", "length in bytes of file") .returnDesc(0, "ret", "0 if success, 1 otherwise") .returnDesc(1, "session-id", "Session id to be used for this transfer")); - methods.add(new Method(RECEIVE_PART_METHOD, "siix", "i", handler,"receiveFilePart") + methods.add(new Method(RECEIVE_PART_METHOD, "siix", "i", this::receiveFilePart) .paramDesc(0, "filereference", "file reference to download") .paramDesc(1, "session-id", "Session id to be used for this transfer") .paramDesc(2, "partid", "relative part number starting at zero") .paramDesc(3, "data", "bytes in this part") .returnDesc(0, "ret", "0 if success, 1 otherwise")); - methods.add(new Method(RECEIVE_EOF_METHOD, "silis", "i", handler,"receiveFileEof") + methods.add(new Method(RECEIVE_EOF_METHOD, "silis", "i", this::receiveFileEof) .paramDesc(0, "filereference", "file reference to download") .paramDesc(1, "session-id", "Session id to be used for this transfer") .paramDesc(2, "crc-code", "crc code (xxhash64)") @@ -209,8 +209,7 @@ public class FileReceiver { } } - @SuppressWarnings({"UnusedDeclaration"}) - public final void receiveFileMeta(Request req) { + private void receiveFileMeta(Request req) { log.log(LogLevel.DEBUG, () -> "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); String fileName = req.parameters().get(1).asString(); @@ -235,8 +234,7 @@ public class FileReceiver { req.returnValues().add(new Int32Value(sessionId)); } - @SuppressWarnings({"UnusedDeclaration"}) - public final void receiveFilePart(Request req) { + private void receiveFilePart(Request req) { log.log(LogLevel.DEBUG, () -> "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); @@ -257,8 +255,7 @@ public class FileReceiver { req.returnValues().add(new Int32Value(retval)); } - @SuppressWarnings({"UnusedDeclaration"}) - public final void receiveFileEof(Request req) { + private void receiveFileEof(Request req) { log.log(LogLevel.DEBUG, () -> "Received method call '" + req.methodName() + "' with parameters : " + req.parameters()); FileReference reference = new FileReference(req.parameters().get(0).asString()); int sessionId = req.parameters().get(1).asInt32(); |