diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-01-10 20:18:58 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-01-10 20:19:01 +0100 |
| commit | ebfe0d07546b72d8a624fc57b6bf3d1f85d975d3 (patch) | |
| tree | 94282456e60e5936771bc793b06f17e51b8c4c47 /node-admin | |
| parent | 234e243e84ffd7d7467ffd0e6c92e2982d1deab6 (diff) | |
Move parse constants to Token
Diffstat (limited to 'node-admin')
3 files changed, 6 insertions, 7 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 b585a1f414b..05d4f82d8d3 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 @@ -7,8 +7,6 @@ package com.yahoo.vespa.hosted.node.admin.task.util.template; * @author hakonhall */ public class TemplateDescriptor { - private static final char VARIABLE_DIRECTIVE_CHAR = '='; - private static final char REMOVE_NEWLINE_CHAR = '|'; private String startDelimiter = "%{"; private String endDelimiter = "}"; @@ -29,7 +27,4 @@ public class TemplateDescriptor { public String startDelimiter() { return startDelimiter; } public String endDelimiter() { return endDelimiter; } - - char variableDirectiveChar() { return VARIABLE_DIRECTIVE_CHAR; } - char removeNewlineChar() { return REMOVE_NEWLINE_CHAR; } } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateParser.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateParser.java index 5a853fe1eb5..6e6baaefbbb 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateParser.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/TemplateParser.java @@ -64,7 +64,7 @@ class TemplateParser { var startOfDirective = new Cursor(current); current.skip(descriptor.startDelimiter()); - if (current.skip(descriptor.variableDirectiveChar())) { + if (current.skip(Token.VARIABLE_DIRECTIVE_CHAR)) { parseVariableSection(); } else { var startOfType = new Cursor(current); @@ -123,7 +123,7 @@ class TemplateParser { private Optional<String> skipId() { return Token.skipId(current); } private boolean parseEndDelimiter(boolean skipNewline) { - boolean removeNewline = current.skip(descriptor.removeNewlineChar()); + boolean removeNewline = current.skip(Token.REMOVE_NEWLINE_CHAR); if (!current.skip(descriptor.endDelimiter())) throw new BadTemplateException(current, "Expected section end (" + descriptor.endDelimiter() + ")"); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/Token.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/Token.java index 9d1cd129e06..138f00ef056 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/Token.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/template/Token.java @@ -10,6 +10,10 @@ import java.util.Optional; * @author hakonhall */ class Token { + static final char NEGATE_CHAR = '!'; + static final char REMOVE_NEWLINE_CHAR = '|'; + static final char VARIABLE_DIRECTIVE_CHAR = '='; + static Optional<String> skipId(Cursor cursor) { if (cursor.eot() || !isIdStart(cursor.getChar())) return Optional.empty(); |