Support optional 'path' config type

Initial work needed for this to work (config definition and config library)

4 files changed, 25 insertions, 4 deletions

diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
index 0e2f6cc4d05..bb6b8eb64b4 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefLineParsingTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.codegen;
 
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -246,4 +247,24 @@ public class DefLineParsingTest {
         assertTrue(r1.getRestart());
     }
 
+    @Test
+    void testParseOptionalPathWithDefault() {
+        DefLine l = new DefLine("pathWithDef path optional");
+
+        assertEquals("pathWithDef", l.getName());
+        assertNull(l.getDefault());
+        assertTrue(l.isOptional());
+        assertEquals("optionalPath", l.getType().getName());
+    }
+
+    @Test
+    void testParsPathWithDefault() {
+        DefLine l = new DefLine("pathWithDef path");
+
+        assertEquals("pathWithDef", l.getName());
+        assertNull(l.getDefault());
+        assertFalse(l.isOptional());
+        assertEquals("path", l.getType().getName());
+    }
+
 }
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
index 45d1f21763c..e5227282c05 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
@@ -28,7 +28,7 @@ public class DefParserTest {
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
         assertNotNull(root);
         CNode[] children = root.getChildren();
-        assertEquals(37, children.length);
+        assertEquals(38, children.length);
 
         int numGrandChildren = 0;
         int numGreatGrandChildren = 0;
@@ -70,7 +70,7 @@ public class DefParserTest {
     void testMd5Sum() throws IOException {
         File defFile = new File(DEF_NAME);
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
-        assertEquals("0501f9e2c4ecc8c283e100e0b1178ca4", root.defMd5);
+        assertEquals("ee37973499305fde315da46256e64b2e", root.defMd5);
     }
 
     @Test
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
index 428576e340f..c3145c03fff 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
@@ -120,7 +120,7 @@ public class JavaClassBuilderTest {
         }
         for (int i = 0; i < referenceClassLines.size(); i++) {
             if (configClassLines.length <= i)
-                fail("Missing lines i generated config class. First missing line:\n" + referenceClassLines.get(i));
+                fail("Missing lines in generated config class. First missing line:\n" + referenceClassLines.get(i));
             assertEquals(referenceClassLines.get(i), configClassLines[i], "Line " + i);
         }
     }
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
index 57b3ed962eb..18608102ffa 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
@@ -70,7 +70,7 @@ public class NormalizedDefinitionTest {
         }
 
         assertNotNull(out);
-        assertEquals(75, out.size());
+        assertEquals(76, out.size());
 
         assertNotNull(fileReader);
         fileReader.close();