Send model paths

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();