Revert "Cleanup, more tests and separate resolved from not"

1 files changed, 4 insertions, 6 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..b0ce2291438 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
@@ -250,12 +250,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())
+            model = model.withUrl(Optional.of(resolveUrl(model.url().get().value())));
+        else if (model.path().isPresent())
+            model = model.withPath(Optional.of(resolvePath(model.path().get().value())));
         return model;
     }