summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-07-17 18:48:53 +0200
committergjoranv <gv@verizonmedia.com>2020-07-17 18:48:53 +0200
commitc020e9a0ea5cb1f4130e6f12d510501bd33f7f40 (patch)
tree138db885e91f3e5987d804ab7781992608d0acfc /config-model
parent1395510686fd5252494e25e9e92eae9131dc60e1 (diff)
Drop the now unnecessary 'file:' prefix for disk bundles.
- It was originally used to separate between disk bundles and bundles retrieved with file distribution. - Keep conversion code until the last model producing 'file:' has rolled out of hosted.
Diffstat (limited to 'config-model')
-rwxr-xr-xconfig-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index e2d0868cb9d..f44abef607d 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -69,8 +69,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
-import static com.yahoo.container.core.BundleLoaderProperties.DISK_BUNDLE_PREFIX;
-
/**
* Parent class for all container cluster types.
*
@@ -474,14 +472,11 @@ public abstract class ContainerCluster<CONTAINER extends Container>
@Override
public void getConfig(PlatformBundlesConfig.Builder builder) {
- platformBundles.stream() .map(ContainerCluster::toFileReferenceString)
+ platformBundles.stream()
+ .map(Path::toString)
.forEach(builder::bundles);
}
- private static String toFileReferenceString(Path path) {
- return DISK_BUNDLE_PREFIX + path.toString();
- }
-
@Override
public void getConfig(QrSearchersConfig.Builder builder) {
if (containerSearch != null) containerSearch.getConfig(builder);