From d6a206206915c3c58e3bbb4f0e3097e9c3ff579d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Mon, 5 Oct 2020 17:56:12 +0200 Subject: [PATCH] :sparkles: Fix annotation order --- .../commandframework/javacord/JavacordCommand.java | 4 ++-- .../javacord/JavacordCommandManager.java | 10 +++++----- .../javacord/JavacordRegistrationHandler.java | 4 ++-- .../javacord/sender/JavacordCommandSender.java | 2 +- .../javacord/sender/JavacordPrivateSender.java | 2 +- .../javacord/sender/JavacordServerSender.java | 2 +- .../brigadier/CloudBrigadierManager.java | 2 +- .../bukkit/BukkitPluginRegistrationHandler.java | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java index d14cabca..3c2da9b7 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommand.java @@ -49,8 +49,8 @@ public class JavacordCommand implements MessageCreateListener { private final cloud.commandframework.Command cloudCommand; JavacordCommand(final cloud.commandframework.@NonNull Command cloudCommand, - @NonNull final CommandArgument command, - @NonNull final JavacordCommandManager manager) { + final @NonNull CommandArgument command, + final @NonNull JavacordCommandManager manager) { this.command = command; this.manager = manager; this.cloudCommand = cloudCommand; diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java index 3670629b..01c57035 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordCommandManager.java @@ -53,14 +53,14 @@ public class JavacordCommandManager extends CommandManager { * @param commandPermissionMapper Function used to check if a command sender has the permission to execute a command * @throws Exception If the construction of the manager fails */ - public JavacordCommandManager(@NonNull final DiscordApi discordApi, - @NonNull final Function<@NonNull CommandTree, + public JavacordCommandManager(final @NonNull DiscordApi discordApi, + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, - @NonNull final Function<@NonNull JavacordCommandSender, @NonNull C> commandSenderMapper, + final @NonNull Function<@NonNull JavacordCommandSender, @NonNull C> commandSenderMapper, @NonNull final Function<@NonNull C, @NonNull JavacordCommandSender> backwardsCommandSenderMapper, - @NonNull final Function<@NonNull C, @NonNull String> commandPrefixMapper, - @NonNull final Function<@NonNull C, @NonNull Boolean> commandPermissionMapper) + final @NonNull Function<@NonNull C, @NonNull String> commandPrefixMapper, + final @NonNull Function<@NonNull C, @NonNull Boolean> commandPermissionMapper) throws Exception { super(commandExecutionCoordinator, new JavacordRegistrationHandler<>()); ((JavacordRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java index 7d55c76d..ec561975 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/JavacordRegistrationHandler.java @@ -39,12 +39,12 @@ final class JavacordRegistrationHandler implements CommandRegistrationHandler JavacordRegistrationHandler() { } - void initialize(@NonNull final JavacordCommandManager javacordCommandManager) { + void initialize(final @NonNull JavacordCommandManager javacordCommandManager) { this.javacordCommandManager = javacordCommandManager; } @Override - public boolean registerCommand(@NonNull final Command command) { + public boolean registerCommand(final @NonNull Command command) { /* We only care about the root command argument */ final CommandArgument commandArgument = command.getArguments().get(0); if (this.registeredCommands.containsKey(commandArgument)) { diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java index 00af7c6b..7df434c6 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordCommandSender.java @@ -41,7 +41,7 @@ public class JavacordCommandSender { * * @param event The event which triggered the command */ - public JavacordCommandSender(@NonNull final MessageCreateEvent event) { + public JavacordCommandSender(final @NonNull MessageCreateEvent event) { this.event = event; } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java index d75854f1..6cd1f042 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordPrivateSender.java @@ -34,7 +34,7 @@ public class JavacordPrivateSender extends JavacordCommandSender { * * @param event The event which triggered the command */ - public JavacordPrivateSender(@NonNull final MessageCreateEvent event) { + public JavacordPrivateSender(final @NonNull MessageCreateEvent event) { super(event); } diff --git a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java index 34aa4cab..7c9a1389 100644 --- a/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java +++ b/cloud-discord/cloud-javacord/src/main/java/cloud/commandframework/javacord/sender/JavacordServerSender.java @@ -35,7 +35,7 @@ public class JavacordServerSender extends JavacordCommandSender { * * @param event The event which triggered the command */ - public JavacordServerSender(@NonNull final MessageCreateEvent event) { + public JavacordServerSender(final @NonNull MessageCreateEvent event) { super(event); } diff --git a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java index 05a8746b..8bb55e0b 100644 --- a/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java +++ b/cloud-minecraft/cloud-brigadier/src/main/java/cloud/commandframework/brigadier/CloudBrigadierManager.java @@ -238,7 +238,7 @@ public final class CloudBrigadierManager { final @NonNull ArgumentParser argument) { final Supplier> argumentTypeSupplier = this.defaultArgumentTypeSuppliers .get(GenericTypeReflector.erase(clazz.getType())); - @Nullable final ArgumentType defaultType; + final @Nullable ArgumentType defaultType; if (argumentTypeSupplier != null) { defaultType = argumentTypeSupplier.get(); } else { diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java index 09dae7e8..1eb85b81 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPluginRegistrationHandler.java @@ -132,7 +132,7 @@ public class BukkitPluginRegistrationHandler implements CommandRegistrationHa * @param alias Alias * @return {@code true} if the alias is recognized, else {@code false} */ - public boolean isRecognized(@NonNull final String alias) { + public boolean isRecognized(final @NonNull String alias) { return this.recognizedAliases.contains(alias); }