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

Fix argument annotation name not being processed (#397)

Browse source
This commit is contained in:
Phinner 2022-11-29 15:10:27 +01:00 • committed by Jason
parent 4d96aa4b5f
commit 569077ce36
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java
View file

@ -573,7 +573,7 @@ public final class AnnotationParser<C> {
argumentPair argumentPair
); );
commandArguments.put(argument.getName(), argument); commandArguments.put(argument.getName(), argument);
argumentDescriptions.put(argument, argumentPair.getArgument().description()); argumentDescriptions.put(argument, this.processString(argumentPair.getArgument().description()));
} }
boolean commandNameFound = false; boolean commandNameFound = false;
/* Build the command tree */ /* Build the command tree */
@ -725,7 +725,7 @@ public final class AnnotationParser<C> {
))); )));
} else { } else {
parser = this.manager.parserRegistry() parser = this.manager.parserRegistry()
.createParser(argumentPair.getArgument().parserName(), parameters) .createParser(this.processString(argumentPair.getArgument().parserName()), parameters)
.orElseThrow(() -> new IllegalArgumentException( .orElseThrow(() -> new IllegalArgumentException(
String.format("Parameter '%s' in method '%s' " String.format("Parameter '%s' in method '%s' "
+ "has parser '%s' but no parser exists " + "has parser '%s' but no parser exists "
@ -752,7 +752,7 @@ public final class AnnotationParser<C> {
if (argument.defaultValue().isEmpty()) { if (argument.defaultValue().isEmpty()) {
argumentBuilder.asOptional(); argumentBuilder.asOptional();
} else { } else {
argumentBuilder.asOptionalWithDefault(argument.defaultValue()); argumentBuilder.asOptionalWithDefault(this.processString(argument.defaultValue()));
} }
} else { } else {
argumentBuilder.asRequired(); argumentBuilder.asRequired();
@ -765,7 +765,7 @@ public final class AnnotationParser<C> {
); );
argumentBuilder.withSuggestionsProvider((commandContext, input) -> suggestions); argumentBuilder.withSuggestionsProvider((commandContext, input) -> suggestions);
} else if (!argument.suggestions().isEmpty()) { /* Check whether or not a suggestion provider should be set */ } else if (!argument.suggestions().isEmpty()) { /* Check whether or not a suggestion provider should be set */
final String suggestionProviderName = argument.suggestions(); final String suggestionProviderName = this.processString(argument.suggestions());
final Optional<BiFunction<CommandContext<C>, String, List<String>>> suggestionsFunction = final Optional<BiFunction<CommandContext<C>, String, List<String>>> suggestionsFunction =
this.manager.parserRegistry().getSuggestionProvider(suggestionProviderName); this.manager.parserRegistry().getSuggestionProvider(suggestionProviderName);
argumentBuilder.withSuggestionsProvider( argumentBuilder.withSuggestionsProvider(

2
cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java
View file

@ -113,7 +113,7 @@ public class MethodCommandExecutionHandler<C> implements CommandExecutionHandler
if (argument.value().equals(AnnotationParser.INFERRED_ARGUMENT_NAME)) { if (argument.value().equals(AnnotationParser.INFERRED_ARGUMENT_NAME)) {
argumentName = parameter.getName(); argumentName = parameter.getName();
} else { } else {
argumentName = argument.value(); argumentName = this.annotationParser.processString(argument.value());
} }
final CommandArgument<C, ?> commandArgument = this.context.commandArguments.get(argumentName); final CommandArgument<C, ?> commandArgument = this.context.commandArguments.get(argumentName);