diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-09-17 12:17:30 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-09-17 12:17:30 +0200 |
commit | ef0695e16e2e6e407fa5be050dd0169a8b46f4f9 (patch) | |
tree | 97d77bf72900ef5c8a7519970ac72262a3aaefb0 /config | |
parent | c48c65becbca835d03ebb75dcbc828d13eb0fe75 (diff) |
Send model paths
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java | 11 | ||||
-rw-r--r-- | config/src/test/java/com/yahoo/vespa/config/ConfigPayloadApplierTest.java | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java index 4f078059f46..6beb11cf8fa 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java @@ -249,13 +249,10 @@ public class ConfigPayloadApplier<T extends ConfigInstance.Builder> { private ModelReference resolveModel(String modelStringValue) { var model = ModelReference.valueOf(modelStringValue); - // Resolve any of url and path present, in priority order - if (model.url().isPresent() && canResolveUrls()) { - model = new ModelReference(Path.of(resolveUrl(model.url().get().value()).value())); - } - else if (model.path().isPresent()) { - model = new ModelReference(Path.of(resolvePath(model.path().get().value()).value())); - } + if (model.url().isPresent() && canResolveUrls()) // url has priority + model = ModelReference.resolved(Path.of(resolveUrl(model.url().get().value()).value())); + else if (model.path().isPresent()) + model = ModelReference.resolved(Path.of(resolvePath(model.path().get().value()).value())); return model; } diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadApplierTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadApplierTest.java index aa517c943de..a982949e2fc 100644 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadApplierTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadApplierTest.java @@ -27,9 +27,9 @@ public class ConfigPayloadApplierTest { var inputConfig = new ResolvedTypesConfig.Builder(); inputConfig.myPath(new FileReference("myPath.txt")); inputConfig.myUrl(new UrlReference("myUrl.txt")); - inputConfig.myModel(new ModelReference(Optional.empty(), - Optional.of(new UrlReference("myUrl.txt")), - Optional.of(new FileReference("myPath.txt")))); + inputConfig.myModel(ModelReference.unresolved(Optional.empty(), + Optional.of(new UrlReference("myUrl.txt")), + Optional.of(new FileReference("myPath.txt")))); applier.applyPayload(ConfigPayload.fromInstance(inputConfig.build())); var config = configBuilder.build(); |