Handle optional path separately

2 files changed, 8 insertions, 5 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
index 44365d8c244..ba1040dbf36 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java
@@ -38,7 +38,7 @@ public class ConfigDefinition {
     private final Map<String, RefDef> referenceDefs = new LinkedHashMap<>();
     private final Map<String, FileDef> fileDefs = new LinkedHashMap<>();
     private final Map<String, PathDef> pathDefs = new LinkedHashMap<>();
-    private final Map<String, PathDef> optionalPathDefs = new LinkedHashMap<>();
+    private final Map<String, OptionalPathDef> optionalPathDefs = new LinkedHashMap<>();
     private final Map<String, UrlDef> urlDefs = new LinkedHashMap<>();
     private final Map<String, ModelDef> modelDefs = new LinkedHashMap<>();
     private final Map<String, StructDef> structDefs = new LinkedHashMap<>();
@@ -676,11 +676,11 @@ public class ConfigDefinition {
     }
 
     public void addOptionalPathDef(String refId, String defVal) {
-        pathDefs.put(refId, new PathDef(defVal));
+        optionalPathDefs.put(refId, new OptionalPathDef(defVal));
     }
 
     public void addOptionalPathDef(String refId) {
-        pathDefs.put(refId, new PathDef(null));
+        optionalPathDefs.put(refId, new OptionalPathDef(null));
     }
 
     public void addUrlDef(String url, String defVal) {
@@ -725,6 +725,8 @@ public class ConfigDefinition {
 
     public Map<String, PathDef> getPathDefs() { return pathDefs; }
 
+    public Map<String, OptionalPathDef> getOptionalPathDefs() { return optionalPathDefs; }
+
     public Map<String, UrlDef> getUrlDefs() { return urlDefs; }
 
     public Map<String, ModelDef> getModelDefs() { return modelDefs; }
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
index e4c8420d43f..523fc78bac0 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
@@ -77,9 +77,10 @@ public class ConfigDefinitionBuilderTest {
         assertThat(def.getFileDefs().size(), is(1));
         assertNotNull(def.getFileDefs().get("fileVal"));
 
-        assertThat(def.getPathDefs().size(), is(2));
+        assertThat(def.getPathDefs().size(), is(1));
         assertNotNull(def.getPathDefs().get("pathVal"));
-        assertNotNull(def.getPathDefs().get("optionalPathVal"));
+        assertThat(def.getOptionalPathDefs().size(), is(1));
+        assertNotNull(def.getOptionalPathDefs().get("optionalPathVal"));
 
         // An array does not have to have any elements set
         assertThat(def.getArrayDefs().size(), is(10));