Merge pull request #21982 from vespa-engine/lesters/default-url-config

Accept default values for URL types in config

2 files changed, 11 insertions, 0 deletions

diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
index 46b710cdcf9..edf4c0270a7 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
@@ -9,6 +9,7 @@ import com.yahoo.foo.IntConfig;
 import com.yahoo.foo.MaptypesConfig;
 import com.yahoo.foo.SimpletypesConfig;
 import com.yahoo.foo.StructtypesConfig;
+import com.yahoo.foo.UrlConfig;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Slime;
 import com.yahoo.text.StringUtilities;
@@ -138,6 +139,12 @@ public class ConfigPayloadTest {
         assertThat(payload.toString(true), is("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}"));
     }
 
+    @Test
+    public void test_serialize_url_fields() {
+        ConfigPayload payload = ConfigPayload.fromInstance(new UrlConfig(new UrlConfig.Builder()));
+        assertThat(payload.toString(true), is("{\"urlVal\":\"http://vespa.ai\"}"));
+    }
+
     @Test(expected=RuntimeException.class)
     public void test_double_leaf_illegal_string() {
         createSimpletypesConfig("doubleval", "illegal");
diff --git a/config/src/test/resources/configs/def-files/url.def b/config/src/test/resources/configs/def-files/url.def
new file mode 100755
index 00000000000..f18a99efa51
--- /dev/null
+++ b/config/src/test/resources/configs/def-files/url.def
@@ -0,0 +1,4 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+namespace=foo
+
+urlVal url default=http://vespa.ai