diff options
Diffstat (limited to 'node-admin/src')
5 files changed, 20 insertions, 19 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateDescriptor.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateDescriptor.java index 2735b05dc34..e2609d12cef 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateDescriptor.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateDescriptor.java @@ -10,7 +10,7 @@ public class TemplateDescriptor { private String startDelimiter = "%{"; private String endDelimiter = "}"; - private boolean removeNewline = false; + private boolean removeNewline = true; public TemplateDescriptor() {} diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java index fd73d315af6..784afccabc9 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateTest.java @@ -15,7 +15,8 @@ public class TemplateTest { "b%{end}\n" + "c%{list c-}\n" + "d%{end-}\n" + - "e\n"); + "e\n", + new TemplateDescriptor().setRemoveNewline(false)); template.add("a"); template.add("c"); @@ -34,11 +35,11 @@ public class TemplateTest { @Test void verifyComplexIfSection() { - Template template = Template.from("%{if cond-}\n" + + Template template = Template.from("%{if cond}\n" + "var: %{=varname}\n" + - "if: %{if !inner}inner is false%{end}\n" + - "list: %{list formname}element%{end}\n" + - "%{end-}\n"); + "if: %{if !inner}inner is false%{end-}\n" + + "list: %{list formname}element%{end-}\n" + + "%{end}\n"); assertEquals("", template.snapshot().set("cond", false).render()); @@ -64,11 +65,11 @@ public class TemplateTest { @Test void verifyElse() { - var template = Template.from("%{if cond-}\n" + + var template = Template.from("%{if cond}\n" + "if body\n" + - "%{else-}\n" + + "%{else}\n" + "else body\n" + - "%{end-}\n"); + "%{end}\n"); assertEquals("if body\n", template.snapshot().set("cond", true).render()); assertEquals("else body\n", template.snapshot().set("cond", false).render()); } diff --git a/node-admin/src/test/resources/template1.tmp b/node-admin/src/test/resources/template1.tmp index 3468709cc2e..d53c875a0f3 100644 --- a/node-admin/src/test/resources/template1.tmp +++ b/node-admin/src/test/resources/template1.tmp @@ -1,10 +1,10 @@ variable section '%{=varname}' -%{list listname-} +%{list listname} same variable section '%{=varname}' different variable section '%{=varname2}' -%{list innerlistname-} +%{list innerlistname} inner form text -%{end-} +%{end} between ends -%{end-} +%{end} end of text diff --git a/node-admin/src/test/resources/template2.tmp b/node-admin/src/test/resources/template2.tmp index 3bfa30ec7d3..d36cb4a4a48 100644 --- a/node-admin/src/test/resources/template2.tmp +++ b/node-admin/src/test/resources/template2.tmp @@ -1,4 +1,4 @@ -%{list listA-}body A -%{list listB-}body B -%{end-} -%{end-} +%{list listA}body A +%{list listB}body B +%{end} +%{end} diff --git a/node-admin/src/test/resources/template3.tmp b/node-admin/src/test/resources/template3.tmp index 454b01761b5..27566e72a9d 100644 --- a/node-admin/src/test/resources/template3.tmp +++ b/node-admin/src/test/resources/template3.tmp @@ -1,6 +1,6 @@ %{=varname} %{=varname} -%{list l-} +%{list l} inner %{=varname} %{=innerVarSetAtTop} -%{end-} +%{end} |