zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Add support for dashes and underscores in annotations parser syntax

Browse source 
Also added a test for the parser, as it was missing

Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
This commit is contained in:
Irmo van den Berge 2020-12-14 19:58:29 +01:00 • committed by Alexander Söderberg
parent 79aad9d79a
commit e0216dec9f
2 changed files with 110 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java
View file

@ -38,11 +38,11 @@ import java.util.regex.Pattern;
*/
final class SyntaxParser implements Function<@NonNull String, @NonNull List<@NonNull SyntaxFragment>> {
private static final Predicate<String> PATTERN_ARGUMENT_LITERAL = Pattern.compile("([A-Za-z0-9]+)(|([A-Za-z0-9]+))*")
private static final Predicate<String> PATTERN_ARGUMENT_LITERAL = Pattern.compile("([A-Za-z0-9\\-_]+)(|([A-Za-z0-9\\-_]+))*")
.asPredicate();
private static final Predicate<String> PATTERN_ARGUMENT_REQUIRED = Pattern.compile("<([A-Za-z0-9]+)>")
private static final Predicate<String> PATTERN_ARGUMENT_REQUIRED = Pattern.compile("<([A-Za-z0-9\\-_]+)>")
.asPredicate();
private static final Predicate<String> PATTERN_ARGUMENT_OPTIONAL = Pattern.compile("\\[([A-Za-z0-9]+)]")
private static final Predicate<String> PATTERN_ARGUMENT_OPTIONAL = Pattern.compile("\\[([A-Za-z0-9\\-_]+)]")
.asPredicate();
@Override