From 7f013124b2fcfaa5ad4f4c8564421b17c8361231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= Date: Sat, 3 Oct 2020 21:40:07 +0200 Subject: [PATCH] :art: `@Annotation final` -> `final @Annotation` --- .../annotations/AnnotationParser.java | 22 +-- .../annotations/ArgumentExtractor.java | 2 +- .../annotations/ArgumentParameterPair.java | 4 +- .../annotations/CommandMethodPair.java | 4 +- .../annotations/FlagExtractor.java | 4 +- .../annotations/MetaFactory.java | 6 +- .../MethodCommandExecutionHandler.java | 6 +- .../annotations/SyntaxFragment.java | 6 +- .../annotations/SyntaxParser.java | 2 +- .../java/cloud/commandframework/Command.java | 136 +++++++++--------- .../commandframework/CommandHelpHandler.java | 18 +-- .../commandframework/CommandManager.java | 100 ++++++------- .../cloud/commandframework/CommandTree.java | 62 ++++---- .../cloud/commandframework/Description.java | 4 +- .../arguments/CommandArgument.java | 56 ++++---- .../DelegatingSuggestionsProvider.java | 4 +- .../StandardCommandSyntaxFormatter.java | 2 +- .../arguments/StaticArgument.java | 24 ++-- .../arguments/compound/ArgumentPair.java | 36 ++--- .../arguments/compound/ArgumentTriplet.java | 36 ++--- .../arguments/compound/CompoundArgument.java | 28 ++-- .../arguments/compound/FlagArgument.java | 8 +- .../arguments/flags/CommandFlag.java | 26 ++-- .../arguments/flags/FlagContext.java | 10 +- .../arguments/parser/ArgumentParseResult.java | 8 +- .../arguments/parser/ArgumentParser.java | 4 +- .../arguments/parser/ParserParameter.java | 4 +- .../arguments/parser/ParserParameters.java | 16 +-- .../arguments/parser/StandardParameters.java | 4 +- .../parser/StandardParserRegistry.java | 30 ++-- .../arguments/standard/BooleanArgument.java | 26 ++-- .../arguments/standard/ByteArgument.java | 26 ++-- .../arguments/standard/CharArgument.java | 24 ++-- .../arguments/standard/DoubleArgument.java | 20 +-- .../arguments/standard/EnumArgument.java | 42 +++--- .../arguments/standard/FloatArgument.java | 22 +-- .../arguments/standard/IntegerArgument.java | 26 ++-- .../arguments/standard/LongArgument.java | 24 ++-- .../arguments/standard/ShortArgument.java | 24 ++-- .../arguments/standard/StringArgument.java | 46 +++--- .../arguments/standard/UUIDArgument.java | 24 ++-- .../context/CommandContext.java | 18 +-- .../StandardCommandContextFactory.java | 2 +- .../exceptions/AmbiguousNodeException.java | 6 +- .../exceptions/ArgumentParseException.java | 6 +- .../exceptions/CommandParseException.java | 4 +- .../InvalidCommandSenderException.java | 6 +- .../exceptions/InvalidSyntaxException.java | 6 +- .../exceptions/NoCommandInLeafException.java | 2 +- .../exceptions/NoPermissionException.java | 6 +- .../exceptions/NoSuchCommandException.java | 6 +- .../parsing/NumberParseException.java | 6 +- ...ynchronousCommandExecutionCoordinator.java | 10 +- .../CommandExecutionCoordinator.java | 8 +- .../execution/CommandExecutionHandler.java | 2 +- .../execution/CommandResult.java | 2 +- .../FilteringCommandSuggestionProcessor.java | 4 +- .../AcceptingCommandPostprocessor.java | 2 +- .../CommandPostprocessingContext.java | 4 +- .../AcceptingCommandPreprocessor.java | 2 +- .../CommandPreprocessingContext.java | 4 +- .../CommandConfirmationManager.java | 16 +-- .../internal/CommandRegistrationHandler.java | 2 +- .../meta/SimpleCommandMeta.java | 12 +- .../permission/OrPermission.java | 4 +- .../permission/Permission.java | 4 +- .../types/tuples/DynamicTuple.java | 4 +- .../commandframework/types/tuples/Pair.java | 8 +- .../types/tuples/Quartet.java | 16 +-- .../types/tuples/Quintet.java | 20 +-- .../commandframework/types/tuples/Sextet.java | 26 ++-- .../types/tuples/Triplet.java | 12 +- .../jline/JLineCommandManager.java | 12 +- .../brigadier/CloudBrigadierManager.java | 44 +++--- .../cloud/commandframework/BukkitTest.java | 8 +- .../bukkit/BukkitCommand.java | 10 +- .../bukkit/BukkitCommandManager.java | 16 +-- .../bukkit/BukkitCommandMeta.java | 2 +- .../bukkit/BukkitCommandMetaBuilder.java | 4 +- .../bukkit/BukkitCommandPreprocessor.java | 2 +- .../bukkit/BukkitCommandSender.java | 4 +- .../bukkit/BukkitPlayerSender.java | 2 +- .../BukkitPluginRegistrationHandler.java | 10 +- .../bukkit/CloudCommodoreManager.java | 8 +- .../bukkit/parsers/MaterialArgument.java | 24 ++-- .../bukkit/parsers/OfflinePlayerArgument.java | 28 ++-- .../bukkit/parsers/PlayerArgument.java | 28 ++-- .../bukkit/parsers/WorldArgument.java | 26 ++-- .../MultipleEntitySelectorArgument.java | 22 +-- .../MultiplePlayerSelectorArgument.java | 26 ++-- .../selector/SelectorParseException.java | 2 +- .../SingleEntitySelectorArgument.java | 22 +-- .../SinglePlayerSelectorArgument.java | 26 ++-- .../bungee/BungeeCommand.java | 4 +- .../bungee/BungeeCommandManager.java | 12 +- .../BungeePluginRegistrationHandler.java | 4 +- .../cloudburst/CloudCloudburstTest.java | 2 +- .../cloudburst/CloudburstCommand.java | 10 +- .../cloudburst/CloudburstCommandManager.java | 12 +- .../CloudburstPluginRegistrationHandler.java | 4 +- .../cloud/commandframework/MinecraftHelp.java | 26 ++-- .../services/AnnotatedMethodService.java | 6 +- .../AnnotatedMethodServiceFactory.java | 2 +- .../services/ChunkedRequestContext.java | 4 +- .../services/PipelineException.java | 4 +- .../services/ServiceFilterHandler.java | 4 +- .../services/ServicePipeline.java | 26 ++-- .../services/ServicePipelineBuilder.java | 2 +- .../services/ServicePump.java | 8 +- .../services/ServiceRepository.java | 12 +- .../services/ServiceSpigot.java | 8 +- .../services/types/ConsumerService.java | 2 +- .../services/types/PartialResultService.java | 2 +- 113 files changed, 844 insertions(+), 842 deletions(-) diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java index 46832242..137f7467 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java @@ -77,9 +77,9 @@ public final class AnnotationParser { * {@link ParserParameter}. Mappers for the * parser parameters can be registered using {@link #registerAnnotationMapper(Class, Function)} */ - public AnnotationParser(@NonNull final CommandManager manager, - @NonNull final Class commandSenderClass, - @NonNull final Function<@NonNull ParserParameters, @NonNull CommandMeta> metaMapper) { + public AnnotationParser(final @NonNull CommandManager manager, + final @NonNull Class commandSenderClass, + final @NonNull Function<@NonNull ParserParameters, @NonNull CommandMeta> metaMapper) { this.commandSenderClass = commandSenderClass; this.manager = manager; this.metaFactory = new MetaFactory(this, metaMapper); @@ -96,8 +96,8 @@ public final class AnnotationParser { * @param mapper Mapping function * @param Annotation type */ - public void registerAnnotationMapper(@NonNull final Class annotation, - @NonNull final Function<@NonNull A, + public void registerAnnotationMapper(final @NonNull Class annotation, + final @NonNull Function<@NonNull A, @NonNull ParserParameters> mapper) { this.annotationMappers.put(annotation, mapper); } @@ -110,7 +110,7 @@ public final class AnnotationParser { * @param Type of the instance * @return Collection of parsed annotations */ - public @NonNull Collection<@NonNull Command> parse(@NonNull final T instance) { + public @NonNull Collection<@NonNull Command> parse(final @NonNull T instance) { final Method[] methods = instance.getClass().getDeclaredMethods(); final Collection commandMethodPairs = new ArrayList<>(); for (final Method method : methods) { @@ -138,8 +138,8 @@ public final class AnnotationParser { @SuppressWarnings("unchecked") private @NonNull Collection<@NonNull Command> construct( - @NonNull final Object instance, - @NonNull final Collection<@NonNull CommandMethodPair> methodPairs) { + final @NonNull Object instance, + final @NonNull Collection<@NonNull CommandMethodPair> methodPairs) { final Collection> commands = new ArrayList<>(); for (final CommandMethodPair commandMethodPair : methodPairs) { final CommandMethod commandMethod = commandMethodPair.getCommandMethod(); @@ -248,9 +248,9 @@ public final class AnnotationParser { } @SuppressWarnings("unchecked") - private @NonNull CommandArgument buildArgument(@NonNull final Method method, - @Nullable final SyntaxFragment syntaxFragment, - @NonNull final ArgumentParameterPair argumentPair) { + private @NonNull CommandArgument buildArgument(final @NonNull Method method, + final @Nullable SyntaxFragment syntaxFragment, + final @NonNull ArgumentParameterPair argumentPair) { final Parameter parameter = argumentPair.getParameter(); final Collection annotations = Arrays.asList(parameter.getAnnotations()); final TypeToken token = TypeToken.get(parameter.getParameterizedType()); diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java index eda34fc3..dfd860b5 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentExtractor.java @@ -38,7 +38,7 @@ import java.util.function.Function; class ArgumentExtractor implements Function<@NonNull Method, @NonNull Collection<@NonNull ArgumentParameterPair>> { @Override - public @NonNull Collection<@NonNull ArgumentParameterPair> apply(@NonNull final Method method) { + public @NonNull Collection<@NonNull ArgumentParameterPair> apply(final @NonNull Method method) { final Collection arguments = new ArrayList<>(); for (final Parameter parameter : method.getParameters()) { if (!parameter.isAnnotationPresent(Argument.class)) { diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java index c836da36..ab779be8 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/ArgumentParameterPair.java @@ -32,8 +32,8 @@ final class ArgumentParameterPair { private final Parameter parameter; private final Argument argument; - ArgumentParameterPair(@NonNull final Parameter parameter, - @NonNull final Argument argument) { + ArgumentParameterPair(final @NonNull Parameter parameter, + final @NonNull Argument argument) { this.parameter = parameter; this.argument = argument; } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java index e569ec82..a241ef61 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/CommandMethodPair.java @@ -32,8 +32,8 @@ final class CommandMethodPair { private final Method method; private final CommandMethod commandMethod; - CommandMethodPair(@NonNull final Method method, - @NonNull final CommandMethod commandMethod) { + CommandMethodPair(final @NonNull Method method, + final @NonNull CommandMethod commandMethod) { this.method = method; this.commandMethod = commandMethod; } diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java index c50753ec..7ce7aa52 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/FlagExtractor.java @@ -43,12 +43,12 @@ final class FlagExtractor implements Function<@NonNull Method, Collection<@NonNu private final CommandManager commandManager; - FlagExtractor(@NonNull final CommandManager commandManager) { + FlagExtractor(final @NonNull CommandManager commandManager) { this.commandManager = commandManager; } @Override - public @NonNull Collection<@NonNull CommandFlag> apply(@NonNull final Method method) { + public @NonNull Collection<@NonNull CommandFlag> apply(final @NonNull Method method) { final Collection> flags = new LinkedList<>(); for (final Parameter parameter : method.getParameters()) { if (!parameter.isAnnotationPresent(Flag.class)) { diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java index f84d205f..82f4fb14 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MetaFactory.java @@ -35,14 +35,14 @@ class MetaFactory implements Function<@NonNull Annotation @NonNull [], @NonNull private final AnnotationParser annotationParser; private final Function metaMapper; - MetaFactory(@NonNull final AnnotationParser annotationParser, - @NonNull final Function<@NonNull ParserParameters, @NonNull CommandMeta> metaMapper) { + MetaFactory(final @NonNull AnnotationParser annotationParser, + final @NonNull Function<@NonNull ParserParameters, @NonNull CommandMeta> metaMapper) { this.annotationParser = annotationParser; this.metaMapper = metaMapper; } @Override - public @NonNull CommandMeta apply(@NonNull final Annotation @NonNull [] annotations) { + public @NonNull CommandMeta apply(final @NonNull Annotation @NonNull [] annotations) { final ParserParameters parameters = ParserParameters.empty(); for (final Annotation annotation : annotations) { @SuppressWarnings("ALL") final Function function = this.annotationParser.getAnnotationMappers() diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java index 5d042d71..0fd5c595 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/MethodCommandExecutionHandler.java @@ -43,8 +43,8 @@ class MethodCommandExecutionHandler implements CommandExecutionHandler { private final MethodHandle methodHandle; private final Map> commandArguments; - MethodCommandExecutionHandler(@NonNull final Object instance, - @NonNull final Map<@NonNull String, + MethodCommandExecutionHandler(final @NonNull Object instance, + final @NonNull Map<@NonNull String, @NonNull CommandArgument<@NonNull C, @NonNull ?>> commandArguments, @NonNull final Method method) throws Exception { this.commandArguments = commandArguments; @@ -54,7 +54,7 @@ class MethodCommandExecutionHandler implements CommandExecutionHandler { } @Override - public void execute(@NonNull final CommandContext commandContext) { + public void execute(final @NonNull CommandContext commandContext) { final List arguments = new ArrayList<>(this.parameters.length); final FlagContext flagContext = commandContext.flags(); diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java index 7dd9511b..4757291f 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxFragment.java @@ -33,9 +33,9 @@ final class SyntaxFragment { private final List minor; private final ArgumentMode argumentMode; - SyntaxFragment(@NonNull final String major, - @NonNull final List<@NonNull String> minor, - @NonNull final ArgumentMode argumentMode) { + SyntaxFragment(final @NonNull String major, + final @NonNull List<@NonNull String> minor, + final @NonNull ArgumentMode argumentMode) { this.major = major; this.minor = minor; this.argumentMode = argumentMode; diff --git a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java index 9338f890..fc723e35 100644 --- a/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java +++ b/cloud-annotations/src/main/java/cloud/commandframework/annotations/SyntaxParser.java @@ -47,7 +47,7 @@ final class SyntaxParser implements Function<@NonNull String, @NonNull LinkedHas .asPredicate(); @Override - public @NonNull LinkedHashMap<@NonNull String, @NonNull SyntaxFragment> apply(@NonNull final String syntax) { + public @NonNull LinkedHashMap<@NonNull String, @NonNull SyntaxFragment> apply(final @NonNull String syntax) { final StringTokenizer stringTokenizer = new StringTokenizer(syntax, " "); final LinkedHashMap map = new LinkedHashMap<>(); while (stringTokenizer.hasMoreTokens()) { diff --git a/cloud-core/src/main/java/cloud/commandframework/Command.java b/cloud-core/src/main/java/cloud/commandframework/Command.java index 2c7f6c8c..16bfb173 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Command.java +++ b/cloud-core/src/main/java/cloud/commandframework/Command.java @@ -73,11 +73,11 @@ public class Command { * @param commandPermission Command permission * @param commandMeta Command meta instance */ - public Command(@NonNull final Map<@NonNull CommandArgument, @NonNull Description> commandArguments, - @NonNull final CommandExecutionHandler<@NonNull C> commandExecutionHandler, - @Nullable final Class senderType, - @NonNull final CommandPermission commandPermission, - @NonNull final CommandMeta commandMeta) { + public Command(final @NonNull Map<@NonNull CommandArgument, @NonNull Description> commandArguments, + final @NonNull CommandExecutionHandler<@NonNull C> commandExecutionHandler, + final @Nullable Class senderType, + final @NonNull CommandPermission commandPermission, + final @NonNull CommandMeta commandMeta) { this.arguments = Objects.requireNonNull(commandArguments, "Command arguments may not be null"); if (this.arguments.size() == 0) { throw new IllegalArgumentException("At least one command argument is required"); @@ -110,10 +110,10 @@ public class Command { * @param senderType Required sender type. May be {@code null} * @param commandMeta Command meta instance */ - public Command(@NonNull final Map<@NonNull CommandArgument, @NonNull Description> commandArguments, - @NonNull final CommandExecutionHandler<@NonNull C> commandExecutionHandler, - @Nullable final Class senderType, - @NonNull final CommandMeta commandMeta) { + public Command(final @NonNull Map<@NonNull CommandArgument, @NonNull Description> commandArguments, + final @NonNull CommandExecutionHandler<@NonNull C> commandExecutionHandler, + final @Nullable Class senderType, + final @NonNull CommandMeta commandMeta) { this(commandArguments, commandExecutionHandler, senderType, Permission.empty(), commandMeta); } @@ -125,10 +125,10 @@ public class Command { * @param commandPermission Command permission * @param commandMeta Command meta instance */ - public Command(@NonNull final Map<@NonNull CommandArgument, @NonNull Description> commandArguments, - @NonNull final CommandExecutionHandler<@NonNull C> commandExecutionHandler, - @NonNull final CommandPermission commandPermission, - @NonNull final CommandMeta commandMeta) { + public Command(final @NonNull Map<@NonNull CommandArgument, @NonNull Description> commandArguments, + final @NonNull CommandExecutionHandler<@NonNull C> commandExecutionHandler, + final @NonNull CommandPermission commandPermission, + final @NonNull CommandMeta commandMeta) { this(commandArguments, commandExecutionHandler, null, commandPermission, commandMeta); } @@ -143,10 +143,10 @@ public class Command { * @param Command sender type * @return Command builder */ - public static @NonNull Builder newBuilder(@NonNull final String commandName, - @NonNull final CommandMeta commandMeta, - @NonNull final Description description, - @NonNull final String... aliases) { + public static @NonNull Builder newBuilder(final @NonNull String commandName, + final @NonNull CommandMeta commandMeta, + final @NonNull Description description, + final @NonNull String... aliases) { final Map<@NonNull CommandArgument, @NonNull Description> map = new LinkedHashMap<>(); map.put(StaticArgument.of(commandName, aliases), description); return new Builder<>(null, @@ -168,9 +168,9 @@ public class Command { * @param Command sender type * @return Command builder */ - public static @NonNull Builder newBuilder(@NonNull final String commandName, - @NonNull final CommandMeta commandMeta, - @NonNull final String... aliases) { + public static @NonNull Builder newBuilder(final @NonNull String commandName, + final @NonNull CommandMeta commandMeta, + final @NonNull String... aliases) { final Map, Description> map = new LinkedHashMap<>(); map.put(StaticArgument.of(commandName, aliases), Description.empty()); return new Builder<>(null, @@ -233,7 +233,7 @@ public class Command { * @param argument Argument * @return Argument description */ - public @NonNull String getArgumentDescription(@NonNull final CommandArgument argument) { + public @NonNull String getArgumentDescription(final @NonNull CommandArgument argument) { return this.arguments.get(argument).getDescription(); } @@ -273,13 +273,13 @@ public class Command { private final CommandManager commandManager; private final Collection> flags; - private Builder(@Nullable final CommandManager commandManager, - @NonNull final CommandMeta commandMeta, - @Nullable final Class senderType, - @NonNull final Map<@NonNull CommandArgument, @NonNull Description> commandArguments, - @NonNull final CommandExecutionHandler<@NonNull C> commandExecutionHandler, - @NonNull final CommandPermission commandPermission, - @NonNull final Collection> flags) { + private Builder(final @Nullable CommandManager commandManager, + final @NonNull CommandMeta commandMeta, + final @Nullable Class senderType, + final @NonNull Map<@NonNull CommandArgument, @NonNull Description> commandArguments, + final @NonNull CommandExecutionHandler<@NonNull C> commandExecutionHandler, + final @NonNull CommandPermission commandPermission, + final @NonNull Collection> flags) { this.commandManager = commandManager; this.senderType = senderType; this.commandArguments = Objects.requireNonNull(commandArguments, "Arguments may not be null"); @@ -296,7 +296,7 @@ public class Command { * @param value Meta value * @return New builder instance using the inserted meta key-value pair */ - public @NonNull Builder meta(@NonNull final String key, @NonNull final String value) { + public @NonNull Builder meta(final @NonNull String key, final @NonNull String value) { final CommandMeta commandMeta = SimpleCommandMeta.builder().with(this.commandMeta).with(key, value).build(); return new Builder<>(this.commandManager, commandMeta, @@ -315,7 +315,7 @@ public class Command { * @param commandManager Command manager * @return New builder instance using the provided command manager */ - public @NonNull Builder manager(@Nullable final CommandManager commandManager) { + public @NonNull Builder manager(final @Nullable CommandManager commandManager) { return new Builder<>(commandManager, this.commandMeta, this.senderType, @@ -332,8 +332,8 @@ public class Command { * @param aliases Argument aliases * @return New builder instance with the modified command chain */ - public @NonNull Builder literal(@NonNull final String main, - @NonNull final String... aliases) { + public @NonNull Builder literal(final @NonNull String main, + final @NonNull String... aliases) { return this.argument(StaticArgument.of(main, aliases)); } @@ -345,9 +345,9 @@ public class Command { * @param aliases Argument aliases * @return New builder instance with the modified command chain */ - public @NonNull Builder literal(@NonNull final String main, - @NonNull final Description description, - @NonNull final String... aliases) { + public @NonNull Builder literal(final @NonNull String main, + final @NonNull Description description, + final @NonNull String... aliases) { return this.argument(StaticArgument.of(main, aliases), description); } @@ -370,7 +370,7 @@ public class Command { * @param Argument type * @return New builder instance with the command argument inserted into the argument list */ - public @NonNull Builder argument(@NonNull final CommandArgument argument) { + public @NonNull Builder argument(final @NonNull CommandArgument argument) { return this.argument(argument, Description.empty()); } @@ -382,8 +382,8 @@ public class Command { * @param Argument type * @return New builder instance with the command argument inserted into the argument list */ - public @NonNull Builder argument(@NonNull final CommandArgument argument, - @NonNull final Description description) { + public @NonNull Builder argument(final @NonNull CommandArgument argument, + final @NonNull Description description) { final Map, Description> commandArgumentMap = new LinkedHashMap<>(this.commandArguments); commandArgumentMap.put(argument, description); return new Builder<>(this.commandManager, @@ -405,7 +405,7 @@ public class Command { * @return New builder instance with the command argument inserted into the argument list */ public @NonNull Builder argument(final CommandArgument.@NonNull Builder builder, - @NonNull final Description description) { + final @NonNull Description description) { final Map, Description> commandArgumentMap = new LinkedHashMap<>(this.commandArguments); commandArgumentMap.put(builder.build(), description); return new Builder<>(this.commandManager, @@ -426,9 +426,9 @@ public class Command { * @param Argument type * @return New builder instance with the command argument inserted into the argument list */ - public @NonNull Builder argument(@NonNull final Class clazz, - @NonNull final String name, - @NonNull final Consumer> builderConsumer) { + public @NonNull Builder argument(final @NonNull Class clazz, + final @NonNull String name, + final @NonNull Consumer> builderConsumer) { final CommandArgument.Builder builder = CommandArgument.ofType(clazz, name); if (this.commandManager != null) { builder.manager(this.commandManager); @@ -456,10 +456,10 @@ public class Command { * @param Second type * @return Builder instance with the argument inserted */ - public @NonNull Builder argumentPair(@NonNull final String name, - @NonNull final Pair<@NonNull String, @NonNull String> names, - @NonNull final Pair<@NonNull Class, @NonNull Class> parserPair, - @NonNull final Description description) { + public @NonNull Builder argumentPair(final @NonNull String name, + final @NonNull Pair<@NonNull String, @NonNull String> names, + final @NonNull Pair<@NonNull Class, @NonNull Class> parserPair, + final @NonNull Description description) { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } @@ -486,12 +486,12 @@ public class Command { * @param Output type * @return Builder instance with the argument inserted */ - public @NonNull Builder argumentPair(@NonNull final String name, - @NonNull final TypeToken outputType, - @NonNull final Pair names, - @NonNull final Pair, Class> parserPair, - @NonNull final Function, O> mapper, - @NonNull final Description description) { + public @NonNull Builder argumentPair(final @NonNull String name, + final @NonNull TypeToken outputType, + final @NonNull Pair names, + final @NonNull Pair, Class> parserPair, + final @NonNull Function, O> mapper, + final @NonNull Description description) { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } @@ -518,10 +518,10 @@ public class Command { * @param Third type * @return Builder instance with the argument inserted */ - public @NonNull Builder argumentTriplet(@NonNull final String name, - @NonNull final Triplet names, - @NonNull final Triplet, Class, Class> parserTriplet, - @NonNull final Description description) { + public @NonNull Builder argumentTriplet(final @NonNull String name, + final @NonNull Triplet names, + final @NonNull Triplet, Class, Class> parserTriplet, + final @NonNull Description description) { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } @@ -549,13 +549,13 @@ public class Command { * @param Output type * @return Builder instance with the argument inserted */ - public @NonNull Builder argumentTriplet(@NonNull final String name, - @NonNull final TypeToken outputType, - @NonNull final Triplet names, - @NonNull final Triplet, Class, + public @NonNull Builder argumentTriplet(final @NonNull String name, + final @NonNull TypeToken outputType, + final @NonNull Triplet names, + final @NonNull Triplet, Class, Class> parserTriplet, - @NonNull final Function, O> mapper, - @NonNull final Description description) { + final @NonNull Function, O> mapper, + final @NonNull Description description) { if (this.commandManager == null) { throw new IllegalStateException("This cannot be called from a command that has no command manager attached"); } @@ -572,7 +572,7 @@ public class Command { * @param commandExecutionHandler New execution handler * @return New builder instance using the command execution handler */ - public @NonNull Builder handler(@NonNull final CommandExecutionHandler commandExecutionHandler) { + public @NonNull Builder handler(final @NonNull CommandExecutionHandler commandExecutionHandler) { return new Builder<>(this.commandManager, this.commandMeta, this.senderType, @@ -588,7 +588,7 @@ public class Command { * @param senderType Required sender type * @return New builder instance using the command execution handler */ - public @NonNull Builder withSenderType(@NonNull final Class senderType) { + public @NonNull Builder withSenderType(final @NonNull Class senderType) { return new Builder<>(this.commandManager, this.commandMeta, senderType, @@ -604,7 +604,7 @@ public class Command { * @param permission Command permission * @return New builder instance using the command permission */ - public @NonNull Builder withPermission(@NonNull final CommandPermission permission) { + public @NonNull Builder withPermission(final @NonNull CommandPermission permission) { return new Builder<>(this.commandManager, this.commandMeta, this.senderType, @@ -620,7 +620,7 @@ public class Command { * @param permission Command permission * @return New builder instance using the command permission */ - public @NonNull Builder withPermission(@NonNull final String permission) { + public @NonNull Builder withPermission(final @NonNull String permission) { return new Builder<>(this.commandManager, this.commandMeta, this.senderType, @@ -641,7 +641,7 @@ public class Command { * @param command Command to proxy * @return New builder that proxies the given command */ - public @NonNull Builder proxies(@NonNull final Command command) { + public @NonNull Builder proxies(final @NonNull Command command) { Builder builder = this; for (final CommandArgument argument : command.getArguments()) { if (argument instanceof StaticArgument) { @@ -673,7 +673,7 @@ public class Command { * @param Flag value type * @return New builder instance that uses the provided flag */ - public @NonNull Builder flag(@NonNull final CommandFlag flag) { + public @NonNull Builder flag(final @NonNull CommandFlag flag) { final List> flags = new ArrayList<>(this.flags); flags.add(flag); return new Builder<>(this.commandManager, diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java index e82f0e21..bbf566a7 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandHelpHandler.java @@ -40,7 +40,7 @@ public final class CommandHelpHandler { private final CommandManager commandManager; - CommandHelpHandler(@NonNull final CommandManager commandManager) { + CommandHelpHandler(final @NonNull CommandManager commandManager) { this.commandManager = commandManager; } @@ -89,9 +89,9 @@ public final class CommandHelpHandler { private final String syntaxString; private final String description; - private VerboseHelpEntry(@NonNull final Command command, - @NonNull final String syntaxString, - @NonNull final String description) { + private VerboseHelpEntry(final @NonNull Command command, + final @NonNull String syntaxString, + final @NonNull String description) { this.command = command; this.syntaxString = syntaxString; this.description = description; @@ -131,7 +131,7 @@ public final class CommandHelpHandler { * @param query Query string * @return Help topic, will return an empty {@link IndexHelpTopic} if no results were found */ - public @NonNull HelpTopic queryHelp(@NonNull final String query) { + public @NonNull HelpTopic queryHelp(final @NonNull String query) { if (query.replace(" ", "").isEmpty()) { return new IndexHelpTopic<>(this.getAllCommands()); } @@ -261,7 +261,7 @@ public final class CommandHelpHandler { private final List> entries; - private IndexHelpTopic(@NonNull final List<@NonNull VerboseHelpEntry> entries) { + private IndexHelpTopic(final @NonNull List<@NonNull VerboseHelpEntry> entries) { this.entries = entries; } @@ -296,7 +296,7 @@ public final class CommandHelpHandler { private final Command command; private final String description; - private VerboseHelpTopic(@NonNull final Command command) { + private VerboseHelpTopic(final @NonNull Command command) { this.command = command; final String shortDescription = command.getCommandMeta().getOrDefault("description", "No description"); this.description = command.getCommandMeta().getOrDefault("long-description", shortDescription); @@ -333,8 +333,8 @@ public final class CommandHelpHandler { private final String longestPath; private final List childSuggestions; - private MultiHelpTopic(@NonNull final String longestPath, - @NonNull final List<@NonNull String> childSuggestions) { + private MultiHelpTopic(final @NonNull String longestPath, + final @NonNull List<@NonNull String> childSuggestions) { this.longestPath = longestPath; this.childSuggestions = childSuggestions; } diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java index 04e3d3d0..c7f7a409 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandManager.java @@ -97,8 +97,8 @@ public abstract class CommandManager { * @param commandRegistrationHandler Command registration handler */ public CommandManager( - @NonNull final Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, - @NonNull final CommandRegistrationHandler commandRegistrationHandler) { + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, + final @NonNull CommandRegistrationHandler commandRegistrationHandler) { this.commandTree = CommandTree.newTree(this); this.commandExecutionCoordinator = commandExecutionCoordinator.apply(commandTree); this.commandRegistrationHandler = commandRegistrationHandler; @@ -114,7 +114,7 @@ public abstract class CommandManager { * @param input Input string * @return List of tokens */ - public static @NonNull LinkedList<@NonNull String> tokenize(@NonNull final String input) { + public static @NonNull LinkedList<@NonNull String> tokenize(final @NonNull String input) { final StringTokenizer stringTokenizer = new StringTokenizer(input, " "); final LinkedList tokens = new LinkedList<>(); while (stringTokenizer.hasMoreElements()) { @@ -133,8 +133,8 @@ public abstract class CommandManager { * @param input Input provided by the sender * @return Command result */ - public @NonNull CompletableFuture> executeCommand(@NonNull final C commandSender, - @NonNull final String input) { + public @NonNull CompletableFuture> executeCommand(final @NonNull C commandSender, + final @NonNull String input) { final CommandContext context = this.commandContextFactory.create(false, commandSender); final LinkedList inputQueue = tokenize(input); try { @@ -158,8 +158,8 @@ public abstract class CommandManager { * @param input Input provided by the sender * @return List of suggestions */ - public @NonNull List<@NonNull String> suggest(@NonNull final C commandSender, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggest(final @NonNull C commandSender, + final @NonNull String input) { final CommandContext context = this.commandContextFactory.create(true, commandSender); final LinkedList inputQueue = tokenize(input); if (this.preprocessContext(context, inputQueue) == State.ACCEPTED) { @@ -177,7 +177,7 @@ public abstract class CommandManager { * @param command Command to register * @return The command manager instance */ - public @NonNull CommandManager command(@NonNull final Command command) { + public @NonNull CommandManager command(final @NonNull Command command) { this.commandTree.insertCommand(command); this.commands.add(command); return this; @@ -207,7 +207,7 @@ public abstract class CommandManager { * * @param commandSyntaxFormatter New formatter */ - public void setCommandSyntaxFormatter(@NonNull final CommandSyntaxFormatter commandSyntaxFormatter) { + public void setCommandSyntaxFormatter(final @NonNull CommandSyntaxFormatter commandSyntaxFormatter) { this.commandSyntaxFormatter = commandSyntaxFormatter; } @@ -220,7 +220,7 @@ public abstract class CommandManager { return this.commandRegistrationHandler; } - protected final void setCommandRegistrationHandler(@NonNull final CommandRegistrationHandler commandRegistrationHandler) { + protected final void setCommandRegistrationHandler(final @NonNull CommandRegistrationHandler commandRegistrationHandler) { this.commandRegistrationHandler = commandRegistrationHandler; } @@ -232,8 +232,8 @@ public abstract class CommandManager { * @param permission Permission node * @return {@code true} if the sender has the permission, else {@code false} */ - public boolean hasPermission(@NonNull final C sender, - @NonNull final CommandPermission permission) { + public boolean hasPermission(final @NonNull C sender, + final @NonNull CommandPermission permission) { if (permission.toString().isEmpty()) { return true; } @@ -270,10 +270,10 @@ public abstract class CommandManager { * @param meta Command meta * @return Builder instance */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final Collection aliases, - @NonNull final Description description, - @NonNull final CommandMeta meta) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull Collection aliases, + final @NonNull Description description, + final @NonNull CommandMeta meta) { return Command.newBuilder(name, meta, description, aliases.toArray(new String[0])); } @@ -285,9 +285,9 @@ public abstract class CommandManager { * @param meta Command meta * @return Builder instance */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final Collection aliases, - @NonNull final CommandMeta meta) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull Collection aliases, + final @NonNull CommandMeta meta) { return Command.newBuilder(name, meta, Description.empty(), aliases.toArray(new String[0])); } @@ -300,10 +300,10 @@ public abstract class CommandManager { * @param aliases Command aliases * @return Builder instance */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final CommandMeta meta, - @NonNull final Description description, - @NonNull final String... aliases) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull CommandMeta meta, + final @NonNull Description description, + final @NonNull String... aliases) { return Command.newBuilder(name, meta, description, aliases); } @@ -315,9 +315,9 @@ public abstract class CommandManager { * @param aliases Command aliases * @return Builder instance */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final CommandMeta meta, - @NonNull final String... aliases) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull CommandMeta meta, + final @NonNull String... aliases) { return Command.newBuilder(name, meta, Description.empty(), aliases); } @@ -331,9 +331,9 @@ public abstract class CommandManager { * @throws UnsupportedOperationException If the command manager does not support default command meta creation * @see #createDefaultCommandMeta() Default command meta creation */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final Description description, - @NonNull final String... aliases) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull Description description, + final @NonNull String... aliases) { return Command.newBuilder(name, this.createDefaultCommandMeta(), description, aliases).manager(this); } @@ -346,8 +346,8 @@ public abstract class CommandManager { * @throws UnsupportedOperationException If the command manager does not support default command meta creation * @see #createDefaultCommandMeta() Default command meta creation */ - public Command.@NonNull Builder commandBuilder(@NonNull final String name, - @NonNull final String... aliases) { + public Command.@NonNull Builder commandBuilder(final @NonNull String name, + final @NonNull String... aliases) { return Command.newBuilder(name, this.createDefaultCommandMeta(), Description.empty(), aliases).manager(this); } @@ -359,8 +359,8 @@ public abstract class CommandManager { * @param Generic argument name * @return Argument builder */ - public CommandArgument.@NonNull Builder argumentBuilder(@NonNull final Class type, - @NonNull final String name) { + public CommandArgument.@NonNull Builder argumentBuilder(final @NonNull Class type, + final @NonNull String name) { return CommandArgument.ofType(type, name).manager(this); } @@ -370,7 +370,7 @@ public abstract class CommandManager { * @param name Flag name * @return Flag builder */ - public CommandFlag.@NonNull Builder flagBuilder(@NonNull final String name) { + public CommandFlag.@NonNull Builder flagBuilder(final @NonNull String name) { return CommandFlag.newBuilder(name); } @@ -399,7 +399,7 @@ public abstract class CommandManager { * @param processor Processor to register * @see #preprocessContext(CommandContext, LinkedList) Preprocess a context */ - public void registerCommandPreProcessor(@NonNull final CommandPreprocessor processor) { + public void registerCommandPreProcessor(final @NonNull CommandPreprocessor processor) { this.servicePipeline.registerServiceImplementation(new TypeToken>() { }, processor, Collections.emptyList()); @@ -412,7 +412,7 @@ public abstract class CommandManager { * @param processor Processor to register * @see #preprocessContext(CommandContext, LinkedList) Preprocess a context */ - public void registerCommandPostProcessor(@NonNull final CommandPostprocessor processor) { + public void registerCommandPostProcessor(final @NonNull CommandPostprocessor processor) { this.servicePipeline.registerServiceImplementation(new TypeToken>() { }, processor, Collections.emptyList()); @@ -426,8 +426,8 @@ public abstract class CommandManager { * @return {@link State#ACCEPTED} if the command should be parsed and executed, else {@link State#REJECTED} * @see #registerCommandPreProcessor(CommandPreprocessor) Register a command preprocessor */ - public State preprocessContext(@NonNull final CommandContext context, - @NonNull final LinkedList<@NonNull String> inputQueue) { + public State preprocessContext(final @NonNull CommandContext context, + final @NonNull LinkedList<@NonNull String> inputQueue) { this.servicePipeline.pump(new CommandPreprocessingContext<>(context, inputQueue)) .through(new TypeToken>() { }) @@ -445,8 +445,8 @@ public abstract class CommandManager { * @return {@link State#ACCEPTED} if the command should be parsed and executed, else {@link State#REJECTED} * @see #registerCommandPostProcessor(CommandPostprocessor) Register a command postprocessor */ - public State postprocessContext(@NonNull final CommandContext context, - @NonNull final Command command) { + public State postprocessContext(final @NonNull CommandContext context, + final @NonNull Command command) { this.servicePipeline.pump(new CommandPostprocessingContext<>(context, command)) .through(new TypeToken>() { }) @@ -473,7 +473,7 @@ public abstract class CommandManager { * * @param commandSuggestionProcessor New command suggestions processor */ - public void setCommandSuggestionProcessor(@NonNull final CommandSuggestionProcessor commandSuggestionProcessor) { + public void setCommandSuggestionProcessor(final @NonNull CommandSuggestionProcessor commandSuggestionProcessor) { this.commandSuggestionProcessor = commandSuggestionProcessor; } @@ -503,7 +503,7 @@ public abstract class CommandManager { * @see #registerCommandPreProcessor(CommandPreprocessor) Registering an exception handler */ public final @Nullable BiConsumer<@NonNull C, @NonNull E> - getExceptionHandler(@NonNull final Class clazz) { + getExceptionHandler(final @NonNull Class clazz) { final BiConsumer consumer = this.exceptionHandlers.get(clazz); if (consumer == null) { return null; @@ -521,8 +521,8 @@ public abstract class CommandManager { * @param handler Exception handler * @param Exception type */ - public final void registerExceptionHandler(@NonNull final Class clazz, - @NonNull final BiConsumer<@NonNull C, @NonNull E> handler) { + public final void registerExceptionHandler(final @NonNull Class clazz, + final @NonNull BiConsumer<@NonNull C, @NonNull E> handler) { this.exceptionHandlers.put(clazz, handler); } @@ -537,10 +537,10 @@ public abstract class CommandManager { * handler stored for the exception type * @param Exception type */ - public final void handleException(@NonNull final C sender, - @NonNull final Class clazz, - @NonNull final E exception, - @NonNull final BiConsumer defaultHandler) { + public final void handleException(final @NonNull C sender, + final @NonNull Class clazz, + final @NonNull E exception, + final @NonNull BiConsumer defaultHandler) { Optional.ofNullable(this.getExceptionHandler(clazz)).orElse(defaultHandler).accept(sender, exception); } @@ -570,7 +570,7 @@ public abstract class CommandManager { * @param setting Setting * @return {@code true} if the setting is activated or {@code false} if it's not */ - public boolean getSetting(@NonNull final ManagerSettings setting) { + public boolean getSetting(final @NonNull ManagerSettings setting) { return this.managerSettings.contains(setting); } @@ -580,7 +580,7 @@ public abstract class CommandManager { * @param setting Setting to set * @param value Value */ - public void setSetting(@NonNull final ManagerSettings setting, + public void setSetting(final @NonNull ManagerSettings setting, final boolean value) { if (value) { this.managerSettings.add(setting); diff --git a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java index 6261a99e..a2486248 100644 --- a/cloud-core/src/main/java/cloud/commandframework/CommandTree.java +++ b/cloud-core/src/main/java/cloud/commandframework/CommandTree.java @@ -90,7 +90,7 @@ public final class CommandTree { private final Node> internalTree = new Node<>(null); private final CommandManager commandManager; - private CommandTree(@NonNull final CommandManager commandManager) { + private CommandTree(final @NonNull CommandManager commandManager) { this.commandManager = commandManager; } @@ -101,7 +101,7 @@ public final class CommandTree { * @param Command sender type * @return New command tree */ - public static @NonNull CommandTree newTree(@NonNull final CommandManager commandManager) { + public static @NonNull CommandTree newTree(final @NonNull CommandManager commandManager) { return new CommandTree<>(commandManager); } @@ -115,8 +115,8 @@ public final class CommandTree { * @throws NoPermissionException If the sender lacks permission to execute the command * @throws InvalidSyntaxException If the command syntax is invalid */ - public @NonNull Optional> parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> args) throws + public @NonNull Optional> parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> args) throws NoSuchCommandException, NoPermissionException, InvalidSyntaxException { final Optional> commandOptional = parseCommand(new ArrayList<>(), commandContext, @@ -130,10 +130,10 @@ public final class CommandTree { return commandOptional; } - private Optional> parseCommand(@NonNull final List<@NonNull CommandArgument> parsedArguments, - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> commandQueue, - @NonNull final Node<@Nullable CommandArgument> root) { + private Optional> parseCommand(final @NonNull List<@NonNull CommandArgument> parsedArguments, + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> commandQueue, + final @NonNull Node<@Nullable CommandArgument> root) { CommandPermission permission = this.isPermitted(commandContext.getSender(), root); if (permission != null) { throw new NoPermissionException(permission, commandContext.getSender(), this.getChain(root) @@ -226,10 +226,10 @@ public final class CommandTree { } private @Nullable Optional> - attemptParseUnambiguousChild(@NonNull final List<@NonNull CommandArgument> parsedArguments, - @NonNull final CommandContext commandContext, - @NonNull final Node<@Nullable CommandArgument> root, - @NonNull final Queue commandQueue) { + attemptParseUnambiguousChild(final @NonNull List<@NonNull CommandArgument> parsedArguments, + final @NonNull CommandContext commandContext, + final @NonNull Node<@Nullable CommandArgument> root, + final @NonNull Queue commandQueue) { CommandPermission permission; final List>> children = root.getChildren(); if (children.size() == 1 && !(children.get(0).getValue() instanceof StaticArgument)) { @@ -343,14 +343,14 @@ public final class CommandTree { * @param commandQueue Input queue * @return String suggestions. These should be filtered based on {@link String#startsWith(String)} */ - public @NonNull List<@NonNull String> getSuggestions(@NonNull final CommandContext context, - @NonNull final Queue<@NonNull String> commandQueue) { + public @NonNull List<@NonNull String> getSuggestions(final @NonNull CommandContext context, + final @NonNull Queue<@NonNull String> commandQueue) { return getSuggestions(context, commandQueue, this.internalTree); } - private @NonNull List<@NonNull String> getSuggestions(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> commandQueue, - @NonNull final Node<@Nullable CommandArgument> root) { + private @NonNull List<@NonNull String> getSuggestions(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> commandQueue, + final @NonNull Node<@Nullable CommandArgument> root) { /* If the sender isn't allowed to access the root node, no suggestions are needed */ if (this.isPermitted(commandContext.getSender(), root) != null) { @@ -440,7 +440,7 @@ public final class CommandTree { } } - private @NonNull String stringOrEmpty(@Nullable final String string) { + private @NonNull String stringOrEmpty(final @Nullable String string) { if (string == null) { return ""; } @@ -453,7 +453,7 @@ public final class CommandTree { * @param command Command to insert */ @SuppressWarnings("unchecked") - public void insertCommand(@NonNull final Command command) { + public void insertCommand(final @NonNull Command command) { synchronized (this.commandLock) { Node> node = this.internalTree; for (final CommandArgument argument : command.getArguments()) { @@ -485,8 +485,8 @@ public final class CommandTree { } } - private @Nullable CommandPermission isPermitted(@NonNull final C sender, - @NonNull final Node<@Nullable CommandArgument> node) { + private @Nullable CommandPermission isPermitted(final @NonNull C sender, + final @NonNull Node<@Nullable CommandArgument> node) { final CommandPermission permission = (CommandPermission) node.nodeMeta.get("permission"); if (permission != null) { return this.commandManager.hasPermission(sender, permission) ? null : permission; @@ -576,7 +576,7 @@ public final class CommandTree { }); } - private void checkAmbiguity(@NonNull final Node<@Nullable CommandArgument> node) throws AmbiguousNodeException { + private void checkAmbiguity(final @NonNull Node<@Nullable CommandArgument> node) throws AmbiguousNodeException { if (node.isLeaf()) { return; } @@ -592,7 +592,7 @@ public final class CommandTree { } private @NonNull List<@NonNull Node<@Nullable CommandArgument>> - getLeavesRaw(@NonNull final Node<@Nullable CommandArgument> node) { + getLeavesRaw(final @NonNull Node<@Nullable CommandArgument> node) { final List>> leaves = new LinkedList<>(); if (node.isLeaf()) { if (node.getValue() != null) { @@ -604,7 +604,7 @@ public final class CommandTree { return leaves; } - private @NonNull List<@NonNull CommandArgument> getLeaves(@NonNull final Node<@NonNull CommandArgument> node) { + private @NonNull List<@NonNull CommandArgument> getLeaves(final @NonNull Node<@NonNull CommandArgument> node) { final List> leaves = new LinkedList<>(); if (node.isLeaf()) { if (node.getValue() != null) { @@ -617,7 +617,7 @@ public final class CommandTree { } private @NonNull List<@NonNull Node<@Nullable CommandArgument>> - getChain(@Nullable final Node<@Nullable CommandArgument> end) { + getChain(final @Nullable Node<@Nullable CommandArgument> end) { final List>> chain = new LinkedList<>(); Node> tail = end; while (tail != null) { @@ -628,7 +628,7 @@ public final class CommandTree { return chain; } - private @Nullable Command cast(@Nullable final Command command) { + private @Nullable Command cast(final @Nullable Command command) { return command; } @@ -648,7 +648,7 @@ public final class CommandTree { * @param name Root node name * @return Root node, or {@code null} */ - public @Nullable Node<@Nullable CommandArgument> getNamedNode(@Nullable final String name) { + public @Nullable Node<@Nullable CommandArgument> getNamedNode(final @Nullable String name) { for (final Node> node : this.getRootNodes()) { if (node.getValue() != null && node.getValue() instanceof StaticArgument) { @SuppressWarnings("unchecked") final StaticArgument staticArgument = (StaticArgument) node.getValue(); @@ -683,7 +683,7 @@ public final class CommandTree { private final T value; private Node parent; - private Node(@Nullable final T value) { + private Node(final @Nullable T value) { this.value = value; } @@ -696,13 +696,13 @@ public final class CommandTree { return Collections.unmodifiableList(this.children); } - private @NonNull Node<@Nullable T> addChild(@NonNull final T child) { + private @NonNull Node<@Nullable T> addChild(final @NonNull T child) { final Node node = new Node<>(child); this.children.add(node); return node; } - private @Nullable Node<@Nullable T> getChild(@NonNull final T type) { + private @Nullable Node<@Nullable T> getChild(final @NonNull T type) { for (final Node child : this.children) { if (type.equals(child.getValue())) { return child; @@ -769,7 +769,7 @@ public final class CommandTree { * * @param parent new parent node */ - public void setParent(@Nullable final Node<@Nullable T> parent) { + public void setParent(final @Nullable Node<@Nullable T> parent) { this.parent = parent; } diff --git a/cloud-core/src/main/java/cloud/commandframework/Description.java b/cloud-core/src/main/java/cloud/commandframework/Description.java index 8c28bc91..3e2cc9cb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/Description.java +++ b/cloud-core/src/main/java/cloud/commandframework/Description.java @@ -38,7 +38,7 @@ public final class Description { private final String description; - private Description(@NonNull final String description) { + private Description(final @NonNull String description) { this.description = description; } @@ -57,7 +57,7 @@ public final class Description { * @param string Command description * @return Created command description */ - public static @NonNull Description of(@NonNull final String string) { + public static @NonNull Description of(final @NonNull String string) { return new Description(string); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java index e2a26656..e04787d2 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/CommandArgument.java @@ -96,11 +96,11 @@ public class CommandArgument implements Comparable> * @param suggestionsProvider Suggestions provider */ public CommandArgument(final boolean required, - @NonNull final String name, - @NonNull final ArgumentParser parser, - @NonNull final String defaultValue, - @NonNull final TypeToken valueType, - @Nullable final BiFunction, String, List> suggestionsProvider) { + final @NonNull String name, + final @NonNull ArgumentParser parser, + final @NonNull String defaultValue, + final @NonNull TypeToken valueType, + final @Nullable BiFunction, String, List> suggestionsProvider) { this.required = required; this.name = Objects.requireNonNull(name, "Name may not be null"); if (!NAME_PATTERN.asPredicate().test(name)) { @@ -125,11 +125,11 @@ public class CommandArgument implements Comparable> * @param suggestionsProvider Suggestions provider */ public CommandArgument(final boolean required, - @NonNull final String name, - @NonNull final ArgumentParser parser, - @NonNull final String defaultValue, - @NonNull final Class valueType, - @Nullable final BiFunction<@NonNull CommandContext, + final @NonNull String name, + final @NonNull ArgumentParser parser, + final @NonNull String defaultValue, + final @NonNull Class valueType, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { this(required, name, parser, defaultValue, TypeToken.get(valueType), suggestionsProvider); } @@ -143,14 +143,14 @@ public class CommandArgument implements Comparable> * @param valueType Type produced by the parser */ public CommandArgument(final boolean required, - @NonNull final String name, - @NonNull final ArgumentParser parser, - @NonNull final Class valueType) { + final @NonNull String name, + final @NonNull ArgumentParser parser, + final @NonNull Class valueType) { this(required, name, parser, "", valueType, null); } private static @NonNull BiFunction<@NonNull CommandContext, @NonNull String, - @NonNull List> buildDefaultSuggestionsProvider(@NonNull final CommandArgument argument) { + @NonNull List> buildDefaultSuggestionsProvider(final @NonNull CommandArgument argument) { return new DelegatingSuggestionsProvider<>(argument.getName(), argument.getParser()); } @@ -163,8 +163,8 @@ public class CommandArgument implements Comparable> * @param Argument Type. Used to make the compiler happy. * @return Argument builder */ - public static CommandArgument.@NonNull Builder ofType(@NonNull final TypeToken clazz, - @NonNull final String name) { + public static CommandArgument.@NonNull Builder ofType(final @NonNull TypeToken clazz, + final @NonNull String name) { return new Builder<>(clazz, name); } @@ -177,8 +177,8 @@ public class CommandArgument implements Comparable> * @param Argument Type. Used to make the compiler happy. * @return Argument builder */ - public static CommandArgument.@NonNull Builder<@NonNull C, @NonNull T> ofType(@NonNull final Class clazz, - @NonNull final String name) { + public static CommandArgument.@NonNull Builder<@NonNull C, @NonNull T> ofType(final @NonNull Class clazz, + final @NonNull String name) { return new Builder<>(TypeToken.get(clazz), name); } @@ -230,7 +230,7 @@ public class CommandArgument implements Comparable> * * @param owningCommand Owning command */ - public void setOwningCommand(@NonNull final Command owningCommand) { + public void setOwningCommand(final @NonNull Command owningCommand) { if (this.owningCommand != null) { throw new IllegalStateException("Cannot replace owning command"); } @@ -265,7 +265,7 @@ public class CommandArgument implements Comparable> } @Override - public final int compareTo(@NonNull final CommandArgument o) { + public final int compareTo(final @NonNull CommandArgument o) { if (this instanceof StaticArgument) { if (o instanceof StaticArgument) { return (this.getName().compareTo(o.getName())); @@ -346,14 +346,14 @@ public class CommandArgument implements Comparable> private String defaultValue = ""; private BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List> suggestionsProvider; - protected Builder(@NonNull final TypeToken valueType, - @NonNull final String name) { + protected Builder(final @NonNull TypeToken valueType, + final @NonNull String name) { this.valueType = valueType; this.name = name; } - protected Builder(@NonNull final Class valueType, - @NonNull final String name) { + protected Builder(final @NonNull Class valueType, + final @NonNull String name) { this(TypeToken.get(valueType), name); } @@ -364,7 +364,7 @@ public class CommandArgument implements Comparable> * @param manager Command manager * @return Builder instance */ - public @NonNull Builder<@NonNull C, @NonNull T> manager(@NonNull final CommandManager manager) { + public @NonNull Builder<@NonNull C, @NonNull T> manager(final @NonNull CommandManager manager) { this.manager = manager; return this; } @@ -407,7 +407,7 @@ public class CommandArgument implements Comparable> * @param defaultValue Default value that will be used if none was supplied * @return Builder instance */ - public @NonNull Builder<@NonNull C, @NonNull T> asOptionalWithDefault(@NonNull final String defaultValue) { + public @NonNull Builder<@NonNull C, @NonNull T> asOptionalWithDefault(final @NonNull String defaultValue) { this.defaultValue = defaultValue; this.required = false; return this; @@ -419,7 +419,7 @@ public class CommandArgument implements Comparable> * @param parser Argument parser * @return Builder instance */ - public @NonNull Builder<@NonNull C, @NonNull T> withParser(@NonNull final ArgumentParser<@NonNull C, @NonNull T> parser) { + public @NonNull Builder<@NonNull C, @NonNull T> withParser(final @NonNull ArgumentParser<@NonNull C, @NonNull T> parser) { this.parser = Objects.requireNonNull(parser, "Parser may not be null"); return this; } @@ -431,7 +431,7 @@ public class CommandArgument implements Comparable> * @return Builder instance */ public @NonNull Builder<@NonNull C, @NonNull T> withSuggestionsProvider( - @NonNull final BiFunction<@NonNull CommandContext, + final @NonNull BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List> suggestionsProvider) { this.suggestionsProvider = suggestionsProvider; return this; diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java index 4b834e5d..5fb79de5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/DelegatingSuggestionsProvider.java @@ -36,13 +36,13 @@ final class DelegatingSuggestionsProvider implements BiFunction<@NonNull Comm private final String argumentName; private final ArgumentParser parser; - DelegatingSuggestionsProvider(@NonNull final String argumentName, @NonNull final ArgumentParser parser) { + DelegatingSuggestionsProvider(final @NonNull String argumentName, final @NonNull ArgumentParser parser) { this.argumentName = argumentName; this.parser = parser; } @Override - public @NonNull List<@NonNull String> apply(@NonNull final CommandContext context, @NonNull final String s) { + public @NonNull List<@NonNull String> apply(final @NonNull CommandContext context, final @NonNull String s) { return this.parser.suggestions(context, s); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java index 2a581bd2..8602dfdb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java @@ -44,7 +44,7 @@ import java.util.List; public class StandardCommandSyntaxFormatter implements CommandSyntaxFormatter { @Override - public final @NonNull String apply(@NonNull final List<@NonNull CommandArgument> commandArguments, + public final @NonNull String apply(final @NonNull List<@NonNull CommandArgument> commandArguments, final CommandTree.@Nullable Node<@Nullable CommandArgument> node) { final StringBuilder stringBuilder = new StringBuilder(); final Iterator> iterator = commandArguments.iterator(); diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java index 829bb567..a790f73b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java @@ -44,7 +44,7 @@ import java.util.TreeSet; */ public final class StaticArgument extends CommandArgument { - private StaticArgument(final boolean required, @NonNull final String name, @NonNull final String... aliases) { + private StaticArgument(final boolean required, final @NonNull String name, final @NonNull String... aliases) { super(required, name, new StaticArgumentParser<>(name, aliases), String.class); } @@ -56,8 +56,8 @@ public final class StaticArgument extends CommandArgument { * @param Command sender type * @return Constructed argument */ - public static @NonNull StaticArgument of(@NonNull final String name, - @NonNull final String... aliases) { + public static @NonNull StaticArgument of(final @NonNull String name, + final @NonNull String... aliases) { return new StaticArgument<>(true, name, aliases); } @@ -69,8 +69,8 @@ public final class StaticArgument extends CommandArgument { * @param Command sender type * @return Constructed argument */ - public static @NonNull StaticArgument optional(@NonNull final String name, - @NonNull final String... aliases) { + public static @NonNull StaticArgument optional(final @NonNull String name, + final @NonNull String... aliases) { return new StaticArgument<>(false, name, aliases); } @@ -79,7 +79,7 @@ public final class StaticArgument extends CommandArgument { * * @param alias New alias */ - public void registerAlias(@NonNull final String alias) { + public void registerAlias(final @NonNull String alias) { ((StaticArgumentParser) this.getParser()).insertAlias(alias); } @@ -109,7 +109,7 @@ public final class StaticArgument extends CommandArgument { private final String name; - private StaticArgumentParser(@NonNull final String name, @NonNull final String... aliases) { + private StaticArgumentParser(final @NonNull String name, final @NonNull String... aliases) { this.name = name; this.allAcceptedAliases.add(this.name); this.allAcceptedAliases.addAll(Arrays.asList(aliases)); @@ -117,8 +117,8 @@ public final class StaticArgument extends CommandArgument { } @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String string = inputQueue.peek(); if (string == null) { return ArgumentParseResult.failure(new NullPointerException("No input provided")); @@ -131,8 +131,8 @@ public final class StaticArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return Collections.singletonList(this.name); } @@ -150,7 +150,7 @@ public final class StaticArgument extends CommandArgument { * * @param alias New alias */ - public void insertAlias(@NonNull final String alias) { + public void insertAlias(final @NonNull String alias) { this.allAcceptedAliases.add(alias); this.alternativeAliases.add(alias); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java index 6bb9d042..6892e7fd 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java @@ -55,12 +55,12 @@ public class ArgumentPair extends CompoundArgument, C, O> * @param valueType The output type */ protected ArgumentPair(final boolean required, - @NonNull final String name, - @NonNull final Pair<@NonNull String, @NonNull String> names, - @NonNull final Pair<@NonNull Class, @NonNull Class> types, - @NonNull final Pair<@NonNull ArgumentParser, @NonNull ArgumentParser> parserPair, - @NonNull final Function<@NonNull Pair<@NonNull U, @NonNull V>, @NonNull O> mapper, - @NonNull final TypeToken valueType) { + final @NonNull String name, + final @NonNull Pair<@NonNull String, @NonNull String> names, + final @NonNull Pair<@NonNull Class, @NonNull Class> types, + final @NonNull Pair<@NonNull ArgumentParser, @NonNull ArgumentParser> parserPair, + final @NonNull Function<@NonNull Pair<@NonNull U, @NonNull V>, @NonNull O> mapper, + final @NonNull TypeToken valueType) { super(required, name, names, parserPair, types, mapper, o -> Pair.of((U) o[0], (V) o[1]), valueType); } @@ -78,11 +78,11 @@ public class ArgumentPair extends CompoundArgument, C, O> * @param Second parsed type * @return Intermediary builder */ - public static @NonNull ArgumentPairIntermediaryBuilder of(@NonNull final CommandManager manager, - @NonNull final String name, - @NonNull final Pair<@NonNull String, + public static @NonNull ArgumentPairIntermediaryBuilder of(final @NonNull CommandManager manager, + final @NonNull String name, + final @NonNull Pair<@NonNull String, @NonNull String> names, - @NonNull final Pair<@NonNull Class, + final @NonNull Pair<@NonNull Class, @NonNull Class> types) { final ParserRegistry parserRegistry = manager.getParserRegistry(); final ArgumentParser firstParser = parserRegistry.createParser(TypeToken.get(types.getFirst()), @@ -106,11 +106,11 @@ public class ArgumentPair extends CompoundArgument, C, O> private final Pair, Class> types; private ArgumentPairIntermediaryBuilder(final boolean required, - @NonNull final String name, - @NonNull final Pair<@NonNull String, @NonNull String> names, - @NonNull final Pair<@NonNull ArgumentParser<@NonNull C, @NonNull U>, + final @NonNull String name, + final @NonNull Pair<@NonNull String, @NonNull String> names, + final @NonNull Pair<@NonNull ArgumentParser<@NonNull C, @NonNull U>, @NonNull ArgumentParser<@NonNull C, @NonNull V>> parserPair, - @NonNull final Pair<@NonNull Class, @NonNull Class> types) { + final @NonNull Pair<@NonNull Class, @NonNull Class> types) { this.required = required; this.name = name; this.names = names; @@ -142,8 +142,8 @@ public class ArgumentPair extends CompoundArgument, C, O> * @param Output type * @return Created pair */ - public @NonNull ArgumentPair withMapper(@NonNull final TypeToken clazz, - @NonNull final Function<@NonNull Pair<@NonNull U, + public @NonNull ArgumentPair withMapper(final @NonNull TypeToken clazz, + final @NonNull Function<@NonNull Pair<@NonNull U, @NonNull V>, @NonNull O> mapper) { return new ArgumentPair(this.required, this.name, this.names, this.types, this.parserPair, mapper, clazz); } @@ -157,8 +157,8 @@ public class ArgumentPair extends CompoundArgument, C, O> * @return Created pair */ public @NonNull ArgumentPair<@NonNull C, @NonNull U, @NonNull V, @NonNull O> withMapper( - @NonNull final Class clazz, - @NonNull final Function<@NonNull Pair<@NonNull U, @NonNull V>, @NonNull O> mapper) { + final @NonNull Class clazz, + final @NonNull Function<@NonNull Pair<@NonNull U, @NonNull V>, @NonNull O> mapper) { return this.withMapper(TypeToken.get(clazz), mapper); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java index ea4e83b2..edfb055f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java @@ -56,13 +56,13 @@ public class ArgumentTriplet extends CompoundArgument names, - @NonNull final Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types, - @NonNull final Triplet<@NonNull ArgumentParser, @NonNull ArgumentParser, + final @NonNull String name, + final @NonNull Triplet<@NonNull String, @NonNull String, @NonNull String> names, + final @NonNull Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types, + final @NonNull Triplet<@NonNull ArgumentParser, @NonNull ArgumentParser, @NonNull ArgumentParser> parserTriplet, - @NonNull final Function<@NonNull Triplet, @NonNull O> mapper, - @NonNull final TypeToken valueType) { + final @NonNull Function<@NonNull Triplet, @NonNull O> mapper, + final @NonNull TypeToken valueType) { super(required, name, names, parserTriplet, types, mapper, o -> Triplet.of((U) o[0], (V) o[1], (W) o[2]), valueType); } @@ -82,10 +82,10 @@ public class ArgumentTriplet extends CompoundArgument @NonNull ArgumentTripletIntermediaryBuilder<@NonNull C, @NonNull U, @NonNull V, @NonNull W> - of(@NonNull final CommandManager manager, - @NonNull final String name, - @NonNull final Triplet<@NonNull String, @NonNull String, @NonNull String> names, - @NonNull final Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types) { + of(final @NonNull CommandManager manager, + final @NonNull String name, + final @NonNull Triplet<@NonNull String, @NonNull String, @NonNull String> names, + final @NonNull Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types) { final ParserRegistry parserRegistry = manager.getParserRegistry(); final ArgumentParser firstParser = parserRegistry.createParser(TypeToken.get(types.getFirst()), ParserParameters.empty()).orElseThrow(() -> @@ -113,13 +113,13 @@ public class ArgumentTriplet extends CompoundArgument, Class, Class> types; private ArgumentTripletIntermediaryBuilder(final boolean required, - @NonNull final String name, - @NonNull final Triplet<@NonNull String, @NonNull String, + final @NonNull String name, + final @NonNull Triplet<@NonNull String, @NonNull String, @NonNull String> names, - @NonNull final Triplet<@NonNull ArgumentParser, + final @NonNull Triplet<@NonNull ArgumentParser, @NonNull ArgumentParser, @NonNull ArgumentParser> parserTriplet, - @NonNull final Triplet<@NonNull Class, + final @NonNull Triplet<@NonNull Class, @NonNull Class, @NonNull Class> types) { this.required = required; this.name = name; @@ -154,8 +154,8 @@ public class ArgumentTriplet extends CompoundArgument @NonNull ArgumentTriplet<@NonNull C, @NonNull U, @NonNull V, - @NonNull W, @NonNull O> withMapper(@NonNull final TypeToken clazz, - @NonNull final Function<@NonNull Triplet<@NonNull U, + @NonNull W, @NonNull O> withMapper(final @NonNull TypeToken clazz, + final @NonNull Function<@NonNull Triplet<@NonNull U, @NonNull V, @NonNull W>, @NonNull O> mapper) { return new ArgumentTriplet<>(this.required, this.name, this.names, this.types, this.parserTriplet, mapper, clazz); } @@ -168,8 +168,8 @@ public class ArgumentTriplet extends CompoundArgument Output type * @return Created triplet */ - public @NonNull ArgumentTriplet withMapper(@NonNull final Class clazz, - @NonNull final Function<@NonNull Triplet<@NonNull U, + public @NonNull ArgumentTriplet withMapper(final @NonNull Class clazz, + final @NonNull Function<@NonNull Triplet<@NonNull U, @NonNull V, @NonNull W>, @NonNull O> mapper) { return new ArgumentTriplet<>(this.required, this.name, this.names, this.types, this.parserTriplet, mapper, TypeToken.get(clazz)); diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java index 79b29f33..65cb2be4 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/CompoundArgument.java @@ -49,13 +49,13 @@ public class CompoundArgument extends CommandArgument mapper, - @NonNull final Function<@NonNull Object[], @NonNull T> tupleFactory, - @NonNull final TypeToken valueType) { + final @NonNull String name, + final @NonNull Tuple names, + final @NonNull Tuple parserTuple, + final @NonNull Tuple types, + final @NonNull Function<@NonNull T, @NonNull O> mapper, + final @NonNull Function<@NonNull Object[], @NonNull T> tupleFactory, + final @NonNull TypeToken valueType) { super(required, name, new CompoundParser<>(parserTuple, mapper, tupleFactory), @@ -101,17 +101,17 @@ public class CompoundArgument extends CommandArgument mapper; private final Function tupleFactory; - private CompoundParser(@NonNull final Tuple parserTuple, - @NonNull final Function<@NonNull T, @NonNull O> mapper, - @NonNull final Function<@NonNull Object[], @NonNull T> tupleFactory) { + private CompoundParser(final @NonNull Tuple parserTuple, + final @NonNull Function<@NonNull T, @NonNull O> mapper, + final @NonNull Function<@NonNull Object[], @NonNull T> tupleFactory) { this.parsers = parserTuple.toArray(); this.mapper = mapper; this.tupleFactory = tupleFactory; } @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final Object[] output = new Object[this.parsers.length]; for (int i = 0; i < this.parsers.length; i++) { @SuppressWarnings("unchecked") final ArgumentParser parser = (ArgumentParser) this.parsers[i]; @@ -135,8 +135,8 @@ public class CompoundArgument extends CommandArgument suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { /* This method will be called n times, each time for each of the internal types. The problem is that we need to then know which of the parsers to forward the diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java index 94237d8c..d135d99e 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java @@ -74,13 +74,13 @@ public class FlagArgument extends CommandArgument { private final CommandFlag[] flags; - private FlagArgumentParser(@NonNull final CommandFlag[] flags) { + private FlagArgumentParser(final @NonNull CommandFlag[] flags) { this.flags = flags; } @Override - public @NonNull ArgumentParseResult<@NonNull Object> parse(@NonNull final CommandContext<@NonNull C> commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult<@NonNull Object> parse(final @NonNull CommandContext<@NonNull C> commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { /* This argument must necessarily be the last so we can just consume all remaining input. This argument type is similar to a greedy string in that sense. But, we need to keep all flag logic contained to the parser @@ -88,7 +88,7 @@ public class FlagArgument extends CommandArgument { final Set> parsedFlags = new HashSet<>(); CommandFlag currentFlag = null; - for (@NonNull final String string : inputQueue) { + for (final @NonNull String string : inputQueue) { if (string.startsWith("-")) { if (currentFlag != null && currentFlag.getCommandArgument() != null) { return ArgumentParseResult.failure( diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java index 336a6f8f..8d2e9f65 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java @@ -48,10 +48,10 @@ public final class CommandFlag { private final @Nullable CommandArgument commandArgument; - private CommandFlag(@NonNull final String name, - @NonNull final String @NonNull [] aliases, - @NonNull final Description description, - @Nullable final CommandArgument commandArgument) { + private CommandFlag(final @NonNull String name, + final @NonNull String @NonNull [] aliases, + final @NonNull Description description, + final @Nullable CommandArgument commandArgument) { this.name = name; this.aliases = aliases; this.description = description; @@ -64,7 +64,7 @@ public final class CommandFlag { * @param name Flag name * @return Flag builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -135,17 +135,17 @@ public final class CommandFlag { private final Description description; private final CommandArgument commandArgument; - private Builder(@NonNull final String name, - @NonNull final String[] aliases, - @NonNull final Description description, - @Nullable final CommandArgument commandArgument) { + private Builder(final @NonNull String name, + final @NonNull String[] aliases, + final @NonNull Description description, + final @Nullable CommandArgument commandArgument) { this.name = name; this.aliases = aliases; this.description = description; this.commandArgument = commandArgument; } - private Builder(@NonNull final String name) { + private Builder(final @NonNull String name) { this(name, new String[0], Description.empty(), null); } @@ -155,7 +155,7 @@ public final class CommandFlag { * @param aliases Flag aliases * @return New builder instance */ - public Builder withAliases(@NonNull final String... aliases) { + public Builder withAliases(final @NonNull String... aliases) { return new Builder<>(this.name, aliases, this.description, this.commandArgument); } @@ -165,7 +165,7 @@ public final class CommandFlag { * @param description Flag description * @return New builder instance */ - public Builder withDescription(@NonNull final Description description) { + public Builder withDescription(final @NonNull Description description) { return new Builder<>(this.name, this.aliases, description, this.commandArgument); } @@ -176,7 +176,7 @@ public final class CommandFlag { * @param New argument type * @return New builder instance */ - public Builder withArgument(@NonNull final CommandArgument argument) { + public Builder withArgument(final @NonNull CommandArgument argument) { return new Builder<>(this.name, this.aliases, this.description, argument); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java index 984005d5..5731d615 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/FlagContext.java @@ -59,7 +59,7 @@ public final class FlagContext { * * @param flag Flag instance */ - public void addPresenceFlag(@NonNull final CommandFlag flag) { + public void addPresenceFlag(final @NonNull CommandFlag flag) { this.flagValues.put(flag.getName(), FLAG_PRESENCE_VALUE); } @@ -70,7 +70,8 @@ public final class FlagContext { * @param value Flag value * @param Value type */ - public void addValueFlag(@NonNull final CommandFlag flag, @NonNull final T value) { + public void addValueFlag(final @NonNull CommandFlag flag, + final @NonNull T value) { this.flagValues.put(flag.getName(), value); } @@ -82,7 +83,7 @@ public final class FlagContext { * @return {@code true} if the flag is presence and the flag is a presence flag, * else {@code false} */ - public boolean isPresent(@NonNull final String flag) { + public boolean isPresent(final @NonNull String flag) { final Object value = this.flagValues.get(flag); return FLAG_PRESENCE_VALUE.equals(value); } @@ -95,7 +96,8 @@ public final class FlagContext { * @param Value type * @return Stored value, or the supplied default value */ - public @Nullable T getValue(@NonNull final String name, @Nullable final T defaultValue) { + public @Nullable T getValue(final @NonNull String name, + final @Nullable T defaultValue) { final Object value = this.flagValues.get(name); if (value == null) { return defaultValue; diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java index cc3b3aec..4d639d90 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParseResult.java @@ -44,7 +44,7 @@ public abstract class ArgumentParseResult { * @param Parser return type * @return Failed parse result */ - public static @NonNull ArgumentParseResult failure(@NonNull final Throwable failure) { + public static @NonNull ArgumentParseResult failure(final @NonNull Throwable failure) { return new ParseFailure<>(failure); } @@ -55,7 +55,7 @@ public abstract class ArgumentParseResult { * @param Parser return type * @return Succeeded parse result */ - public static @NonNull ArgumentParseResult success(@NonNull final T value) { + public static @NonNull ArgumentParseResult success(final @NonNull T value) { return new ParseSuccess<>(value); } @@ -81,7 +81,7 @@ public abstract class ArgumentParseResult { */ private final T value; - private ParseSuccess(@NonNull final T value) { + private ParseSuccess(final @NonNull T value) { this.value = value; } @@ -105,7 +105,7 @@ public abstract class ArgumentParseResult { */ private final Throwable failure; - private ParseFailure(@NonNull final Throwable failure) { + private ParseFailure(final @NonNull Throwable failure) { this.failure = failure; } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java index f8b58bed..fb5c1375 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ArgumentParser.java @@ -56,8 +56,8 @@ public interface ArgumentParser { * @param input Input string * @return List of suggestions */ - default @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + default @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return Collections.emptyList(); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java index 8dd40d24..093c21ed 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameter.java @@ -44,8 +44,8 @@ public class ParserParameter { * @param key Parameter key * @param expectedType Type that is expected to be mapped to this parameter */ - public ParserParameter(@NonNull final String key, - @NonNull final TypeToken expectedType) { + public ParserParameter(final @NonNull String key, + final @NonNull TypeToken expectedType) { this.key = key; this.expectedType = expectedType; } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java index 2e00d436..694ee555 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/ParserParameters.java @@ -53,8 +53,8 @@ public final class ParserParameters { * @param Value type * @return Constructed instance */ - public static @NonNull ParserParameters single(@NonNull final ParserParameter parameter, - @NonNull final T value) { + public static @NonNull ParserParameters single(final @NonNull ParserParameter parameter, + final @NonNull T value) { final ParserParameters parameters = new ParserParameters(); parameters.store(parameter, value); return parameters; @@ -67,7 +67,7 @@ public final class ParserParameters { * @param Parameter type * @return {@code true} if such a pair is stored, else {@code false} */ - public boolean has(@NonNull final ParserParameter parameter) { + public boolean has(final @NonNull ParserParameter parameter) { return this.internalMap.containsKey(parameter); } @@ -78,8 +78,8 @@ public final class ParserParameters { * @param value Object * @param Parameter type */ - public void store(@NonNull final ParserParameter parameter, - @NonNull final T value) { + public void store(final @NonNull ParserParameter parameter, + final @NonNull T value) { this.internalMap.put(parameter, value); } @@ -92,8 +92,8 @@ public final class ParserParameters { * @return Parameter value */ @SuppressWarnings("unchecked") - public @NonNull T get(@NonNull final ParserParameter parameter, - @NonNull final T defaultValue) { + public @NonNull T get(final @NonNull ParserParameter parameter, + final @NonNull T defaultValue) { return (T) this.internalMap.getOrDefault(parameter, defaultValue); } @@ -103,7 +103,7 @@ public final class ParserParameters { * * @param other Other instance */ - public void merge(@NonNull final ParserParameters other) { + public void merge(final @NonNull ParserParameters other) { this.internalMap.putAll(other.internalMap); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java index 7af083a6..0ae49c3a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParameters.java @@ -59,8 +59,8 @@ public final class StandardParameters { private StandardParameters() { } - private static @NonNull ParserParameter create(@NonNull final String key, - @NonNull final TypeToken expectedType) { + private static @NonNull ParserParameter create(final @NonNull String key, + final @NonNull TypeToken expectedType) { return new ParserParameter<>(key, expectedType); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java index 56f5536b..c32ceb15 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/parser/StandardParserRegistry.java @@ -110,29 +110,29 @@ public final class StandardParserRegistry implements ParserRegistry { } @Override - public void registerParserSupplier(@NonNull final TypeToken type, - @NonNull final Function<@NonNull ParserParameters, + public void registerParserSupplier(final @NonNull TypeToken type, + final @NonNull Function<@NonNull ParserParameters, @NonNull ArgumentParser> supplier) { this.parserSuppliers.put(type, supplier); } @Override - public void registerNamedParserSupplier(@NonNull final String name, - @NonNull final Function<@NonNull ParserParameters, + public void registerNamedParserSupplier(final @NonNull String name, + final @NonNull Function<@NonNull ParserParameters, @NonNull ArgumentParser> supplier) { this.namedParsers.put(name, supplier); } @Override - public void registerAnnotationMapper(@NonNull final Class annotation, - @NonNull final BiFunction<@NonNull A, @NonNull TypeToken, + public void registerAnnotationMapper(final @NonNull Class annotation, + final @NonNull BiFunction<@NonNull A, @NonNull TypeToken, @NonNull ParserParameters> mapper) { this.annotationMappers.put(annotation, mapper); } @Override - public @NonNull ParserParameters parseAnnotations(@NonNull final TypeToken parsingType, - @NonNull final Collection<@NonNull ? extends Annotation> annotations) { + public @NonNull ParserParameters parseAnnotations(final @NonNull TypeToken parsingType, + final @NonNull Collection<@NonNull ? extends Annotation> annotations) { final ParserParameters parserParameters = new ParserParameters(); annotations.forEach(annotation -> { // noinspection all @@ -148,8 +148,8 @@ public final class StandardParserRegistry implements ParserRegistry { } @Override - public @NonNull Optional> createParser(@NonNull final TypeToken type, - @NonNull final ParserParameters parserParameters) { + public @NonNull Optional> createParser(final @NonNull TypeToken type, + final @NonNull ParserParameters parserParameters) { final TypeToken actualType; if (GenericTypeReflector.erase(type.getType()).isPrimitive()) { actualType = TypeToken.get(PRIMITIVE_MAPPINGS.get(GenericTypeReflector.erase(type.getType()))); @@ -173,8 +173,8 @@ public final class StandardParserRegistry implements ParserRegistry { } @Override - public @NonNull Optional> createParser(@NonNull final String name, - @NonNull final ParserParameters parserParameters) { + public @NonNull Optional> createParser(final @NonNull String name, + final @NonNull ParserParameters parserParameters) { final Function> producer = this.namedParsers.get(name); if (producer == null) { return Optional.empty(); @@ -185,7 +185,7 @@ public final class StandardParserRegistry implements ParserRegistry { } - private static boolean isPrimitive(@NonNull final TypeToken type) { + private static boolean isPrimitive(final @NonNull TypeToken type) { return GenericTypeReflector.erase(type.getType()).isPrimitive(); } @@ -194,7 +194,7 @@ public final class StandardParserRegistry implements ParserRegistry { @NonNull ParserParameters> { @Override - public @NonNull ParserParameters apply(@NonNull final Range range, @NonNull final TypeToken type) { + public @NonNull ParserParameters apply(final @NonNull Range range, final @NonNull TypeToken type) { final Class clazz; if (isPrimitive(type)) { clazz = PRIMITIVE_MAPPINGS.get(GenericTypeReflector.erase(type.getType())); @@ -266,7 +266,7 @@ public final class StandardParserRegistry implements ParserRegistry { @NonNull ParserParameters> { @Override - public @NonNull ParserParameters apply(@NonNull final Completions completions, @NonNull final TypeToken token) { + public @NonNull ParserParameters apply(final @NonNull Completions completions, final @NonNull TypeToken token) { if (GenericTypeReflector.erase(token.getType()).equals(String.class)) { final String[] splitCompletions = completions.value().replace(" ", "").split(","); return ParserParameters.single(StandardParameters.COMPLETIONS, splitCompletions); diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java index 2cf978cd..a9dadf88 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java @@ -40,10 +40,10 @@ public final class BooleanArgument extends CommandArgument { private final boolean liberal; private BooleanArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final boolean liberal, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new BooleanParser<>(liberal), defaultValue, Boolean.class, suggestionsProvider); this.liberal = liberal; @@ -56,7 +56,7 @@ public final class BooleanArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -67,7 +67,7 @@ public final class BooleanArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return BooleanArgument.newBuilder(name).asRequired().build(); } @@ -78,7 +78,7 @@ public final class BooleanArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return BooleanArgument.newBuilder(name).asOptional().build(); } @@ -90,7 +90,7 @@ public final class BooleanArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final boolean defaultBoolean) { return BooleanArgument.newBuilder(name).asOptionalWithDefault(Boolean.toString(defaultBoolean)).build(); } @@ -108,7 +108,7 @@ public final class BooleanArgument extends CommandArgument { private boolean liberal = false; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Boolean.class, name); } @@ -154,8 +154,8 @@ public final class BooleanArgument extends CommandArgument { } @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -188,8 +188,8 @@ public final class BooleanArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { if (!liberal) { return Arrays.asList("TRUE", "FALSE"); } @@ -218,7 +218,7 @@ public final class BooleanArgument extends CommandArgument { * @param input String input * @param liberal Liberal value */ - public BooleanParseException(@NonNull final String input, + public BooleanParseException(final @NonNull String input, final boolean liberal) { this.input = input; this.liberal = liberal; diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java index 864611e5..ebbfc0ae 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java @@ -42,11 +42,11 @@ public final class ByteArgument extends CommandArgument { private final byte max; private ByteArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final byte min, final byte max, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new ByteParser<>(min, max), defaultValue, Byte.class, suggestionsProvider); this.min = min; @@ -60,7 +60,7 @@ public final class ByteArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class ByteArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return ByteArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class ByteArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return ByteArgument.newBuilder(name).asOptional().build(); } @@ -94,7 +94,7 @@ public final class ByteArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final byte defaultNum) { return ByteArgument.newBuilder(name).asOptionalWithDefault(Byte.toString(defaultNum)).build(); } @@ -122,7 +122,7 @@ public final class ByteArgument extends CommandArgument { private byte min = Byte.MIN_VALUE; private byte max = Byte.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Byte.class, name); } @@ -179,8 +179,8 @@ public final class ByteArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -208,8 +208,8 @@ public final class ByteArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return IntegerArgument.IntegerParser.getSuggestions(this.min, this.max, input); } @@ -246,7 +246,7 @@ public final class ByteArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public ByteParseException(@NonNull final String input, final byte min, final byte max) { + public ByteParseException(final @NonNull String input, final byte min, final byte max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java index b81b3bee..00815097 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java @@ -38,9 +38,9 @@ import java.util.function.BiFunction; public final class CharArgument extends CommandArgument { private CharArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new CharacterParser<>(), defaultValue, Character.class, suggestionsProvider); } @@ -52,7 +52,7 @@ public final class CharArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static CharArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static CharArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new CharArgument.Builder<>(name); } @@ -63,7 +63,7 @@ public final class CharArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return CharArgument.newBuilder(name).asRequired().build(); } @@ -74,7 +74,7 @@ public final class CharArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return CharArgument.newBuilder(name).asOptional().build(); } @@ -86,15 +86,15 @@ public final class CharArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultNum) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultNum) { return CharArgument.newBuilder(name).asOptionalWithDefault(defaultNum).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Character.class, name); } @@ -115,8 +115,8 @@ public final class CharArgument extends CommandArgument { public static final class CharacterParser implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -149,7 +149,7 @@ public final class CharArgument extends CommandArgument { * * @param input String input */ - public CharParseException(@NonNull final String input) { + public CharParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java index e2bb10e8..2207cc60 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java @@ -42,11 +42,11 @@ public final class DoubleArgument extends CommandArgument { private final double max; private DoubleArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final double min, final double max, final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new DoubleParser<>(min, max), defaultValue, Double.class, suggestionsProvider); this.min = min; @@ -60,7 +60,7 @@ public final class DoubleArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class DoubleArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return DoubleArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class DoubleArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return DoubleArgument.newBuilder(name).asOptional().build(); } @@ -94,7 +94,7 @@ public final class DoubleArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final double defaultNum) { return DoubleArgument.newBuilder(name).asOptionalWithDefault(Double.toString(defaultNum)).build(); } @@ -122,7 +122,7 @@ public final class DoubleArgument extends CommandArgument { private double min = Double.MIN_VALUE; private double max = Double.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Double.class, name); } @@ -179,8 +179,8 @@ public final class DoubleArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -232,7 +232,7 @@ public final class DoubleArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public DoubleParseException(@NonNull final String input, final double min, final double max) { + public DoubleParseException(final @NonNull String input, final double min, final double max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java index e738bbc7..20671e54 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java @@ -45,11 +45,11 @@ import java.util.stream.Collectors; @SuppressWarnings("unused") public class EnumArgument> extends CommandArgument { - protected EnumArgument(@NonNull final Class enumClass, + protected EnumArgument(final @NonNull Class enumClass, final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new EnumParser<>(enumClass), defaultValue, enumClass, suggestionsProvider); } @@ -65,7 +65,7 @@ public class EnumArgument> extends CommandArgument { */ public static > EnumArgument.@NonNull Builder newBuilder( @NonNull final Class enumClass, - @NonNull final String name) { + final @NonNull String name) { return new EnumArgument.Builder<>(name, enumClass); } @@ -79,8 +79,8 @@ public class EnumArgument> extends CommandArgument { * @return Created argument */ public static > @NonNull CommandArgument of( - @NonNull final Class enumClass, - @NonNull final String name) { + final @NonNull Class enumClass, + final @NonNull String name) { return EnumArgument.newBuilder(enumClass, name).asRequired().build(); } @@ -94,8 +94,8 @@ public class EnumArgument> extends CommandArgument { * @return Created argument */ public static > @NonNull CommandArgument optional( - @NonNull final Class enumClass, - @NonNull final String name) { + final @NonNull Class enumClass, + final @NonNull String name) { return EnumArgument.newBuilder(enumClass, name).asOptional().build(); } @@ -110,9 +110,9 @@ public class EnumArgument> extends CommandArgument { * @return Created argument */ public static > @NonNull CommandArgument optional( - @NonNull final Class enumClass, - @NonNull final String name, - @NonNull final E defaultValue) { + final @NonNull Class enumClass, + final @NonNull String name, + final @NonNull E defaultValue) { return EnumArgument.newBuilder(enumClass, name).asOptionalWithDefault(defaultValue.name().toLowerCase()).build(); } @@ -121,7 +121,7 @@ public class EnumArgument> extends CommandArgument { private final Class enumClass; - protected Builder(@NonNull final String name, @NonNull final Class enumClass) { + protected Builder(final @NonNull String name, final @NonNull Class enumClass) { super(enumClass, name); this.enumClass = enumClass; } @@ -144,14 +144,14 @@ public class EnumArgument> extends CommandArgument { * * @param enumClass Enum class */ - public EnumParser(@NonNull final Class enumClass) { + public EnumParser(final @NonNull Class enumClass) { this.enumClass = enumClass; this.allowedValues = EnumSet.allOf(enumClass); } @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -168,8 +168,8 @@ public class EnumArgument> extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return EnumSet.allOf(this.enumClass).stream().map(e -> e.name().toLowerCase()).collect(Collectors.toList()); } @@ -191,14 +191,14 @@ public class EnumArgument> extends CommandArgument { * @param input Input * @param enumClass Enum class */ - public EnumParseException(@NonNull final String input, - @NonNull final Class> enumClass) { + public EnumParseException(final @NonNull String input, + final @NonNull Class> enumClass) { this.input = input; this.enumClass = enumClass; } @SuppressWarnings("all") - private static @NonNull String join(@NonNull final Class clazz) { + private static @NonNull String join(final @NonNull Class clazz) { final EnumSet enumSet = EnumSet.allOf(clazz); return enumSet.stream() .map(e -> e.toString().toLowerCase()) diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java index f1a85911..296f5c74 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java @@ -42,11 +42,11 @@ public final class FloatArgument extends CommandArgument { private final float max; private FloatArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final float min, final float max, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new FloatParser<>(min, max), defaultValue, Float.class, suggestionsProvider); this.min = min; @@ -60,7 +60,7 @@ public final class FloatArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class FloatArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return FloatArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class FloatArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return FloatArgument.newBuilder(name).asOptional().build(); } @@ -94,7 +94,7 @@ public final class FloatArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final float defaultNum) { return FloatArgument.newBuilder(name).asOptionalWithDefault(Float.toString(defaultNum)).build(); } @@ -122,7 +122,7 @@ public final class FloatArgument extends CommandArgument { private float min = Float.MIN_VALUE; private float max = Float.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Float.class, name); } @@ -179,8 +179,8 @@ public final class FloatArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -232,7 +232,7 @@ public final class FloatArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public FloatParseException(@NonNull final String input, final float min, final float max) { + public FloatParseException(final @NonNull String input, final float min, final float max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java index 2ab74697..0e21f0fc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java @@ -49,11 +49,11 @@ public final class IntegerArgument extends CommandArgument { private final int max; private IntegerArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final int min, final int max, final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new IntegerParser<>(min, max), defaultValue, Integer.class, suggestionsProvider); this.min = min; @@ -67,7 +67,7 @@ public final class IntegerArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -78,7 +78,7 @@ public final class IntegerArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return IntegerArgument.newBuilder(name).asRequired().build(); } @@ -89,7 +89,7 @@ public final class IntegerArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return IntegerArgument.newBuilder(name).asOptional().build(); } @@ -101,7 +101,7 @@ public final class IntegerArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final int defaultNum) { return IntegerArgument.newBuilder(name).asOptionalWithDefault(Integer.toString(defaultNum)).build(); } @@ -129,7 +129,7 @@ public final class IntegerArgument extends CommandArgument { private int min = Integer.MIN_VALUE; private int max = Integer.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Integer.class, name); } @@ -184,7 +184,7 @@ public final class IntegerArgument extends CommandArgument { this.max = max; } - static @NonNull List<@NonNull String> getSuggestions(final long min, final long max, @NonNull final String input) { + static @NonNull List<@NonNull String> getSuggestions(final long min, final long max, final @NonNull String input) { if (input.isEmpty()) { return IntStream.range(0, MAX_SUGGESTIONS_INCREMENT).mapToObj(Integer::toString).collect(Collectors.toList()); } @@ -208,8 +208,8 @@ public final class IntegerArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -250,8 +250,8 @@ public final class IntegerArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return getSuggestions(this.min, this.max, input); } @@ -267,7 +267,7 @@ public final class IntegerArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public IntegerParseException(@NonNull final String input, final int min, final int max) { + public IntegerParseException(final @NonNull String input, final int min, final int max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java index 84777736..3763ec5c 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java @@ -42,11 +42,11 @@ public final class LongArgument extends CommandArgument { private final long max; private LongArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final long min, final long max, final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new LongParser<>(min, max), defaultValue, Long.class, suggestionsProvider); this.min = min; @@ -60,7 +60,7 @@ public final class LongArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static LongArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static LongArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class LongArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return LongArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class LongArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return LongArgument.newBuilder(name).asOptional().build(); } @@ -94,7 +94,7 @@ public final class LongArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final long defaultNum) { return LongArgument.newBuilder(name).asOptionalWithDefault(Long.toString(defaultNum)).build(); } @@ -122,7 +122,7 @@ public final class LongArgument extends CommandArgument { private long min = Long.MIN_VALUE; private long max = Long.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Long.class, name); } @@ -173,8 +173,8 @@ public final class LongArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -197,8 +197,8 @@ public final class LongArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return IntegerArgument.IntegerParser.getSuggestions(this.min, this.max, input); } @@ -214,7 +214,7 @@ public final class LongArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public LongParseException(@NonNull final String input, final long min, final long max) { + public LongParseException(final @NonNull String input, final long min, final long max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java index 4b6ab105..657bbe3f 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java @@ -42,11 +42,11 @@ public final class ShortArgument extends CommandArgument { private final short max; private ShortArgument(final boolean required, - @NonNull final String name, + final @NonNull String name, final short min, final short max, final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List> suggestionsProvider) { super(required, name, new ShortParser<>(min, max), defaultValue, Short.class, suggestionsProvider); this.min = min; @@ -60,7 +60,7 @@ public final class ShortArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static ShortArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static ShortArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class ShortArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return ShortArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class ShortArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return ShortArgument.newBuilder(name).asOptional().build(); } @@ -94,7 +94,7 @@ public final class ShortArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, + public static @NonNull CommandArgument optional(final @NonNull String name, final short defaultNum) { return ShortArgument.newBuilder(name).asOptionalWithDefault(Short.toString(defaultNum)).build(); } @@ -122,7 +122,7 @@ public final class ShortArgument extends CommandArgument { private short min = Short.MIN_VALUE; private short max = Short.MAX_VALUE; - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Short.class, name); } @@ -179,8 +179,8 @@ public final class ShortArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -203,8 +203,8 @@ public final class ShortArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return IntegerArgument.IntegerParser.getSuggestions(this.min, this.max, input); } @@ -238,7 +238,7 @@ public final class ShortArgument extends CommandArgument { * @param min Minimum value * @param max Maximum value */ - public ShortParseException(@NonNull final String input, final short min, final short max) { + public ShortParseException(final @NonNull String input, final short min, final short max) { super(input, min, max); } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java index b4c85b0c..b3568847 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java @@ -41,10 +41,10 @@ public final class StringArgument extends CommandArgument { private final StringMode stringMode; private StringArgument(final boolean required, - @NonNull final String name, - @NonNull final StringMode stringMode, - @NonNull final String defaultValue, - @NonNull final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull StringMode stringMode, + final @NonNull String defaultValue, + final @NonNull BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new StringParser<>(stringMode, suggestionsProvider), defaultValue, String.class, suggestionsProvider); @@ -58,7 +58,7 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static StringArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static StringArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new StringArgument.Builder<>(name); } @@ -69,7 +69,7 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return StringArgument.newBuilder(name).single().asRequired().build(); } @@ -81,8 +81,8 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name, - @NonNull final StringMode stringMode) { + public static @NonNull CommandArgument of(final @NonNull String name, + final @NonNull StringMode stringMode) { return StringArgument.newBuilder(name).withMode(stringMode).asRequired().build(); } @@ -93,7 +93,7 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return StringArgument.newBuilder(name).single().asOptional().build(); } @@ -105,8 +105,8 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final StringMode stringMode) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull StringMode stringMode) { return StringArgument.newBuilder(name).withMode(stringMode).asOptional().build(); } @@ -118,8 +118,8 @@ public final class StringArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultString) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultString) { return StringArgument.newBuilder(name).asOptionalWithDefault(defaultString).build(); } @@ -145,11 +145,11 @@ public final class StringArgument extends CommandArgument { private StringMode stringMode = StringMode.SINGLE; private BiFunction, String, List> suggestionsProvider = (v1, v2) -> Collections.emptyList(); - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(String.class, name); } - private @NonNull Builder withMode(@NonNull final StringMode stringMode) { + private @NonNull Builder withMode(final @NonNull StringMode stringMode) { this.stringMode = stringMode; return this; } @@ -190,7 +190,7 @@ public final class StringArgument extends CommandArgument { * @param suggestionsProvider Suggestions provider * @return Builder instance */ - public @NonNull Builder withSuggestionsProvider(@NonNull final BiFunction<@NonNull CommandContext, + public @NonNull Builder withSuggestionsProvider(final @NonNull BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { this.suggestionsProvider = suggestionsProvider; return this; @@ -221,16 +221,16 @@ public final class StringArgument extends CommandArgument { * @param stringMode String parsing mode * @param suggestionsProvider Suggestions provider */ - public StringParser(@NonNull final StringMode stringMode, - @NonNull final BiFunction<@NonNull CommandContext, @NonNull String, + public StringParser(final @NonNull StringMode stringMode, + final @NonNull BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { this.stringMode = stringMode; this.suggestionsProvider = suggestionsProvider; } @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -294,8 +294,8 @@ public final class StringArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { return this.suggestionsProvider.apply(commandContext, input); } @@ -326,7 +326,7 @@ public final class StringArgument extends CommandArgument { * @param input Input * @param stringMode String mode */ - public StringParseException(@NonNull final String input, @NonNull final StringMode stringMode) { + public StringParseException(final @NonNull String input, final @NonNull StringMode stringMode) { this.input = input; this.stringMode = stringMode; } diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java index b92a8087..2504adf6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java @@ -39,9 +39,9 @@ import java.util.function.BiFunction; public final class UUIDArgument extends CommandArgument { private UUIDArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new UUIDParser<>(), defaultValue, UUID.class, suggestionsProvider); } @@ -53,7 +53,7 @@ public final class UUIDArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -64,7 +64,7 @@ public final class UUIDArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return UUIDArgument.newBuilder(name).asRequired().build(); } @@ -75,7 +75,7 @@ public final class UUIDArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return UUIDArgument.newBuilder(name).asOptional().build(); } @@ -87,15 +87,15 @@ public final class UUIDArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final UUID defaultUUID) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull UUID defaultUUID) { return UUIDArgument.newBuilder(name).asOptionalWithDefault(defaultUUID.toString()).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(UUID.class, name); } @@ -116,8 +116,8 @@ public final class UUIDArgument extends CommandArgument { @Override public @NonNull ArgumentParseResult parse( - @NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -148,7 +148,7 @@ public final class UUIDArgument extends CommandArgument { * * @param input String input */ - public UUIDParseException(@NonNull final String input) { + public UUIDParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java b/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java index 1cb12a01..60634835 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/CommandContext.java @@ -51,7 +51,7 @@ public final class CommandContext { * * @param commandSender Sender of the command */ - public CommandContext(@NonNull final C commandSender) { + public CommandContext(final @NonNull C commandSender) { this(false, commandSender); } @@ -62,7 +62,7 @@ public final class CommandContext { * @param commandSender Sender of the command */ public CommandContext(final boolean suggestions, - @NonNull final C commandSender) { + final @NonNull C commandSender) { this.commandSender = commandSender; this.suggestions = suggestions; } @@ -93,7 +93,7 @@ public final class CommandContext { * @param value Value * @param Value type */ - public void store(@NonNull final String key, @NonNull final T value) { + public void store(final @NonNull String key, final @NonNull T value) { this.internalStorage.put(key, value); } @@ -105,7 +105,7 @@ public final class CommandContext { * @param Value type * @return Value */ - public @NonNull Optional getOptional(@NonNull final String key) { + public @NonNull Optional getOptional(final @NonNull String key) { final Object value = this.internalStorage.get(key); if (value != null) { @SuppressWarnings("ALL") final T castedValue = (T) value; @@ -120,7 +120,7 @@ public final class CommandContext { * * @param key Key to remove */ - public void remove(@NonNull final String key) { + public void remove(final @NonNull String key) { this.internalStorage.remove(key); } @@ -134,7 +134,7 @@ public final class CommandContext { * @throws NullPointerException If no such argument is stored */ @SuppressWarnings("unchecked") - public @NonNull T get(@NonNull final String key) { + public @NonNull T get(final @NonNull String key) { final Object value = this.internalStorage.get(key); if (value == null) { throw new NullPointerException("No such object stored in the context: " + key); @@ -150,8 +150,8 @@ public final class CommandContext { * @param Argument type * @return Argument, or supplied default value */ - public @Nullable T getOrDefault(@NonNull final String key, - @Nullable final T defaultValue) { + public @Nullable T getOrDefault(final @NonNull String key, + final @Nullable T defaultValue) { return this.getOptional(key).orElse(defaultValue); } @@ -161,7 +161,7 @@ public final class CommandContext { * @param argument Argument * @return Created timing instance */ - public @NonNull ArgumentTiming createTiming(@NonNull final CommandArgument argument) { + public @NonNull ArgumentTiming createTiming(final @NonNull CommandArgument argument) { final ArgumentTiming argumentTiming = new ArgumentTiming(); this.argumentTimings.put(argument, argumentTiming); return argumentTiming; diff --git a/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java b/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java index b4750aba..966e8a69 100644 --- a/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java +++ b/cloud-core/src/main/java/cloud/commandframework/context/StandardCommandContextFactory.java @@ -35,7 +35,7 @@ public final class StandardCommandContextFactory implements CommandContextFac * @return Created context */ @Override - public CommandContext create(final boolean suggestions, @NonNull final C sender) { + public CommandContext create(final boolean suggestions, final @NonNull C sender) { return new CommandContext<>(suggestions, sender); } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java index eb2150bb..3903232a 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/AmbiguousNodeException.java @@ -51,9 +51,9 @@ public final class AmbiguousNodeException extends IllegalStateException { * @param ambiguousNode Node that caused exception * @param children All children of the parent */ - public AmbiguousNodeException(@Nullable final CommandArgument parentNode, - @NonNull final CommandArgument ambiguousNode, - @NonNull final List<@NonNull CommandArgument> children) { + public AmbiguousNodeException(final @Nullable CommandArgument parentNode, + final @NonNull CommandArgument ambiguousNode, + final @NonNull List<@NonNull CommandArgument> children) { this.parentNode = parentNode; this.ambiguousNode = ambiguousNode; this.children = children; diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java index 9d932168..15541aaa 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/ArgumentParseException.java @@ -39,9 +39,9 @@ public class ArgumentParseException extends CommandParseException { * @param commandSender Command sender * @param currentChain Chain leading up to the exception */ - public ArgumentParseException(@NonNull final Throwable throwable, - @NonNull final Object commandSender, - @NonNull final List<@NonNull CommandArgument> currentChain) { + public ArgumentParseException(final @NonNull Throwable throwable, + final @NonNull Object commandSender, + final @NonNull List<@NonNull CommandArgument> currentChain) { super(commandSender, currentChain); this.cause = throwable; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java index 8c4e3b1b..b217de10 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/CommandParseException.java @@ -44,8 +44,8 @@ public class CommandParseException extends IllegalArgumentException { * @param commandSender Sender who executed the command * @param currentChain Chain leading up to the exception */ - protected CommandParseException(@NonNull final Object commandSender, - @NonNull final List> currentChain) { + protected CommandParseException(final @NonNull Object commandSender, + final @NonNull List> currentChain) { this.commandSender = commandSender; this.currentChain = currentChain; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java index 29db24a4..3a60534d 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidCommandSenderException.java @@ -42,9 +42,9 @@ public final class InvalidCommandSenderException extends CommandParseException { * @param requiredSender The sender type that is required * @param currentChain Chain leading up to the exception */ - public InvalidCommandSenderException(@NonNull final Object commandSender, - @NonNull final Class requiredSender, - @NonNull final List<@NonNull CommandArgument> currentChain) { + public InvalidCommandSenderException(final @NonNull Object commandSender, + final @NonNull Class requiredSender, + final @NonNull List<@NonNull CommandArgument> currentChain) { super(commandSender, currentChain); this.requiredSender = requiredSender; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java index a546e58e..3021054d 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/InvalidSyntaxException.java @@ -43,9 +43,9 @@ public class InvalidSyntaxException extends CommandParseException { * @param commandSender Sender that sent the command * @param currentChain Chain leading up to issue */ - public InvalidSyntaxException(@NonNull final String correctSyntax, - @NonNull final Object commandSender, - @NonNull final List<@NonNull CommandArgument> currentChain) { + public InvalidSyntaxException(final @NonNull String correctSyntax, + final @NonNull Object commandSender, + final @NonNull List<@NonNull CommandArgument> currentChain) { super(commandSender, currentChain); this.correctSyntax = correctSyntax; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java index 2be95ae1..2b1b6ebe 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoCommandInLeafException.java @@ -41,7 +41,7 @@ public final class NoCommandInLeafException extends IllegalStateException { * * @param commandArgument Command argument that caused the exception */ - public NoCommandInLeafException(@NonNull final CommandArgument commandArgument) { + public NoCommandInLeafException(final @NonNull CommandArgument commandArgument) { super(String.format("Leaf node '%s' does not have associated owning command", commandArgument.getName())); this.commandArgument = commandArgument; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java index 0baafb1b..a2497355 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoPermissionException.java @@ -46,9 +46,9 @@ public class NoPermissionException extends CommandParseException { * @param commandSender Command sender * @param currentChain Chain leading up to the exception */ - public NoPermissionException(@NonNull final CommandPermission missingPermission, - @NonNull final Object commandSender, - @NonNull final List<@NonNull CommandArgument> currentChain) { + public NoPermissionException(final @NonNull CommandPermission missingPermission, + final @NonNull Object commandSender, + final @NonNull List<@NonNull CommandArgument> currentChain) { super(commandSender, currentChain); this.missingPermission = missingPermission; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java index ffd31303..2f28a5dc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/NoSuchCommandException.java @@ -44,9 +44,9 @@ public final class NoSuchCommandException extends CommandParseException { * @param currentChain Chain leading up to the exception * @param command Entered command (following the command chain) */ - public NoSuchCommandException(@NonNull final Object commandSender, - @NonNull final List> currentChain, - @NonNull final String command) { + public NoSuchCommandException(final @NonNull Object commandSender, + final @NonNull List> currentChain, + final @NonNull String command) { super(commandSender, currentChain); this.suppliedCommand = command; } diff --git a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java index 4146b584..249bdbda 100644 --- a/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java +++ b/cloud-core/src/main/java/cloud/commandframework/exceptions/parsing/NumberParseException.java @@ -38,9 +38,9 @@ public abstract class NumberParseException extends IllegalArgumentException { * @param min Maximum value * @param max Minimum value */ - public NumberParseException(@NonNull final String input, - @NonNull final Number min, - @NonNull final Number max) { + public NumberParseException(final @NonNull String input, + final @NonNull Number min, + final @NonNull Number max) { this.input = input; this.min = min; this.max = max; diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java b/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java index 2480bebe..08b19db6 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java @@ -50,9 +50,9 @@ public final class AsynchronousCommandExecutionCoordinator extends CommandExe private final Executor executor; private final boolean synchronizeParsing; - private AsynchronousCommandExecutionCoordinator(@Nullable final Executor executor, + private AsynchronousCommandExecutionCoordinator(final @Nullable Executor executor, final boolean synchronizeParsing, - @NonNull final CommandTree commandTree) { + final @NonNull CommandTree commandTree) { super(commandTree); this.executor = executor; this.synchronizeParsing = synchronizeParsing; @@ -70,8 +70,8 @@ public final class AsynchronousCommandExecutionCoordinator extends CommandExe } @Override - public @NonNull CompletableFuture> coordinateExecution(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> input) { + public @NonNull CompletableFuture> coordinateExecution(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> input) { final Consumer> commandConsumer = command -> { if (this.commandManager.postprocessContext(commandContext, command) == State.ACCEPTED) { @@ -140,7 +140,7 @@ public final class AsynchronousCommandExecutionCoordinator extends CommandExe * @param executor Executor to use * @return Builder instance */ - public @NonNull Builder withExecutor(@NonNull final Executor executor) { + public @NonNull Builder withExecutor(final @NonNull Executor executor) { this.executor = executor; return this; } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java index 1b8abdb0..64888d43 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionCoordinator.java @@ -49,7 +49,7 @@ public abstract class CommandExecutionCoordinator { * * @param commandTree Command tree */ - public CommandExecutionCoordinator(@NonNull final CommandTree commandTree) { + public CommandExecutionCoordinator(final @NonNull CommandTree commandTree) { this.commandTree = commandTree; } @@ -92,13 +92,13 @@ public abstract class CommandExecutionCoordinator { public static final class SimpleCoordinator extends CommandExecutionCoordinator { - private SimpleCoordinator(@NonNull final CommandTree commandTree) { + private SimpleCoordinator(final @NonNull CommandTree commandTree) { super(commandTree); } @Override - public CompletableFuture> coordinateExecution(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> input) { + public CompletableFuture> coordinateExecution(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> input) { final CompletableFuture> completableFuture = new CompletableFuture<>(); try { this.getCommandTree().parse(commandContext, input).ifPresent(command -> { diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java index b97bfc9b..8c9dd551 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandExecutionHandler.java @@ -52,7 +52,7 @@ public interface CommandExecutionHandler { class NullCommandExecutionHandler implements CommandExecutionHandler { @Override - public void execute(@NonNull final CommandContext commandContext) { + public void execute(final @NonNull CommandContext commandContext) { } } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java b/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java index 045ff65a..d31c5ec5 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/CommandResult.java @@ -40,7 +40,7 @@ public class CommandResult { * * @param context Command context */ - public CommandResult(@NonNull final CommandContext context) { + public CommandResult(final @NonNull CommandContext context) { this.commandContext = context; } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java index 49ec8451..2c45a9cb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/FilteringCommandSuggestionProcessor.java @@ -37,8 +37,8 @@ import java.util.List; public final class FilteringCommandSuggestionProcessor implements CommandSuggestionProcessor { @Override - public @NonNull List<@NonNull String> apply(@NonNull final CommandPreprocessingContext context, - @NonNull final List<@NonNull String> strings) { + public @NonNull List<@NonNull String> apply(final @NonNull CommandPreprocessingContext context, + final @NonNull List<@NonNull String> strings) { final String input; if (context.getInputQueue().isEmpty()) { input = ""; diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java index 25f005db..398d7070 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/AcceptingCommandPostprocessor.java @@ -39,7 +39,7 @@ public final class AcceptingCommandPostprocessor implements CommandPostproces public static final String PROCESSED_INDICATOR_KEY = "__COMMAND_POST_PROCESSED__"; @Override - public void accept(@NonNull final CommandPostprocessingContext context) { + public void accept(final @NonNull CommandPostprocessingContext context) { context.getCommandContext().store(PROCESSED_INDICATOR_KEY, "true"); } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java index 0d034468..8b411930 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/postprocessor/CommandPostprocessingContext.java @@ -45,8 +45,8 @@ public final class CommandPostprocessingContext { * @param commandContext Command context * @param command Command instance */ - public CommandPostprocessingContext(@NonNull final CommandContext<@NonNull C> commandContext, - @NonNull final Command<@NonNull C> command) { + public CommandPostprocessingContext(final @NonNull CommandContext<@NonNull C> commandContext, + final @NonNull Command<@NonNull C> command) { this.commandContext = commandContext; this.command = command; } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java index 662b25bd..ac662d36 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/AcceptingCommandPreprocessor.java @@ -39,7 +39,7 @@ public final class AcceptingCommandPreprocessor implements CommandPreprocesso public static final String PROCESSED_INDICATOR_KEY = "__COMMAND_PRE_PROCESSED__"; @Override - public void accept(@NonNull final CommandPreprocessingContext context) { + public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store(PROCESSED_INDICATOR_KEY, "true"); } diff --git a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java index c1ed507b..5732e0e1 100644 --- a/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java +++ b/cloud-core/src/main/java/cloud/commandframework/execution/preprocessor/CommandPreprocessingContext.java @@ -45,8 +45,8 @@ public final class CommandPreprocessingContext { * @param commandContext Command context * @param inputQueue Command input as supplied by sender */ - public CommandPreprocessingContext(@NonNull final CommandContext commandContext, - @NonNull final LinkedList<@NonNull String> inputQueue) { + public CommandPreprocessingContext(final @NonNull CommandContext commandContext, + final @NonNull LinkedList<@NonNull String> inputQueue) { this.commandContext = commandContext; this.inputQueue = inputQueue; } diff --git a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java index 422a81c7..057ff275 100644 --- a/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java +++ b/cloud-core/src/main/java/cloud/commandframework/extra/confirmation/CommandConfirmationManager.java @@ -73,9 +73,9 @@ public class CommandConfirmationManager { * @param errorNotifier Notifier that gets called when someone tries to confirm a command with nothing in the queue */ public CommandConfirmationManager(final long timeout, - @NonNull final TimeUnit timeoutTimeUnit, - @NonNull final Consumer<@NonNull CommandPostprocessingContext> notifier, - @NonNull final Consumer<@NonNull C> errorNotifier) { + final @NonNull TimeUnit timeoutTimeUnit, + final @NonNull Consumer<@NonNull CommandPostprocessingContext> notifier, + final @NonNull Consumer<@NonNull C> errorNotifier) { this.notifier = notifier; this.errorNotifier = errorNotifier; this.pendingCommands = new LinkedHashMap, Long>>() { @@ -87,11 +87,11 @@ public class CommandConfirmationManager { this.timeoutMillis = timeoutTimeUnit.toMillis(timeout); } - private void notifyConsumer(@NonNull final CommandPostprocessingContext context) { + private void notifyConsumer(final @NonNull CommandPostprocessingContext context) { this.notifier.accept(context); } - private void addPending(@NonNull final CommandPostprocessingContext context) { + private void addPending(final @NonNull CommandPostprocessingContext context) { this.pendingCommands.put(context.getCommandContext().getSender(), Pair.of(context, System.currentTimeMillis())); } @@ -101,7 +101,7 @@ public class CommandConfirmationManager { * @param sender Sender * @return Optional containing the post processing context if one has been stored, else {@link Optional#empty()} */ - public @NonNull Optional> getPending(@NonNull final C sender) { + public @NonNull Optional> getPending(final @NonNull C sender) { final Pair, Long> pair = this.pendingCommands.remove(sender); if (pair != null) { if (System.currentTimeMillis() < pair.getSecond() + this.timeoutMillis) { @@ -126,7 +126,7 @@ public class CommandConfirmationManager { * * @param manager Command manager */ - public void registerConfirmationProcessor(@NonNull final CommandManager manager) { + public void registerConfirmationProcessor(final @NonNull CommandManager manager) { manager.registerCommandPostProcessor(new CommandConfirmationPostProcessor()); } @@ -153,7 +153,7 @@ public class CommandConfirmationManager { private final class CommandConfirmationPostProcessor implements CommandPostprocessor { @Override - public void accept(@NonNull final CommandPostprocessingContext context) { + public void accept(final @NonNull CommandPostprocessingContext context) { if (!context.getCommand() .getCommandMeta() .getOrDefault(CONFIRMATION_REQUIRED_META, "false") diff --git a/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java b/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java index 988a567f..d0abc518 100644 --- a/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java +++ b/cloud-core/src/main/java/cloud/commandframework/internal/CommandRegistrationHandler.java @@ -58,7 +58,7 @@ public interface CommandRegistrationHandler { } @Override - public boolean registerCommand(@NonNull final Command command) { + public boolean registerCommand(final @NonNull Command command) { return true; } diff --git a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java index 18ad155d..a29d1fc9 100644 --- a/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java +++ b/cloud-core/src/main/java/cloud/commandframework/meta/SimpleCommandMeta.java @@ -39,7 +39,7 @@ public class SimpleCommandMeta extends CommandMeta { private final Map metaMap; - protected SimpleCommandMeta(@NonNull final Map<@NonNull String, @NonNull String> metaMap) { + protected SimpleCommandMeta(final @NonNull Map<@NonNull String, @NonNull String> metaMap) { this.metaMap = Collections.unmodifiableMap(metaMap); } @@ -62,12 +62,12 @@ public class SimpleCommandMeta extends CommandMeta { } @Override - public final @NonNull Optional getValue(@NonNull final String key) { + public final @NonNull Optional getValue(final @NonNull String key) { return Optional.ofNullable(this.metaMap.get(key)); } @Override - public final @NonNull String getOrDefault(@NonNull final String key, @NonNull final String defaultValue) { + public final @NonNull String getOrDefault(final @NonNull String key, final @NonNull String defaultValue) { return this.getValue(key).orElse(defaultValue); } @@ -109,7 +109,7 @@ public class SimpleCommandMeta extends CommandMeta { * @param commandMeta Existing instance * @return Builder instance */ - public @NonNull Builder with(@NonNull final CommandMeta commandMeta) { + public @NonNull Builder with(final @NonNull CommandMeta commandMeta) { commandMeta.getAll().forEach(this::with); return this; } @@ -121,8 +121,8 @@ public class SimpleCommandMeta extends CommandMeta { * @param value Value * @return Builder instance */ - public @NonNull Builder with(@NonNull final String key, - @NonNull final String value) { + public @NonNull Builder with(final @NonNull String key, + final @NonNull String value) { this.map.put(key, value); return this; } diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java b/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java index 6bec1ac1..2e3a05cc 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/OrPermission.java @@ -38,7 +38,7 @@ public final class OrPermission implements CommandPermission { private final Collection permissions; - private OrPermission(@NonNull final Collection permissions) { + private OrPermission(final @NonNull Collection permissions) { this.permissions = permissions; } @@ -48,7 +48,7 @@ public final class OrPermission implements CommandPermission { * @param permissions Permissions to join * @return Constructed permission */ - public static @NonNull CommandPermission of(@NonNull final Collection permissions) { + public static @NonNull CommandPermission of(final @NonNull Collection permissions) { final Set permissionSet = new HashSet<>(); for (final CommandPermission permission : permissions) { permissionSet.addAll(permission.getPermissions()); diff --git a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java index 9f12c189..ceb2af41 100644 --- a/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java +++ b/cloud-core/src/main/java/cloud/commandframework/permission/Permission.java @@ -41,7 +41,7 @@ public final class Permission implements CommandPermission { private final String permission; - private Permission(@NonNull final String permission) { + private Permission(final @NonNull String permission) { this.permission = permission; } @@ -60,7 +60,7 @@ public final class Permission implements CommandPermission { * @param string Command permission * @return Created command permission */ - public static @NonNull Permission of(@NonNull final String string) { + public static @NonNull Permission of(final @NonNull String string) { return new Permission(string); } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java index b9417476..7b2879aa 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/DynamicTuple.java @@ -32,7 +32,7 @@ public final class DynamicTuple implements Tuple { private final Object[] internalArray; - private DynamicTuple(@NonNull final Object @NonNull [] internalArray) { + private DynamicTuple(final @NonNull Object @NonNull [] internalArray) { this.internalArray = internalArray; } @@ -42,7 +42,7 @@ public final class DynamicTuple implements Tuple { * @param elements Elements that should be contained in the tuple * @return Created tuple, preserving the order of the given elements */ - public static @NonNull DynamicTuple of(@NonNull final Object... elements) { + public static @NonNull DynamicTuple of(final @NonNull Object... elements) { return new DynamicTuple(elements); } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java index 2674bce5..920332e0 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Pair.java @@ -38,8 +38,8 @@ public class Pair implements Tuple { private final U first; private final V second; - protected Pair(@NonNull final U first, - @NonNull final V second) { + protected Pair(final @NonNull U first, + final @NonNull V second) { this.first = first; this.second = second; } @@ -53,8 +53,8 @@ public class Pair implements Tuple { * @param Second type * @return Created pair */ - public static @NonNull Pair<@NonNull U, @NonNull V> of(@NonNull final U first, - @NonNull final V second) { + public static @NonNull Pair<@NonNull U, @NonNull V> of(final @NonNull U first, + final @NonNull V second) { return new Pair<>(first, second); } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java index 0c8c3789..49244491 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quartet.java @@ -42,10 +42,10 @@ public class Quartet implements Tuple { private final W third; private final X fourth; - protected Quartet(@NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth) { + protected Quartet(final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth) { this.first = first; this.second = second; this.third = third; @@ -65,10 +65,10 @@ public class Quartet implements Tuple { * @param Fourth type * @return Created quartet */ - public static @NonNull Quartet<@NonNull U, @NonNull V, @NonNull W, @NonNull X> of(@NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth) { + public static @NonNull Quartet<@NonNull U, @NonNull V, @NonNull W, @NonNull X> of(final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth) { return new Quartet<>(first, second, third, fourth); } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java index 0e47d934..8004f202 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Quintet.java @@ -44,11 +44,11 @@ public class Quintet implements Tuple { private final X fourth; private final Y fifth; - protected Quintet(@NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth, - @NonNull final Y fifth) { + protected Quintet(final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth, + final @NonNull Y fifth) { this.first = first; this.second = second; this.third = third; @@ -72,11 +72,11 @@ public class Quintet implements Tuple { * @return Created quintet */ public static @NonNull Quintet<@NonNull U, @NonNull V, @NonNull W, @NonNull X, @NonNull Y> of( - @NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth, - @NonNull final Y fifth) { + final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth, + final @NonNull Y fifth) { return new Quintet<>(first, second, third, fourth, fifth); } diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java index b1e7246a..90687eeb 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Sextet.java @@ -46,12 +46,12 @@ public class Sextet implements Tuple { private final Y fifth; private final Z sixth; - protected Sextet(@NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth, - @NonNull final Y fifth, - @NonNull final Z sixth) { + protected Sextet(final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth, + final @NonNull Y fifth, + final @NonNull Z sixth) { this.first = first; this.second = second; this.third = third; @@ -78,12 +78,12 @@ public class Sextet implements Tuple { * @return Created sextet */ public static @NonNull Sextet<@NonNull U, @NonNull V, @NonNull W, @NonNull X, @NonNull Y, @NonNull Z> of( - @NonNull final U first, - @NonNull final V second, - @NonNull final W third, - @NonNull final X fourth, - @NonNull final Y fifth, - @NonNull final Z sixth) { + final @NonNull U first, + final @NonNull V second, + final @NonNull W third, + final @NonNull X fourth, + final @NonNull Y fifth, + final @NonNull Z sixth) { return new Sextet<>(first, second, third, fourth, fifth, sixth); } @@ -175,7 +175,7 @@ public class Sextet implements Tuple { } @Override - public @NonNull final Object @NonNull [] toArray() { + public final @NonNull Object @NonNull [] toArray() { final Object[] array = new Object[6]; array[0] = this.first; array[1] = this.second; diff --git a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java index d7e70a68..98c39515 100644 --- a/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java +++ b/cloud-core/src/main/java/cloud/commandframework/types/tuples/Triplet.java @@ -40,9 +40,9 @@ public class Triplet implements Tuple { private final V second; private final W third; - protected Triplet(@NonNull final U first, - @NonNull final V second, - @NonNull final W third) { + protected Triplet(final @NonNull U first, + final @NonNull V second, + final @NonNull W third) { this.first = first; this.second = second; this.third = third; @@ -59,9 +59,9 @@ public class Triplet implements Tuple { * @param Third type * @return Created triplet */ - public static @NonNull Triplet<@NonNull U, @NonNull V, @NonNull W> of(@NonNull final U first, - @NonNull final V second, - @NonNull final W third) { + public static @NonNull Triplet<@NonNull U, @NonNull V, @NonNull W> of(final @NonNull U first, + final @NonNull V second, + final @NonNull W third) { return new Triplet<>(first, second, third); } diff --git a/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java b/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java index 19d300ac..f062a1da 100644 --- a/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java +++ b/cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java @@ -54,7 +54,7 @@ public class JLineCommandManager extends CommandManager impl * * @param executionCoordinatorFunction Function producing a new coordinator */ - public JLineCommandManager(@NonNull final Function, + public JLineCommandManager(final @NonNull Function, CommandExecutionCoordinator> executionCoordinatorFunction) { super(executionCoordinatorFunction, CommandRegistrationHandler.nullCommandRegistrationHandler()); } @@ -138,9 +138,9 @@ public class JLineCommandManager extends CommandManager impl } @Override - public final void complete(@NonNull final LineReader lineReader, - @NonNull final ParsedLine parsedLine, - @NonNull final List<@NonNull Candidate> list) { + public final void complete(final @NonNull LineReader lineReader, + final @NonNull ParsedLine parsedLine, + final @NonNull List<@NonNull Candidate> list) { final String line = parsedLine.line(); if (line == null || line.isEmpty() || !line.startsWith("/")) { System.out.println("Cannot suggest: empty line"); @@ -155,8 +155,8 @@ public class JLineCommandManager extends CommandManager impl } @Override - public final boolean hasPermission(@NonNull final JLineCommandSender sender, - @NonNull final String permission) { + public final boolean hasPermission(final @NonNull JLineCommandSender sender, + final @NonNull String permission) { return true; } 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 48a5425c..fc3f76ad 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 @@ -95,8 +95,8 @@ public final class CloudBrigadierManager { * @param commandManager Command manager * @param dummyContextProvider Provider of dummy context for completions */ - public CloudBrigadierManager(@NonNull final CommandManager commandManager, - @NonNull final Supplier<@NonNull CommandContext> + public CloudBrigadierManager(final @NonNull CommandManager commandManager, + final @NonNull Supplier<@NonNull CommandContext> dummyContextProvider) { this.mappers = new HashMap<>(); this.defaultArgumentTypeSuppliers = new HashMap<>(); @@ -199,9 +199,9 @@ public final class CloudBrigadierManager { * @param cloud argument type * @param Brigadier argument type value */ - public , O> void registerMapping(@NonNull final TypeToken argumentType, + public , O> void registerMapping(final @NonNull TypeToken argumentType, final boolean nativeSuggestions, - @NonNull final Function<@NonNull ? extends K, + final @NonNull Function<@NonNull ? extends K, @NonNull ? extends ArgumentType> mapper) { this.mappers.put(GenericTypeReflector.erase(argumentType.getType()), cloud.commandframework.types.tuples.Pair.of(mapper, nativeSuggestions)); @@ -213,16 +213,16 @@ public final class CloudBrigadierManager { * @param clazz Type to map * @param supplier Supplier that supplies the argument type */ - public void registerDefaultArgumentTypeSupplier(@NonNull final Class clazz, - @NonNull final Supplier<@NonNull ArgumentType> supplier) { + public void registerDefaultArgumentTypeSupplier(final @NonNull Class clazz, + final @NonNull Supplier<@NonNull ArgumentType> supplier) { this.defaultArgumentTypeSuppliers.put(clazz, supplier); } @SuppressWarnings("all") private > @Nullable Pair<@NonNull ArgumentType, @NonNull Boolean> getArgument( - @NonNull final TypeToken valueType, - @NonNull final TypeToken argumentType, - @NonNull final K argument) { + final @NonNull TypeToken valueType, + final @NonNull TypeToken argumentType, + final @NonNull K argument) { final ArgumentParser commandArgument = (ArgumentParser) argument; final cloud.commandframework.types.tuples.Pair pair = this.mappers.get(GenericTypeReflector.erase(argumentType.getType())); @@ -234,8 +234,8 @@ public final class CloudBrigadierManager { } private > @NonNull Pair<@NonNull ArgumentType, @NonNull Boolean> createDefaultMapper( - @NonNull final TypeToken clazz, - @NonNull final ArgumentParser argument) { + final @NonNull TypeToken clazz, + final @NonNull ArgumentParser argument) { final Supplier> argumentTypeSupplier = this.defaultArgumentTypeSuppliers .get(GenericTypeReflector.erase(clazz.getType())); if (argumentTypeSupplier != null) { @@ -253,9 +253,9 @@ public final class CloudBrigadierManager { * @param executor Command executor * @return Literal command node */ - public @NonNull LiteralCommandNode createLiteralCommandNode(@NonNull final String label, - @NonNull final Command cloudCommand, - @NonNull final BiPredicate<@NonNull S, + public @NonNull LiteralCommandNode createLiteralCommandNode(final @NonNull String label, + final @NonNull Command cloudCommand, + final @NonNull BiPredicate<@NonNull S, @NonNull CommandPermission> permissionChecker, final com.mojang.brigadier.@NonNull Command executor) { final CommandTree.Node> node = this.commandManager @@ -287,10 +287,10 @@ public final class CloudBrigadierManager { */ public @NonNull LiteralCommandNode createLiteralCommandNode( final CommandTree.@NonNull Node<@NonNull CommandArgument> cloudCommand, - @NonNull final LiteralCommandNode root, - @NonNull final SuggestionProvider suggestionProvider, + final @NonNull LiteralCommandNode root, + final @NonNull SuggestionProvider suggestionProvider, final com.mojang.brigadier.@NonNull Command executor, - @NonNull final BiPredicate<@NonNull S, @NonNull CommandPermission> permissionChecker) { + final @NonNull BiPredicate<@NonNull S, @NonNull CommandPermission> permissionChecker) { final LiteralArgumentBuilder literalArgumentBuilder = LiteralArgumentBuilder.literal(root.getLiteral()) .requires(sender -> permissionChecker.test(sender, (CommandPermission) cloudCommand.getNodeMeta() @@ -310,7 +310,7 @@ public final class CloudBrigadierManager { private @NonNull ArgumentBuilder constructCommandNode( final boolean forceExecutor, final CommandTree.@NonNull Node> root, - @NonNull final BiPredicate<@NonNull S, @NonNull CommandPermission> permissionChecker, + final @NonNull BiPredicate<@NonNull S, @NonNull CommandPermission> permissionChecker, final com.mojang.brigadier.@NonNull Command executor, final SuggestionProvider suggestionProvider) { if (root.getValue() instanceof CompoundArgument) { @@ -389,9 +389,9 @@ public final class CloudBrigadierManager { } private @NonNull CompletableFuture buildSuggestions( - @NonNull final CommandArgument argument, + final @NonNull CommandArgument argument, final com.mojang.brigadier.context.@NonNull CommandContext s, - @NonNull final SuggestionsBuilder builder) { + final @NonNull SuggestionsBuilder builder) { final CommandContext commandContext = this.dummyContextProvider.get(); final LinkedList inputQueue = new LinkedList<>(Collections.singletonList(builder.getInput())); final CommandPreprocessingContext commandPreprocessingContext = @@ -435,8 +435,8 @@ public final class CloudBrigadierManager { private final L left; private final R right; - private Pair(@NonNull final L left, - @NonNull final R right) { + private Pair(final @NonNull L left, + final @NonNull R right) { this.left = left; this.right = right; } diff --git a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java index 9790ada2..546d9ac6 100644 --- a/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java +++ b/cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java @@ -223,7 +223,7 @@ public final class BukkitTest extends JavaPlugin { } } - private void registerTeleportCommand(@NonNull final BukkitCommandManager manager) { + private void registerTeleportCommand(final @NonNull BukkitCommandManager manager) { manager.command(mgr.commandBuilder("teleport") .meta("description", "Takes in a location and teleports the player there") .withSenderType(Player.class) @@ -246,9 +246,9 @@ public final class BukkitTest extends JavaPlugin { @CommandDescription("Test cloud command using @CommandMethod") @CommandMethod(value = "annotation|a [number]", permission = "some.permission.node") - private void annotatedCommand(@NonNull final Player player, + private void annotatedCommand(final @NonNull Player player, @Argument(value = "input", description = "Some string") @Completions("one,two,duck") - @NonNull final String input, + final @NonNull String input, @Argument(value = "number", defaultValue = "5", description = "A number") @Range(min = "10", max = "100") final int number) { player.sendMessage(ChatColor.GOLD + "Your input was: " + ChatColor.AQUA + input + ChatColor.GREEN + " (" + number + ")"); @@ -267,7 +267,7 @@ public final class BukkitTest extends JavaPlugin { Bukkit.broadcastMessage(ChatColor.GRAY + "Calling Thread: " + Thread.currentThread().getName()); } - private @NonNull SimpleCommandMeta metaWithDescription(@NonNull final String description) { + private @NonNull SimpleCommandMeta metaWithDescription(final @NonNull String description) { return BukkitCommandMetaBuilder.builder().withDescription(description).build(); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java index 81613fc3..59e384a4 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommand.java @@ -51,11 +51,11 @@ final class BukkitCommand extends org.bukkit.command.Command implements Plugi private final Command cloudCommand; @SuppressWarnings("unchecked") - BukkitCommand(@NonNull final String label, - @NonNull final List<@NonNull String> aliases, - @NonNull final Command cloudCommand, - @NonNull final CommandArgument command, - @NonNull final BukkitCommandManager manager) { + BukkitCommand(final @NonNull String label, + final @NonNull List<@NonNull String> aliases, + final @NonNull Command cloudCommand, + final @NonNull CommandArgument command, + final @NonNull BukkitCommandManager manager) { super(label, cloudCommand.getCommandMeta().getOrDefault("description", ""), "", diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java index 03ae082c..c42b5213 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandManager.java @@ -83,11 +83,11 @@ public class BukkitCommandManager extends CommandManager { * @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender} * @throws Exception If the construction of the manager fails */ - public BukkitCommandManager(@NonNull final Plugin owningPlugin, - @NonNull final Function<@NonNull CommandTree, + public BukkitCommandManager(final @NonNull Plugin owningPlugin, + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, - @NonNull final Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, - @NonNull final Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) + final @NonNull Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, + final @NonNull Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) throws Exception { super(commandExecutionCoordinator, new BukkitPluginRegistrationHandler<>()); ((BukkitPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); @@ -170,7 +170,7 @@ public class BukkitCommandManager extends CommandManager { } @Override - public final boolean hasPermission(@NonNull final C sender, @NonNull final String permission) { + public final boolean hasPermission(final @NonNull C sender, final @NonNull String permission) { if (permission.isEmpty()) { return true; } @@ -198,7 +198,7 @@ public class BukkitCommandManager extends CommandManager { * @param capability Capability * @return {@code true} if the manager has the given capability, else {@code false} */ - public final boolean queryCapability(@NonNull final CloudBukkitCapabilities capability) { + public final boolean queryCapability(final @NonNull CloudBukkitCapabilities capability) { return this.queryCapabilities().contains(capability); } @@ -273,7 +273,7 @@ public class BukkitCommandManager extends CommandManager { * * @param reason Reason */ - public BrigadierFailureException(@NonNull final BrigadierFailureReason reason) { + public BrigadierFailureException(final @NonNull BrigadierFailureReason reason) { this.reason = reason; } @@ -283,7 +283,7 @@ public class BukkitCommandManager extends CommandManager { * @param reason Reason * @param cause Cause */ - public BrigadierFailureException(@NonNull final BrigadierFailureReason reason, @NonNull final Throwable cause) { + public BrigadierFailureException(final @NonNull BrigadierFailureReason reason, final @NonNull Throwable cause) { super(cause); this.reason = reason; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java index 8344295e..96721a58 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMeta.java @@ -33,7 +33,7 @@ public class BukkitCommandMeta extends SimpleCommandMeta { * * @param simpleCommandMeta Simple command meta data instance that gets mirrored */ - public BukkitCommandMeta(@NonNull final SimpleCommandMeta simpleCommandMeta) { + public BukkitCommandMeta(final @NonNull SimpleCommandMeta simpleCommandMeta) { super(simpleCommandMeta.getAll()); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java index bc2d9505..b599da22 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandMetaBuilder.java @@ -52,7 +52,7 @@ public final class BukkitCommandMetaBuilder { * @param description Command description * @return Builder instance */ - public @NonNull BuilderStage2 withDescription(@NonNull final String description) { + public @NonNull BuilderStage2 withDescription(final @NonNull String description) { return new BuilderStage2(description); } @@ -63,7 +63,7 @@ public final class BukkitCommandMetaBuilder { private final String description; - private BuilderStage2(@NonNull final String description) { + private BuilderStage2(final @NonNull String description) { this.description = description; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java index 197be7f4..f96b60de 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandPreprocessor.java @@ -51,7 +51,7 @@ final class BukkitCommandPreprocessor implements CommandPreprocessor { * and a {@link java.util.Set} of {@link CloudBukkitCapabilities} with the key "CloudBukkitCapabilities" */ @Override - public void accept(@NonNull final CommandPreprocessingContext context) { + public void accept(final @NonNull CommandPreprocessingContext context) { context.getCommandContext().store("BukkitCommandSender", mgr.getBackwardsCommandSenderMapper().apply( context.getCommandContext().getSender())); context.getCommandContext().store("CloudBukkitCapabilities", mgr.queryCapabilities()); diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java index cb1d78ba..fd4c35e8 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitCommandSender.java @@ -50,7 +50,7 @@ public abstract class BukkitCommandSender { * @param player Player instance * @return Constructed command sender */ - public static @NonNull BukkitCommandSender player(@NonNull final Player player) { + public static @NonNull BukkitCommandSender player(final @NonNull Player player) { return new BukkitPlayerSender(player); } @@ -122,7 +122,7 @@ public abstract class BukkitCommandSender { * * @param message Message to send */ - public void sendMessage(@NonNull final String message) { + public void sendMessage(final @NonNull String message) { this.internalSender.sendMessage(message); } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java index 1b786119..d740dee5 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/BukkitPlayerSender.java @@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; final class BukkitPlayerSender extends BukkitCommandSender { - BukkitPlayerSender(@NonNull final Player player) { + BukkitPlayerSender(final @NonNull Player player) { super(player); } 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 8a22cc97..4aa47913 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 @@ -51,7 +51,7 @@ class BukkitPluginRegistrationHandler implements CommandRegistrationHandler { BukkitPluginRegistrationHandler() { } - void initialize(@NonNull final BukkitCommandManager bukkitCommandManager) throws Exception { + void initialize(final @NonNull BukkitCommandManager bukkitCommandManager) throws Exception { final Method getCommandMap = Bukkit.getServer().getClass().getDeclaredMethod("getCommandMap"); getCommandMap.setAccessible(true); this.commandMap = (CommandMap) getCommandMap.invoke(Bukkit.getServer()); @@ -65,7 +65,7 @@ class BukkitPluginRegistrationHandler implements CommandRegistrationHandler { } @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)) { @@ -111,9 +111,9 @@ class BukkitPluginRegistrationHandler implements CommandRegistrationHandler { return true; } - protected void registerExternal(@NonNull final String label, - @NonNull final Command command, - @NonNull final BukkitCommand bukkitCommand) { + protected void registerExternal(final @NonNull String label, + final @NonNull Command command, + final @NonNull BukkitCommand bukkitCommand) { } } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java index faad04da..08c56eb6 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/CloudCommodoreManager.java @@ -39,7 +39,7 @@ class CloudCommodoreManager extends BukkitPluginRegistrationHandler { private final CloudBrigadierManager brigadierManager; private final Commodore commodore; - CloudCommodoreManager(@NonNull final BukkitCommandManager commandManager) + CloudCommodoreManager(final @NonNull BukkitCommandManager commandManager) throws BukkitCommandManager.BrigadierFailureException { if (!CommodoreProvider.isSupported()) { throw new BukkitCommandManager.BrigadierFailureException(BukkitCommandManager @@ -52,9 +52,9 @@ class CloudCommodoreManager extends BukkitPluginRegistrationHandler { } @Override - protected void registerExternal(@NonNull final String label, - @NonNull final Command command, - @NonNull final BukkitCommand bukkitCommand) { + protected void registerExternal(final @NonNull String label, + final @NonNull Command command, + final @NonNull BukkitCommand bukkitCommand) { final com.mojang.brigadier.Command cmd = o -> 1; final LiteralCommandNode literalCommandNode = this.brigadierManager .createLiteralCommandNode(label, command, (o, p) -> true, cmd); diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java index 22a4ba68..48805b04 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java @@ -45,9 +45,9 @@ import java.util.stream.Collectors; public class MaterialArgument extends CommandArgument { protected MaterialArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new MaterialParser<>(), defaultValue, Material.class, suggestionsProvider); } @@ -59,7 +59,7 @@ public class MaterialArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static MaterialArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static MaterialArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new MaterialArgument.Builder<>(name); } @@ -70,7 +70,7 @@ public class MaterialArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return MaterialArgument.newBuilder(name).asRequired().build(); } @@ -81,7 +81,7 @@ public class MaterialArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return MaterialArgument.newBuilder(name).asOptional().build(); } @@ -93,14 +93,14 @@ public class MaterialArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final Material material) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull Material material) { return MaterialArgument.newBuilder(name).asOptionalWithDefault(material.name().toLowerCase()).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Material.class, name); } @@ -110,8 +110,8 @@ public class MaterialArgument extends CommandArgument { public static final class MaterialParser implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -138,7 +138,7 @@ public class MaterialArgument extends CommandArgument { * * @param input Input */ - public MaterialParseException(@NonNull final String input) { + public MaterialParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java index ba608ca1..a1d0386e 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java @@ -50,9 +50,9 @@ import java.util.function.BiFunction; public final class OfflinePlayerArgument extends CommandArgument { private OfflinePlayerArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new OfflinePlayerParser<>(), defaultValue, OfflinePlayer.class, suggestionsProvider); } @@ -64,7 +64,7 @@ public final class OfflinePlayerArgument extends CommandArgument Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -75,7 +75,7 @@ public final class OfflinePlayerArgument extends CommandArgument Command sender type * @return Created component */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return OfflinePlayerArgument.newBuilder(name).asRequired().build(); } @@ -86,7 +86,7 @@ public final class OfflinePlayerArgument extends CommandArgument Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return OfflinePlayerArgument.newBuilder(name).asOptional().build(); } @@ -98,15 +98,15 @@ public final class OfflinePlayerArgument extends CommandArgument Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultPlayer) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultPlayer) { return OfflinePlayerArgument.newBuilder(name).asOptionalWithDefault(defaultPlayer).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(OfflinePlayer.class, name); } @@ -127,8 +127,8 @@ public final class OfflinePlayerArgument extends CommandArgument implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -146,8 +146,8 @@ public final class OfflinePlayerArgument extends CommandArgument suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { List output = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { @@ -171,7 +171,7 @@ public final class OfflinePlayerArgument extends CommandArgument extends CommandArgument { private PlayerArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new PlayerParser<>(), defaultValue, Player.class, suggestionsProvider); } @@ -60,7 +60,7 @@ public final class PlayerArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static @NonNull Builder newBuilder(@NonNull final String name) { + public static @NonNull Builder newBuilder(final @NonNull String name) { return new Builder<>(name); } @@ -71,7 +71,7 @@ public final class PlayerArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return PlayerArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class PlayerArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return PlayerArgument.newBuilder(name).asOptional().build(); } @@ -94,15 +94,15 @@ public final class PlayerArgument extends CommandArgument { * @param Command sender type * @return Created component */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultPlayer) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultPlayer) { return PlayerArgument.newBuilder(name).asOptionalWithDefault(defaultPlayer).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(Player.class, name); } @@ -122,8 +122,8 @@ public final class PlayerArgument extends CommandArgument { public static final class PlayerParser implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -141,8 +141,8 @@ public final class PlayerArgument extends CommandArgument { } @Override - public @NonNull List<@NonNull String> suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { List output = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { @@ -166,7 +166,7 @@ public final class PlayerArgument extends CommandArgument { * * @param input String input */ - public PlayerParseException(@NonNull final String input) { + public PlayerParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java index 6a98df7c..948600bb 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java @@ -45,9 +45,9 @@ import java.util.stream.Collectors; public class WorldArgument extends CommandArgument { protected WorldArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction, String, List> suggestionsProvider) { + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction, String, List> suggestionsProvider) { super(required, name, new WorldParser<>(), defaultValue, World.class, suggestionsProvider); } @@ -58,7 +58,7 @@ public class WorldArgument extends CommandArgument { * @param Command sender type * @return Created builder */ - public static CommandArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static CommandArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new WorldArgument.Builder<>(name); } @@ -69,7 +69,7 @@ public class WorldArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return WorldArgument.newBuilder(name).asRequired().build(); } @@ -80,7 +80,7 @@ public class WorldArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return WorldArgument.newBuilder(name).asOptional().build(); } @@ -92,15 +92,15 @@ public class WorldArgument extends CommandArgument { * @param Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultValue) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultValue) { return WorldArgument.newBuilder(name).asOptionalWithDefault(defaultValue).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(World.class, name); } @@ -114,8 +114,8 @@ public class WorldArgument extends CommandArgument { public static final class WorldParser implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -131,7 +131,7 @@ public class WorldArgument extends CommandArgument { } @Override - public @NonNull List suggestions(@NonNull final CommandContext commandContext, @NonNull final String input) { + public @NonNull List suggestions(final @NonNull CommandContext commandContext, final @NonNull String input) { return Bukkit.getWorlds().stream().map(World::getName).collect(Collectors.toList()); } @@ -147,7 +147,7 @@ public class WorldArgument extends CommandArgument { * * @param input Input */ - public WorldParseException(@NonNull final String input) { + public WorldParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java index 2bcc80a9..0faedf52 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java @@ -42,9 +42,9 @@ import java.util.function.BiFunction; public final class MultipleEntitySelectorArgument extends CommandArgument { private MultipleEntitySelectorArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new MultipleEntitySelectorParser<>(), defaultValue, MultipleEntitySelector.class, suggestionsProvider); @@ -57,7 +57,7 @@ public final class MultipleEntitySelectorArgument extends CommandArgument Command sender type * @return Created builder */ - public static MultipleEntitySelectorArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static MultipleEntitySelectorArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new MultipleEntitySelectorArgument.Builder<>(name); } @@ -68,7 +68,7 @@ public final class MultipleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return MultipleEntitySelectorArgument.newBuilder(name).asRequired().build(); } @@ -79,7 +79,7 @@ public final class MultipleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return MultipleEntitySelectorArgument.newBuilder(name).asOptional().build(); } @@ -91,15 +91,15 @@ public final class MultipleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultEntitySelector) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultEntitySelector) { return MultipleEntitySelectorArgument.newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(MultipleEntitySelector.class, name); } @@ -120,8 +120,8 @@ public final class MultipleEntitySelectorArgument extends CommandArgument implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { if (!commandContext.>get("CloudBukkitCapabilities").contains( CloudBukkitCapabilities.BRIGADIER)) { return ArgumentParseResult.failure( diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java index 2568ecc0..b76b7f95 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java @@ -46,9 +46,9 @@ import java.util.function.BiFunction; public final class MultiplePlayerSelectorArgument extends CommandArgument { private MultiplePlayerSelectorArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new MultiplePlayerSelectorParser<>(), defaultValue, MultiplePlayerSelector.class, suggestionsProvider); @@ -61,7 +61,7 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument Command sender type * @return Created builder */ - public static MultiplePlayerSelectorArgument.Builder newBuilder(@NonNull final String name) { + public static MultiplePlayerSelectorArgument.Builder newBuilder(final @NonNull String name) { return new MultiplePlayerSelectorArgument.Builder<>(name); } @@ -72,7 +72,7 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return MultiplePlayerSelectorArgument.newBuilder(name).asRequired().build(); } @@ -83,7 +83,7 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return MultiplePlayerSelectorArgument.newBuilder(name).asOptional().build(); } @@ -95,15 +95,15 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultEntitySelector) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultEntitySelector) { return MultiplePlayerSelectorArgument.newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(MultiplePlayerSelector.class, name); } @@ -124,8 +124,8 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -159,8 +159,8 @@ public final class MultiplePlayerSelectorArgument extends CommandArgument suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { List output = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java index 582fce1c..7f92c92c 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SelectorParseException.java @@ -37,7 +37,7 @@ public final class SelectorParseException extends IllegalArgumentException { * * @param input String input */ - public SelectorParseException(@NonNull final String input) { + public SelectorParseException(final @NonNull String input) { this.input = input; } diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java index 844752f6..78e13992 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java @@ -42,9 +42,9 @@ import java.util.function.BiFunction; public final class SingleEntitySelectorArgument extends CommandArgument { private SingleEntitySelectorArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new SingleEntitySelectorParser<>(), defaultValue, SingleEntitySelector.class, suggestionsProvider); } @@ -56,7 +56,7 @@ public final class SingleEntitySelectorArgument extends CommandArgument Command sender type * @return Created builder */ - public static SingleEntitySelectorArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static SingleEntitySelectorArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new SingleEntitySelectorArgument.Builder<>(name); } @@ -67,7 +67,7 @@ public final class SingleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return SingleEntitySelectorArgument.newBuilder(name).asRequired().build(); } @@ -78,7 +78,7 @@ public final class SingleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return SingleEntitySelectorArgument.newBuilder(name).asOptional().build(); } @@ -90,15 +90,15 @@ public final class SingleEntitySelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultEntitySelector) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultEntitySelector) { return SingleEntitySelectorArgument.newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(SingleEntitySelector.class, name); } @@ -119,8 +119,8 @@ public final class SingleEntitySelectorArgument extends CommandArgument implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { if (!((Set) commandContext.get("CloudBukkitCapabilities")).contains( CloudBukkitCapabilities.BRIGADIER)) { return ArgumentParseResult.failure( diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java index abe59c7a..cacdf5f0 100644 --- a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java +++ b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java @@ -46,9 +46,9 @@ import java.util.function.BiFunction; public final class SinglePlayerSelectorArgument extends CommandArgument { private SinglePlayerSelectorArgument(final boolean required, - @NonNull final String name, - @NonNull final String defaultValue, - @Nullable final BiFunction<@NonNull CommandContext, @NonNull String, + final @NonNull String name, + final @NonNull String defaultValue, + final @Nullable BiFunction<@NonNull CommandContext, @NonNull String, @NonNull List<@NonNull String>> suggestionsProvider) { super(required, name, new SinglePlayerSelectorParser<>(), defaultValue, SinglePlayerSelector.class, suggestionsProvider); } @@ -60,7 +60,7 @@ public final class SinglePlayerSelectorArgument extends CommandArgument Command sender type * @return Created builder */ - public static SinglePlayerSelectorArgument.@NonNull Builder newBuilder(@NonNull final String name) { + public static SinglePlayerSelectorArgument.@NonNull Builder newBuilder(final @NonNull String name) { return new SinglePlayerSelectorArgument.Builder<>(name); } @@ -71,7 +71,7 @@ public final class SinglePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument of(@NonNull final String name) { + public static @NonNull CommandArgument of(final @NonNull String name) { return SinglePlayerSelectorArgument.newBuilder(name).asRequired().build(); } @@ -82,7 +82,7 @@ public final class SinglePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name) { + public static @NonNull CommandArgument optional(final @NonNull String name) { return SinglePlayerSelectorArgument.newBuilder(name).asOptional().build(); } @@ -94,15 +94,15 @@ public final class SinglePlayerSelectorArgument extends CommandArgument Command sender type * @return Created argument */ - public static @NonNull CommandArgument optional(@NonNull final String name, - @NonNull final String defaultEntitySelector) { + public static @NonNull CommandArgument optional(final @NonNull String name, + final @NonNull String defaultEntitySelector) { return SinglePlayerSelectorArgument.newBuilder(name).asOptionalWithDefault(defaultEntitySelector).build(); } public static final class Builder extends CommandArgument.Builder { - protected Builder(@NonNull final String name) { + protected Builder(final @NonNull String name) { super(SinglePlayerSelector.class, name); } @@ -123,8 +123,8 @@ public final class SinglePlayerSelectorArgument extends CommandArgument implements ArgumentParser { @Override - public @NonNull ArgumentParseResult parse(@NonNull final CommandContext commandContext, - @NonNull final Queue<@NonNull String> inputQueue) { + public @NonNull ArgumentParseResult parse(final @NonNull CommandContext commandContext, + final @NonNull Queue<@NonNull String> inputQueue) { final String input = inputQueue.peek(); if (input == null) { return ArgumentParseResult.failure(new NullPointerException("No input was provided")); @@ -163,8 +163,8 @@ public final class SinglePlayerSelectorArgument extends CommandArgument suggestions(@NonNull final CommandContext commandContext, - @NonNull final String input) { + public @NonNull List<@NonNull String> suggestions(final @NonNull CommandContext commandContext, + final @NonNull String input) { List output = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java index e49ef1fa..c7040021 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommand.java @@ -52,8 +52,8 @@ public final class BungeeCommand extends Command implements TabExecutor { @SuppressWarnings("unchecked") BungeeCommand(final cloud.commandframework.@NonNull Command cloudCommand, - @NonNull final CommandArgument command, - @NonNull final BungeeCommandManager manager) { + final @NonNull CommandArgument command, + final @NonNull BungeeCommandManager manager) { super(command.getName(), cloudCommand.getCommandPermission().toString(), ((StaticArgument) command).getAlternativeAliases().toArray(new String[0])); diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java index ac701d0d..ef6d13d5 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeeCommandManager.java @@ -48,11 +48,11 @@ public class BungeeCommandManager extends CommandManager { * @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender} * @throws Exception If the construction of the manager fails */ - public BungeeCommandManager(@NonNull final Plugin owningPlugin, - @NonNull final Function<@NonNull CommandTree, + public BungeeCommandManager(final @NonNull Plugin owningPlugin, + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, - @NonNull final Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, - @NonNull final Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) + final @NonNull Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, + final @NonNull Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) throws Exception { super(commandExecutionCoordinator, new BungeePluginRegistrationHandler<>()); ((BungeePluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); @@ -62,8 +62,8 @@ public class BungeeCommandManager extends CommandManager { } @Override - public final boolean hasPermission(@NonNull final C sender, - @NonNull final String permission) { + public final boolean hasPermission(final @NonNull C sender, + final @NonNull String permission) { if (permission.isEmpty()) { return true; } diff --git a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java index b3c6d244..80288c05 100644 --- a/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-bungee/src/main/java/cloud/commandframework/bungee/BungeePluginRegistrationHandler.java @@ -40,12 +40,12 @@ final class BungeePluginRegistrationHandler implements CommandRegistrationHan BungeePluginRegistrationHandler() { } - void initialize(@NonNull final BungeeCommandManager bungeeCommandManager) { + void initialize(final @NonNull BungeeCommandManager bungeeCommandManager) { this.bungeeCommandManager = bungeeCommandManager; } @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-minecraft/cloud-cloudburst-test/src/main/java/cloud/commandframework/cloudburst/CloudCloudburstTest.java b/cloud-minecraft/cloud-cloudburst-test/src/main/java/cloud/commandframework/cloudburst/CloudCloudburstTest.java index b812bd09..d71eb9a9 100644 --- a/cloud-minecraft/cloud-cloudburst-test/src/main/java/cloud/commandframework/cloudburst/CloudCloudburstTest.java +++ b/cloud-minecraft/cloud-cloudburst-test/src/main/java/cloud/commandframework/cloudburst/CloudCloudburstTest.java @@ -62,7 +62,7 @@ public final class CloudCloudburstTest extends PluginBase { @CommandMethod("test [str]") private void testCommand(@NonNull @Argument(value = "str", defaultValue = "potato") final String string, - @NonNull final CommandSender source, + final @NonNull CommandSender source, @Argument("num") @Range(min = "10", max = "33") final int num) { source.sendMessage(TextFormat.RED + "You said: " + TextFormat.GOLD + string diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java index 218f8786..e815dab2 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommand.java @@ -50,11 +50,11 @@ final class CloudburstCommand extends PluginCommand { private final CloudburstCommandManager manager; private final Command cloudCommand; - CloudburstCommand(@NonNull final String label, - @NonNull final List<@NonNull String> aliases, - @NonNull final Command cloudCommand, - @NonNull final CommandArgument command, - @NonNull final CloudburstCommandManager manager) { + CloudburstCommand(final @NonNull String label, + final @NonNull List<@NonNull String> aliases, + final @NonNull Command cloudCommand, + final @NonNull CommandArgument command, + final @NonNull CloudburstCommandManager manager) { super(manager.getOwningPlugin(), CommandData.builder(label) .addAliases(aliases.toArray(new String[0])) .addPermission(cloudCommand.getCommandPermission().toString()) diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java index b7fce105..dbde484d 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstCommandManager.java @@ -54,11 +54,11 @@ public class CloudburstCommandManager extends CommandManager { * @param commandSenderMapper Function that maps {@link CommandSender} to the command sender type * @param backwardsCommandSenderMapper Function that maps the command sender type to {@link CommandSender} */ - public CloudburstCommandManager(@NonNull final Plugin owningPlugin, - @NonNull final Function<@NonNull CommandTree, + public CloudburstCommandManager(final @NonNull Plugin owningPlugin, + final @NonNull Function<@NonNull CommandTree, @NonNull CommandExecutionCoordinator> commandExecutionCoordinator, - @NonNull final Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, - @NonNull final Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) { + final @NonNull Function<@NonNull CommandSender, @NonNull C> commandSenderMapper, + final @NonNull Function<@NonNull C, @NonNull CommandSender> backwardsCommandSenderMapper) { super(commandExecutionCoordinator, new CloudburstPluginRegistrationHandler<>()); ((CloudburstPluginRegistrationHandler) this.getCommandRegistrationHandler()).initialize(this); this.commandSenderMapper = commandSenderMapper; @@ -67,8 +67,8 @@ public class CloudburstCommandManager extends CommandManager { } @Override - public final boolean hasPermission(@NonNull final C sender, - @NonNull final String permission) { + public final boolean hasPermission(final @NonNull C sender, + final @NonNull String permission) { return this.backwardsCommandSenderMapper.apply(sender).hasPermission(permission); } diff --git a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java index 534c1f3c..30ff8e46 100644 --- a/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java +++ b/cloud-minecraft/cloud-cloudburst/src/main/java/cloud/commandframework/cloudburst/CloudburstPluginRegistrationHandler.java @@ -43,12 +43,12 @@ class CloudburstPluginRegistrationHandler implements CommandRegistrationHandl CloudburstPluginRegistrationHandler() { } - void initialize(@NonNull final CloudburstCommandManager cloudburstCommandManager) { + void initialize(final @NonNull CloudburstCommandManager cloudburstCommandManager) { this.cloudburstCommandManager = cloudburstCommandManager; } @Override - public final boolean registerCommand(@NonNull final Command command) { + public final 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-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/MinecraftHelp.java b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/MinecraftHelp.java index e9028581..2f5d4f42 100644 --- a/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/MinecraftHelp.java +++ b/cloud-minecraft/cloud-minecraft-extras/src/main/java/cloud/commandframework/MinecraftHelp.java @@ -73,9 +73,9 @@ public final class MinecraftHelp { * @param audienceProvider Provider that maps the command sender type to {@link Audience} * @param commandManager Command manager instance */ - public MinecraftHelp(@NonNull final String commandPrefix, - @NonNull final AudienceProvider audienceProvider, - @NonNull final CommandManager commandManager) { + public MinecraftHelp(final @NonNull String commandPrefix, + final @NonNull AudienceProvider audienceProvider, + final @NonNull CommandManager commandManager) { this.commandPrefix = commandPrefix; this.audienceProvider = audienceProvider; this.commandManager = commandManager; @@ -128,7 +128,7 @@ public final class MinecraftHelp { * @param sender Sender to map * @return Mapped audience */ - public @NonNull Audience getAudience(@NonNull final C sender) { + public @NonNull Audience getAudience(final @NonNull C sender) { return this.audienceProvider.apply(sender); } @@ -138,8 +138,8 @@ public final class MinecraftHelp { * @param key Message key * @param message Message */ - public void setMessage(@NonNull final String key, - @NonNull final String message) { + public void setMessage(final @NonNull String key, + final @NonNull String message) { this.messageMap.put(key, message); } @@ -149,16 +149,16 @@ public final class MinecraftHelp { * @param query Command query (without leading '/') * @param recipient Recipient */ - public void queryCommands(@NonNull final String query, - @NonNull final C recipient) { + public void queryCommands(final @NonNull String query, + final @NonNull C recipient) { final Audience audience = this.getAudience(recipient); audience.sendMessage(this.miniMessage.parse(this.messageMap.get(MESSAGE_HELP_HEADER))); this.printTopic(recipient, query, this.commandManager.getCommandHelpHandler().queryHelp(query)); audience.sendMessage(this.miniMessage.parse(this.messageMap.get(MESSAGE_HELP_FOOTER))); } - private void printTopic(@NonNull final C sender, - @NonNull final String query, + private void printTopic(final @NonNull C sender, + final @NonNull String query, final CommandHelpHandler.@NonNull HelpTopic helpTopic) { this.getAudience(sender).sendMessage(this.miniMessage.parse(this.messageMap.get(MESSAGE_QUERY_QUERY), Template.of("query", query))); @@ -173,7 +173,7 @@ public final class MinecraftHelp { } } - private void printIndexHelpTopic(@NonNull final C sender, + private void printIndexHelpTopic(final @NonNull C sender, final CommandHelpHandler.@NonNull IndexHelpTopic helpTopic) { final Audience audience = this.getAudience(sender); audience.sendMessage(this.miniMessage.parse(this.messageMap.get(MESSAGE_QUERY_AVAILABLE_COMMANDS))); @@ -201,7 +201,7 @@ public final class MinecraftHelp { } } - private void printMultiHelpTopic(@NonNull final C sender, + private void printMultiHelpTopic(final @NonNull C sender, final CommandHelpHandler.@NonNull MultiHelpTopic helpTopic) { final Audience audience = this.getAudience(sender); audience.sendMessage(this.miniMessage.parse(this.messageMap.get(MESSAGE_QUERY_LONGEST_PATH), @@ -236,7 +236,7 @@ public final class MinecraftHelp { } } - private void printVerboseHelpTopic(@NonNull final C sender, + private void printVerboseHelpTopic(final @NonNull C sender, final CommandHelpHandler.@NonNull VerboseHelpTopic helpTopic) { final Audience audience = this.getAudience(sender); final String command = this.commandManager.getCommandSyntaxFormatter() diff --git a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java index 36744ce5..6933fc6d 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/AnnotatedMethodService.java @@ -40,8 +40,8 @@ class AnnotatedMethodService implements Service implements Service, TypeToken>> lookupServices( - @NonNull final Object instance) throws Exception { + final @NonNull Object instance) throws Exception { final Map, TypeToken>> map = new HashMap<>(); final Class clazz = instance.getClass(); for (final Method method : clazz.getDeclaredMethods()) { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java b/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java index 590c5118..ea7811e7 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ChunkedRequestContext.java @@ -50,7 +50,7 @@ public abstract class ChunkedRequestContext<@NonNull Context, @NonNull Result> { * * @param requests Request contexts */ - protected ChunkedRequestContext(@NonNull final Collection requests) { + protected ChunkedRequestContext(final @NonNull Collection requests) { this.requests = new ArrayList<>(requests); this.results = new HashMap<>(requests.size()); } @@ -83,7 +83,7 @@ public abstract class ChunkedRequestContext<@NonNull Context, @NonNull Result> { * @param context Context * @param result Result */ - public final void storeResult(@NonNull final Context context, @NonNull final Result result) { + public final void storeResult(final @NonNull Context context, final @NonNull Result result) { synchronized (this.lock) { this.results.put(context, result); this.requests.remove(context); diff --git a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java index 320bebc2..2acdcdfd 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java @@ -37,7 +37,7 @@ public final class PipelineException extends RuntimeException { * * @param cause Cause of the exception */ - public PipelineException(@NonNull final Exception cause) { + public PipelineException(final @NonNull Exception cause) { super(cause); } @@ -47,7 +47,7 @@ public final class PipelineException extends RuntimeException { * @param message Message explaining the exception * @param cause Cause of the exception */ - public PipelineException(@NonNull final String message, @NonNull final Exception cause) { + public PipelineException(final @NonNull String message, final @NonNull Exception cause) { super(message, cause); } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java index ce8ba255..f40874de 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceFilterHandler.java @@ -32,8 +32,8 @@ enum ServiceFilterHandler { INSTANCE; boolean passes( - @NonNull final ServiceRepository.ServiceWrapper> service, - @NonNull final Context context) { + final @NonNull ServiceRepository.ServiceWrapper> service, + final @NonNull Context context) { if (!service.isDefaultImplementation()) { for (final Predicate predicate : service.getFilters()) { try { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java index 02254d9d..3053f6ed 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipeline.java @@ -46,7 +46,7 @@ public final class ServicePipeline { private final Map> repositories; private final Executor executor; - ServicePipeline(@NonNull final Executor executor) { + ServicePipeline(final @NonNull Executor executor) { this.repositories = new HashMap<>(); this.executor = executor; } @@ -72,8 +72,8 @@ public final class ServicePipeline { * @return ServicePipeline The service pipeline instance */ public @NonNull ServicePipeline registerServiceType( - @NonNull final TypeToken> type, - @NonNull final Service<@NonNull Context, @NonNull Result> defaultImplementation) { + final @NonNull TypeToken> type, + final @NonNull Service<@NonNull Context, @NonNull Result> defaultImplementation) { synchronized (this.lock) { if (repositories.containsKey(type.getType())) { throw new IllegalArgumentException(String @@ -106,7 +106,7 @@ public final class ServicePipeline { */ @SuppressWarnings("unchecked") public @NonNull ServicePipeline registerMethods( - @NonNull final T instance) throws Exception { + final @NonNull T instance) throws Exception { synchronized (this.lock) { final Map, TypeToken>> services = AnnotatedMethodServiceFactory.INSTANCE.lookupServices(instance); @@ -139,9 +139,9 @@ public final class ServicePipeline { * @return ServicePipeline The service pipeline instance */ public ServicePipeline registerServiceImplementation( - @NonNull final TypeToken> type, - @NonNull final Service implementation, - @NonNull final Collection> filters) { + final @NonNull TypeToken> type, + final @NonNull Service implementation, + final @NonNull Collection> filters) { synchronized (this.lock) { final ServiceRepository repository = getRepository(type); repository.registerImplementation(implementation, filters); @@ -163,9 +163,9 @@ public final class ServicePipeline { * @return ServicePipeline The service pipeline instance */ public ServicePipeline registerServiceImplementation( - @NonNull final Class> type, - @NonNull final Service implementation, - @NonNull final Collection> filters) { + final @NonNull Class> type, + final @NonNull Service implementation, + final @NonNull Collection> filters) { return registerServiceImplementation(TypeToken.get(type), implementation, filters); } @@ -178,14 +178,14 @@ public final class ServicePipeline { * @return Service pumper instance */ @NonNull - public ServicePump pump(@NonNull final Context context) { + public ServicePump pump(final @NonNull Context context) { return new ServicePump<>(this, context); } @SuppressWarnings("unchecked") @NonNull ServiceRepository getRepository( - @NonNull final TypeToken> type) { + final @NonNull TypeToken> type) { final ServiceRepository repository = (ServiceRepository) this.repositories.get(type.getType()); if (repository == null) { @@ -218,7 +218,7 @@ public final class ServicePipeline { @NonNull @SuppressWarnings("unchecked") public > Collection> getImplementations( - @NonNull final TypeToken type) { + final @NonNull TypeToken type) { ServiceRepository repository = getRepository(type); List> collection = new LinkedList<>(); final LinkedList.ServiceWrapper>> diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java index 2ee96546..c446aca1 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePipelineBuilder.java @@ -56,7 +56,7 @@ public final class ServicePipelineBuilder { * @param executor New executor * @return Builder instance */ - public @NonNull ServicePipelineBuilder withExecutor(@NonNull final Executor executor) { + public @NonNull ServicePipelineBuilder withExecutor(final @NonNull Executor executor) { this.executor = Objects.requireNonNull(executor, "Executor may not be null"); return this; } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java b/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java index 29c129f8..26e537f5 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServicePump.java @@ -37,8 +37,8 @@ public final class ServicePump { private final ServicePipeline servicePipeline; private final Context context; - ServicePump(@NonNull final ServicePipeline servicePipeline, - @NonNull final Context context) { + ServicePump(final @NonNull ServicePipeline servicePipeline, + final @NonNull Context context) { this.servicePipeline = servicePipeline; this.context = context; } @@ -51,7 +51,7 @@ public final class ServicePump { * @return Service spigot instance */ public @NonNull ServiceSpigot<@NonNull Context, @NonNull Result> through( - @NonNull final TypeToken> type) { + final @NonNull TypeToken> type) { return new ServiceSpigot<>(this.servicePipeline, this.context, type); } @@ -63,7 +63,7 @@ public final class ServicePump { * @return Service spigot instance */ public @NonNull ServiceSpigot<@NonNull Context, @NonNull Result> through( - @NonNull final Class> clazz) { + final @NonNull Class> clazz) { return this.through(TypeToken.get(clazz)); } diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java index b463bdb4..71cfebff 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceRepository.java @@ -54,7 +54,7 @@ public final class ServiceRepository { * * @param serviceType Service type */ - ServiceRepository(@NonNull final TypeToken> serviceType) { + ServiceRepository(final @NonNull TypeToken> serviceType) { this.serviceType = serviceType; this.implementations = new LinkedList<>(); } @@ -66,8 +66,8 @@ public final class ServiceRepository { * @param filters Filters that will be used to determine whether or not the service gets used * @param Type of the implementation */ - > void registerImplementation(@NonNull final T service, - @NonNull final Collection> filters) { + > void registerImplementation(final @NonNull T service, + final @NonNull Collection> filters) { synchronized (this.lock) { this.implementations.add(new ServiceWrapper<>(service, filters)); } @@ -101,8 +101,8 @@ public final class ServiceRepository { private final int registrationOrder = ServiceRepository.this.registrationOrder++; private final ExecutionOrder executionOrder; - private ServiceWrapper(@NonNull final T implementation, - @NonNull final Collection> filters) { + private ServiceWrapper(final @NonNull T implementation, + final @NonNull Collection> filters) { this.defaultImplementation = implementations.isEmpty(); this.implementation = implementation; this.filters = filters; @@ -140,7 +140,7 @@ public final class ServiceRepository { } @Override - public int compareTo(@NonNull final ServiceWrapper other) { + public int compareTo(final @NonNull ServiceWrapper other) { return Comparator.>comparingInt( wrapper -> wrapper.isDefaultImplementation() ? Integer.MIN_VALUE diff --git a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java index 3d1e6195..2a766184 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/ServiceSpigot.java @@ -45,9 +45,9 @@ public final class ServiceSpigot { private final ServicePipeline pipeline; private final ServiceRepository repository; - ServiceSpigot(@NonNull final ServicePipeline pipeline, - @NonNull final Context context, - @NonNull final TypeToken> type) { + ServiceSpigot(final @NonNull ServicePipeline pipeline, + final @NonNull Context context, + final @NonNull TypeToken> type) { this.context = context; this.pipeline = pipeline; this.repository = pipeline.getRepository(type); @@ -129,7 +129,7 @@ public final class ServiceSpigot { * default implementation * @throws IllegalStateException If a {@link SideEffectService} returns {@code null} */ - public void getResult(@NonNull final BiConsumer consumer) { + public void getResult(final @NonNull BiConsumer consumer) { try { consumer.accept(getResult(), null); } catch (final PipelineException pipelineException) { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java b/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java index e6577f86..59bb411e 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/ConsumerService.java @@ -50,7 +50,7 @@ public interface ConsumerService } @Override - default @NonNull State handle(@NonNull final Context context) { + default @NonNull State handle(final @NonNull Context context) { try { this.accept(context); } catch (final PipeBurst burst) { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java b/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java index 18772c4d..a3638767 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/types/PartialResultService.java @@ -41,7 +41,7 @@ public interface PartialResultService> { @Override - default @Nullable Map<@NonNull Context, @NonNull Result> handle(@NonNull final Chunked context) { + default @Nullable Map<@NonNull Context, @NonNull Result> handle(final @NonNull Chunked context) { if (!context.isCompleted()) { this.handleRequests(context.getRemaining()).forEach(context::storeResult); }