diff options
4 files changed, 11 insertions, 32 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 f7abddb3dfe..bb95ba90596 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinition.java @@ -630,25 +630,11 @@ public class ConfigDefinition { referenceDefs.put(refId, new RefDef(null)); } - public void addFileDef(String refId, String defVal) { - fileDefs.put(refId, new FileDef(defVal)); - } - public void addFileDef(String refId) { fileDefs.put(refId, new FileDef(null)); } - public void addPathDef(String refId, String defVal) { - pathDefs.put(refId, new PathDef(defVal)); - } - - public void addPathDef(String refId) { - pathDefs.put(refId, new PathDef(null)); - } - - public void addOptionalPathDef(String refId, String defVal) { - optionalPathDefs.put(refId, new OptionalPathDef(defVal)); - } + public void addPathDef(String refId) { pathDefs.put(refId, new PathDef(null)); } public void addOptionalPathDef(String refId) { optionalPathDefs.put(refId, new OptionalPathDef(null)); diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java index 9cf9fb41839..341280f1f16 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java @@ -109,7 +109,6 @@ public class ConfigDefinitionBuilder { } } - private static void addNode(ConfigDefinition def, LeafCNode.IntegerLeaf leaf) { if (leaf.getDefaultValue() != null) { def.addIntDef(leaf.getName(), Integer.valueOf(leaf.getDefaultValue().getValue())); @@ -159,27 +158,15 @@ public class ConfigDefinitionBuilder { } private static void addNode(ConfigDefinition def, LeafCNode.FileLeaf leaf) { - if (leaf.getDefaultValue() != null) { - def.addFileDef(leaf.getName(), leaf.getDefaultValue().getValue()); - } else { - def.addFileDef(leaf.getName(), null); - } + def.addFileDef(leaf.getName()); } private static void addNode(ConfigDefinition def, LeafCNode.PathLeaf leaf) { - if (leaf.getDefaultValue() != null) { - def.addPathDef(leaf.getName(), leaf.getDefaultValue().getValue()); - } else { - def.addPathDef(leaf.getName(), null); - } + def.addPathDef(leaf.getName()); } private static void addNode(ConfigDefinition def, LeafCNode.OptionalPathLeaf leaf) { - if (leaf.getDefaultValue() != null) { - def.addOptionalPathDef(leaf.getName(), leaf.getDefaultValue().getValue()); - } else { - def.addOptionalPathDef(leaf.getName(), null); - } + def.addOptionalPathDef(leaf.getName()); } private static void addNode(ConfigDefinition def, LeafCNode.UrlLeaf leaf) { diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java index 0a5828b484a..bb0b460cd9d 100755 --- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java @@ -81,7 +81,7 @@ public class ConfigDefinitionTest { def.addReferenceDef("myref"); def.addReferenceDef("myrefdef", "reff"); def.addFileDef("myfile"); - def.addFileDef("myfiledef", "etc"); + def.addFileDef("myfiledef"); } @Test 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 e5227282c05..4d91139626d 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -264,6 +264,12 @@ public class DefParserTest { "continue is a reserved word in C and Java"); } + @Test + void testParsePathWithDefaultValue() { + assertLineFails("somePath path default=\"foo\"", + "Invalid default value"); + } + static StringBuilder createDefTemplate() { StringBuilder sb = new StringBuilder(); // Add a comment line to check that we get correct line number with comments |