tueem/Marinara
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

remove intermediate variable step

Browse Source
This commit is contained in:
tueem 2024-10-15 17:29:57 +02:00
parent b809411faf
commit 89d172e2f3
No known key found for this signature in database
GPG Key ID: 4B2F166FCDCC96C6
2 changed files with 27 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableCommandDefinition.java
View File

@ -1,15 +1,13 @@
package net.tomatentum.marinara.interaction.commands; package net.tomatentum.marinara.interaction.commands;
import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command; import net.tomatentum.marinara.interaction.commands.annotation.ApplicationCommand;
import net.tomatentum.marinara.interaction.commands.annotation.CommandOption; import net.tomatentum.marinara.interaction.commands.annotation.CommandOption;
import net.tomatentum.marinara.interaction.commands.annotation.SubCommand;
public record ExecutableCommandDefinition( public record ExecutableCommandDefinition(
String applicationCommand, ApplicationCommand applicationCommand,
String applicationCommandDescription, SubCommand subCommand,
String[] subCommandGroups, String[] subCommandGroups,
String subCommand,
String subCommandDescription,
CommandOption[] options) { CommandOption[] options) {
@Override @Override
@ -22,71 +20,54 @@ public record ExecutableCommandDefinition(
other.subCommand.equals(this.subCommand); other.subCommand.equals(this.subCommand);
} }
@Override
public final String toString() {
return applicationCommand.name() + subCommand.name() != null ? "::" + subCommand.name() : "";
}
public boolean isRootCommand() {
return subCommand == null;
}
public static class Builder { public static class Builder {
private String applicationCommandName; private ApplicationCommand applicationCommand;
private String applicationCommandDescription; private SubCommand subCommand;
private String[] subCommandGroupNames; private String[] subCommandGroupNames;
private String subCommandName;
private String subCommandDescription;
public CommandOption[] options;
public Builder() { public Builder() {
this.subCommandGroupNames = new String[0]; this.subCommandGroupNames = new String[0];
} }
public ExecutableCommandDefinition build() { public ExecutableCommandDefinition build() {
if (applicationCommandName == null) if (applicationCommand == null)
throw new IllegalArgumentException("applicationCommandName cant be null"); throw new IllegalArgumentException("applicationCommandName cant be null");
return new ExecutableCommandDefinition(applicationCommandName, applicationCommandDescription, subCommandGroupNames, subCommandName, subCommandDescription, options); return new ExecutableCommandDefinition(applicationCommand, subCommand, subCommandGroupNames, subCommand != null ? subCommand.options() : applicationCommand.options());
} }
public void setApplicationCommandName(String applicationCommandName) { public void setApplicationCommand(ApplicationCommand applicationCommand) {
this.applicationCommandName = applicationCommandName; this.applicationCommand = applicationCommand;
} }
public void setApplicationCommandDescription(String applicationCommandDescription) { public void setSubCommand(SubCommand subCommand) {
this.applicationCommandDescription = applicationCommandDescription; this.subCommand = subCommand;
} }
public void setSubCommandGroupNames(String[] subCommandGroupNames) { public void setSubCommandGroupNames(String[] subCommandGroupNames) {
this.subCommandGroupNames = subCommandGroupNames; this.subCommandGroupNames = subCommandGroupNames;
} }
public void setSubCommandName(String subCommandName) { public ApplicationCommand getApplicationCommand() {
this.subCommandName = subCommandName; return applicationCommand;
} }
public void setSubCommandDescription(String subCommandDescription) { public SubCommand getSubCommand() {
this.subCommandDescription = subCommandDescription; return subCommand;
}
public void setOptions(CommandOption[] options) {
this.options = options;
}
public String getApplicationCommandName() {
return applicationCommandName;
}
public String getApplicationCommandDescription() {
return applicationCommandDescription;
} }
public String[] getSubCommandGroupNames() { public String[] getSubCommandGroupNames() {
return subCommandGroupNames; return subCommandGroupNames;
} }
public String getSubCommandName() {
return subCommandName;
}
public String getSubCommandDescription() {
return subCommandDescription;
}
public CommandOption[] getOptions() {
return options;
}
} }
} }

17
lib/src/main/java/net/tomatentum/marinara/interaction/methods/CommandInteractionMethod.java
View File

@ -46,9 +46,7 @@ public class CommandInteractionMethod extends InteractionMethod {
ApplicationCommand cmd = ReflectionUtil.getAnnotation(method, ApplicationCommand.class); ApplicationCommand cmd = ReflectionUtil.getAnnotation(method, ApplicationCommand.class);
ExecutableCommandDefinition.Builder builder = new ExecutableCommandDefinition.Builder(); ExecutableCommandDefinition.Builder builder = new ExecutableCommandDefinition.Builder();
builder.setApplicationCommandName(cmd.name()); builder.setApplicationCommand(cmd);
builder.setApplicationCommandDescription(cmd.description());
builder.setOptions(parseOptions());
if (ReflectionUtil.isAnnotationPresent(method, SubCommandGroup.class)) { if (ReflectionUtil.isAnnotationPresent(method, SubCommandGroup.class)) {
SubCommandGroup cmdGroup = ReflectionUtil.getAnnotation(method, SubCommandGroup.class); SubCommandGroup cmdGroup = ReflectionUtil.getAnnotation(method, SubCommandGroup.class);
@ -57,21 +55,10 @@ public class CommandInteractionMethod extends InteractionMethod {
if (ReflectionUtil.isAnnotationPresent(method, SubCommand.class)) { if (ReflectionUtil.isAnnotationPresent(method, SubCommand.class)) {
SubCommand subCmd = ReflectionUtil.getAnnotation(method, SubCommand.class); SubCommand subCmd = ReflectionUtil.getAnnotation(method, SubCommand.class);
builder.setSubCommandName(subCmd.name()); builder.setSubCommand(subCmd);
builder.setSubCommandDescription(subCmd.description());
} }
this.commandDefinition = builder.build(); this.commandDefinition = builder.build();
} }
private CommandOption[] parseOptions() {
if (method.isAnnotationPresent(SubCommand.class)) {
SubCommand subCmd = method.getAnnotation(SubCommand.class);
return subCmd.options();
}else {
ApplicationCommand subCmd = method.getAnnotation(ApplicationCommand.class);
return subCmd.options();
}
}
} }