summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2022-04-01 08:29:54 +0200
committerJon Marius Venstad <venstad@gmail.com>2022-04-01 08:29:54 +0200
commiteb0a6f731ed02d5030cb144117393482d1dac296 (patch)
tree5ab8c17a4cae0220a21b7a2146915f87db2e988b
parent2db01224bd663ee6eaae6fd00b82f1ef4593382c (diff)
URI is not really supported, and not used either
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java3
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
index 31fabccfa5c..79fa919fabe 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/ApplicationFileManager.java
@@ -42,12 +42,15 @@ public class ApplicationFileManager implements AddFileInterface {
@Override
public FileReference addUri(String uri, Path path) {
+ throw new UnsupportedOperationException("URI type is not supported");
+ /* TODO: this needs to be super-restricted if the config server should ever do this.
try (TmpDir tmp = new TmpDir()) {
return addFile(download(uri, tmp.dir, path.getRelative()));
}
catch (IOException e) {
throw new IllegalArgumentException(e);
}
+ */
}
@Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java
index ca55b99b8b2..60f42321631 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistryTestCase.java
@@ -27,7 +27,7 @@ public class FileDBRegistryTestCase {
private static final String NO_FOO_FILE = "files/no_foo.json";
private static final String BOO_FILE = "/files/no_foo.json";
private static final String BAR_FILE = "../files/no_foo.json";
- private static final String BLOB_NAME = "myblob.name";
+ private static final String BLOB_NAME = "././myblob.name";
private static final FileReference BLOB_REF = new FileReference("12f292a25163dd9");
private static final FileReference FOO_REF = new FileReference("b5ce94ca1feae86c");