Skip to content

Fix: Exception thrown on missing arguments. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hugo1307 merged 2 commits into from
May 26, 2025
Merged

Fix: Exception thrown on missing arguments. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef647b
feat: exception thrown on missing arguments.
Hugo1307 May 26, 2025
5e85f24
chore: update comment for better clarity.
Hugo1307 May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>dev.hugog.minecraft</groupId>
<artifactId>dev-command</artifactId>
<version>0.0.9</version>
<version>0.0.10</version>

<properties>
<maven.compiler.source>11</maven.compiler.source>
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/dev/hugog/minecraft/dev_command/commands/BukkitDevCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public boolean hasValidArgs() {
.toArray().length;

if (args.length < mandatoryArgumentsCount) {
return false;
return false;
}

for (CommandArgument argument : commandData.getArguments()) {
Expand All @@ -79,7 +79,7 @@ public boolean hasValidArgs() {
// We can safely assume that the argument is present because of the check above
String argumentAtPosition = args[argumentPosition];
ICommandArgumentParser<?> expectedCommandArgument = new ArgumentParserFactory(argumentAtPosition)
.generate(argument.validator());
.generate(argument.validator());

if (!expectedCommandArgument.isValid()) {
return false;
Expand Down Expand Up @@ -136,10 +136,14 @@ public boolean performAutoValidation(IAutoValidationConfiguration configuration)
}
if (commandData.getAutoValidationData().validateArguments() && commandData.getArguments() != null) {
if (!hasValidArgs()) {
CommandArgument firstInvalidArgument = Arrays.stream(getInvalidArguments()).findFirst()
.orElseThrow(() -> new InvalidArgumentsException("Unable to find the first invalid argument. This should never happen."));
getCommandSender().sendMessage(MessageFormat.format(configuration.getInvalidArgumentsMessage(this),
firstInvalidArgument.name(), String.valueOf(firstInvalidArgument.position() + 1)));
if (getInvalidArguments().length == 0) { // No invalid arguments but still invalid, this means not enough arguments were provided
getCommandSender().sendMessage(MessageFormat.format(configuration.getInvalidArgumentsMessage(this), "Missing Arguments", "N/A"));
} else { // Invalid arguments found
CommandArgument firstInvalidArgument = Arrays.stream(getInvalidArguments()).findFirst()
.orElseThrow(() -> new InvalidArgumentsException("No invalid arguments found, but hasValidArgs returned false. This should not happen."));
getCommandSender().sendMessage(MessageFormat.format(configuration.getInvalidArgumentsMessage(this),
firstInvalidArgument.name(), String.valueOf(firstInvalidArgument.position() + 1)));
}
return false;
}
}
Expand All @@ -160,7 +164,9 @@ public <T> T getDependency(Class<T> dependencyClass) throws InvalidDependencyExc
@Override
public CommandArgument[] getInvalidArguments() {
return Arrays.stream(commandData.getArguments())
.filter(commandArgument -> !getArgumentParser(commandArgument.position()).isValid())
.filter(commandArgument -> !getOptionalArgumentParser(commandArgument.position())
.map(ICommandArgumentParser::isValid)
.orElse(true))
.toArray(CommandArgument[]::new);
}

Expand Down