hammy
/
Enso-Bot
mirror of https://github.com/sgoudham/Enso-Bot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reformat/Refactor code

Browse Source
java-rewrite
Hammy 3 years ago
parent 858f9ab871
commit 45709726e3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/me/goudham/command/SlashCommandLoader.java
Unescape Escape View File

@ -71,11 +71,9 @@ public class SlashCommandLoader implements CommandLoader {
if (subCommandGroups.length < 1 && !noHandleMethod) { if (subCommandGroups.length < 1 && !noHandleMethod) {
List<OptionData> optionData = loadOptions(slashCommand); List<OptionData> optionData = loadOptions(slashCommand);
if (optionData != null) commandData.addOptions(optionData); if (optionData != null) commandData.addOptions(optionData);
storeIntoCommandMap(commandMap, slashCommandIntrospection, name, "handle"); storeIntoCommandMap(commandMap, slashCommandIntrospection, name, "handle");
} else { } else {
List<SubcommandData> subCommandList = new ArrayList<>(); List<SubcommandData> subCommandList = new ArrayList<>();
for (BeanMethod<Object, Object> subCommandMethod : subCommands) { for (BeanMethod<Object, Object> subCommandMethod : subCommands) {
AnnotationValue<SubCommand> subCommand = subCommandMethod.getDeclaredAnnotation(SubCommand.class); AnnotationValue<SubCommand> subCommand = subCommandMethod.getDeclaredAnnotation(SubCommand.class);
if (subCommand != null) { if (subCommand != null) {
@ -86,7 +84,6 @@ public class SlashCommandLoader implements CommandLoader {
storeIntoCommandMap(commandMap, slashCommandIntrospection, subCommandPath, subCommandMethod.getName()); storeIntoCommandMap(commandMap, slashCommandIntrospection, subCommandPath, subCommandMethod.getName());
} }
} }
commandData.addSubcommands(subCommandList); commandData.addSubcommands(subCommandList);
} }
commandDataList.add(commandData); commandDataList.add(commandData);
@ -119,7 +116,6 @@ public class SlashCommandLoader implements CommandLoader {
storeIntoCommandMap(commandMap, subCommandGroupIntrospection, subCommandPath, subCommandMethod.getName()); storeIntoCommandMap(commandMap, subCommandGroupIntrospection, subCommandPath, subCommandMethod.getName());
} }
} }
subcommandGroupData.addSubcommands(subCommandList); subcommandGroupData.addSubcommands(subCommandList);
commandData.addSubcommandGroups(subcommandGroupData); commandData.addSubcommandGroups(subcommandGroupData);
} else { } else {
@ -211,7 +207,7 @@ public class SlashCommandLoader implements CommandLoader {
private void storeIntoCommandMap(Map<String, Pair<Object, ExecutableMethod<Object, Object>>> commandMap, BeanIntrospection<Object> beanIntrospection, String commandPath, String methodName) { private void storeIntoCommandMap(Map<String, Pair<Object, ExecutableMethod<Object, Object>>> commandMap, BeanIntrospection<Object> beanIntrospection, String commandPath, String methodName) {
Class<Object> clazz = beanIntrospection.getBeanType(); Class<Object> clazz = beanIntrospection.getBeanType();
Object bean = beanContext.getBean(clazz); Object beanInstance = beanContext.getBean(clazz);
ExecutableMethod<Object, Object> executableMethod = null; ExecutableMethod<Object, Object> executableMethod = null;
try { try {
@ -220,6 +216,6 @@ public class SlashCommandLoader implements CommandLoader {
e.printStackTrace(); e.printStackTrace();
} }
commandMap.put(commandPath, new ImmutablePair<>(bean, executableMethod)); commandMap.put(commandPath, new ImmutablePair<>(beanInstance, executableMethod));
} }
} }

Write Preview
Loading…
Cancel
Save