summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-31 11:04:06 +0100
committerHarald Musum <musum@oath.com>2018-01-31 11:04:06 +0100
commit27b449d7aa12b673e600e55092b52e7674277fa5 (patch)
tree68b4cdfb0043a5c68f3686e7a2bb0ea34cccc7fe
parentc2793807b7ba3214100f27734140e3f4ad3a304c (diff)
Remove unused method
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java10
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyDistribution.java5
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java4
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java4
4 files changed, 0 insertions, 23 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
index 53d1bb09758..cecee567a0b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
@@ -22,16 +22,6 @@ public interface FileDistribution {
* preparing application package).
*
* @param hostName host which should be notified about file references to download
- * @param fileReferences set of file references to start downloading
- */
- // TODO: Remove when 6.197 is the last version in use
- void startDownload(String hostName, Set<FileReference> fileReferences);
-
- /**
- * Notifies client which file references to download. Used to start downloading early (while
- * preparing application package).
- *
- * @param hostName host which should be notified about file references to download
* @param port port which should be used when notifying
* @param fileReferences set of file references to start downloading
*/
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyDistribution.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyDistribution.java
index 2b179a6a2e4..571f70c848f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyDistribution.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/CombinedLegacyDistribution.java
@@ -10,7 +10,6 @@ import com.yahoo.jrt.StringArray;
import com.yahoo.jrt.Supervisor;
import com.yahoo.jrt.Target;
import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.model.ConfigProxy;
import java.util.Collection;
import java.util.Set;
@@ -37,10 +36,6 @@ public class CombinedLegacyDistribution implements FileDistribution {
legacy.sendDeployedFiles(hostName, fileReferences);
}
- public void startDownload(String hostName, Set<FileReference> fileReferences) {
- startDownload(hostName, ConfigProxy.BASEPORT, fileReferences);
- }
-
@Override
public void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
if (disableFileDistributor)
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java
index 7dea85c59c3..8a0125ce33c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBHandler.java
@@ -29,10 +29,6 @@ public class FileDBHandler implements FileDistribution {
manager.setDeployedFiles(hostName, referencesAsString);
}
- public void startDownload(String hostName, Set<FileReference> fileReferences) {
- throw new UnsupportedOperationException("Not valid for this Filedistribution implementation");
- }
-
@Override
public void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
throw new UnsupportedOperationException("Not valid for this Filedistribution implementation");
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java
index 9ba8daf87e4..dcc590180f2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/MockFileDBHandler.java
@@ -20,10 +20,6 @@ public class MockFileDBHandler implements FileDistribution {
sendDeployedFilesCalled++;
}
- public void startDownload(String hostName, Set<FileReference> fileReferences) {
- throw new UnsupportedOperationException("Not valid for this Filedistribution implementation");
- }
-
@Override
public void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
throw new UnsupportedOperationException("Not valid for this Filedistribution implementation");