From 89d172e2f349f3d9cbdfd6c1a39f6543e7356d4c Mon Sep 17 00:00:00 2001 From: tueem Date: Tue, 15 Oct 2024 17:29:57 +0200 Subject: [PATCH] remove intermediate variable step --- .../commands/ExecutableCommandDefinition.java | 69 +++++++------------ .../methods/CommandInteractionMethod.java | 17 +---- 2 files changed, 27 insertions(+), 59 deletions(-) diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableCommandDefinition.java b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableCommandDefinition.java index fc224f8..ceeec51 100644 --- a/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableCommandDefinition.java +++ b/lib/src/main/java/net/tomatentum/marinara/interaction/commands/ExecutableCommandDefinition.java @@ -1,15 +1,13 @@ 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.SubCommand; public record ExecutableCommandDefinition( - String applicationCommand, - String applicationCommandDescription, + ApplicationCommand applicationCommand, + SubCommand subCommand, String[] subCommandGroups, - String subCommand, - String subCommandDescription, CommandOption[] options) { @Override @@ -22,71 +20,54 @@ public record ExecutableCommandDefinition( 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 { - private String applicationCommandName; - private String applicationCommandDescription; + private ApplicationCommand applicationCommand; + private SubCommand subCommand; private String[] subCommandGroupNames; - private String subCommandName; - private String subCommandDescription; - public CommandOption[] options; public Builder() { this.subCommandGroupNames = new String[0]; } public ExecutableCommandDefinition build() { - if (applicationCommandName == null) + if (applicationCommand == 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) { - this.applicationCommandName = applicationCommandName; + public void setApplicationCommand(ApplicationCommand applicationCommand) { + this.applicationCommand = applicationCommand; } - public void setApplicationCommandDescription(String applicationCommandDescription) { - this.applicationCommandDescription = applicationCommandDescription; + public void setSubCommand(SubCommand subCommand) { + this.subCommand = subCommand; } public void setSubCommandGroupNames(String[] subCommandGroupNames) { this.subCommandGroupNames = subCommandGroupNames; } - public void setSubCommandName(String subCommandName) { - this.subCommandName = subCommandName; + public ApplicationCommand getApplicationCommand() { + return applicationCommand; } - public void setSubCommandDescription(String subCommandDescription) { - this.subCommandDescription = subCommandDescription; - } - - public void setOptions(CommandOption[] options) { - this.options = options; - } - - public String getApplicationCommandName() { - return applicationCommandName; - } - - public String getApplicationCommandDescription() { - return applicationCommandDescription; + public SubCommand getSubCommand() { + return subCommand; } public String[] getSubCommandGroupNames() { return subCommandGroupNames; } - public String getSubCommandName() { - return subCommandName; - } - - public String getSubCommandDescription() { - return subCommandDescription; - } - - public CommandOption[] getOptions() { - return options; - } } } diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/methods/CommandInteractionMethod.java b/lib/src/main/java/net/tomatentum/marinara/interaction/methods/CommandInteractionMethod.java index 1a42b67..0b17d8b 100644 --- a/lib/src/main/java/net/tomatentum/marinara/interaction/methods/CommandInteractionMethod.java +++ b/lib/src/main/java/net/tomatentum/marinara/interaction/methods/CommandInteractionMethod.java @@ -46,9 +46,7 @@ public class CommandInteractionMethod extends InteractionMethod { ApplicationCommand cmd = ReflectionUtil.getAnnotation(method, ApplicationCommand.class); ExecutableCommandDefinition.Builder builder = new ExecutableCommandDefinition.Builder(); - builder.setApplicationCommandName(cmd.name()); - builder.setApplicationCommandDescription(cmd.description()); - builder.setOptions(parseOptions()); + builder.setApplicationCommand(cmd); if (ReflectionUtil.isAnnotationPresent(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)) { SubCommand subCmd = ReflectionUtil.getAnnotation(method, SubCommand.class); - builder.setSubCommandName(subCmd.name()); - builder.setSubCommandDescription(subCmd.description()); + builder.setSubCommand(subCmd); } 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(); - } - } - }