From d0be5986766290e38ded60c8af9e8e48a3442c0c Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Tue, 25 Jul 2017 16:07:03 +0200 Subject: [PATCH] Code cleanup --- .../mojang/brigadier/CommandDispatcher.java | 70 +++++++++---------- .../com/mojang/brigadier/ParseResults.java | 4 +- .../com/mojang/brigadier/StringReader.java | 8 +-- .../brigadier/arguments/ArgumentType.java | 4 +- .../brigadier/arguments/BoolArgumentType.java | 8 +-- .../arguments/IntegerArgumentType.java | 20 +++--- .../arguments/StringArgumentType.java | 17 ++--- .../brigadier/builder/ArgumentBuilder.java | 6 +- .../builder/LiteralArgumentBuilder.java | 8 +-- .../builder/RequiredArgumentBuilder.java | 8 +-- .../brigadier/context/CommandContext.java | 12 ++-- .../context/CommandContextBuilder.java | 12 ++-- .../brigadier/context/ParsedArgument.java | 6 +- .../exceptions/CommandException.java | 2 +- .../exceptions/CommandExceptionType.java | 1 + .../ParameterizedCommandExceptionType.java | 12 ++-- .../SimpleCommandExceptionType.java | 8 +-- .../brigadier/tree/ArgumentCommandNode.java | 16 ++--- .../mojang/brigadier/tree/CommandNode.java | 18 ++--- .../brigadier/tree/LiteralCommandNode.java | 11 ++- .../brigadier/tree/RootCommandNode.java | 6 +- .../CommandDispatcherCompletionsTest.java | 21 +++--- .../brigadier/CommandDispatcherTest.java | 26 +++---- .../CommandDispatcherUsagesTest.java | 28 ++++---- .../mojang/brigadier/StringReaderTest.java | 18 +++-- .../arguments/BoolArgumentTypeTest.java | 10 +-- .../arguments/IntegerArgumentTypeTest.java | 22 +++--- .../arguments/StringArgumentTypeTest.java | 8 +-- .../builder/ArgumentBuilderTest.java | 3 +- .../builder/LiteralArgumentBuilderTest.java | 6 +- .../builder/RequiredArgumentBuilderTest.java | 6 +- .../brigadier/context/CommandContextTest.java | 16 ++--- ...ParameterizedCommandExceptionTypeTest.java | 4 +- .../SimpleCommandExceptionTypeTest.java | 4 +- .../tree/AbstractCommandNodeTest.java | 11 +-- .../tree/ArgumentCommandNodeTest.java | 15 ++-- .../tree/LiteralCommandNodeTest.java | 14 ++-- .../brigadier/tree/RootCommandNodeTest.java | 4 +- 38 files changed, 221 insertions(+), 252 deletions(-) diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java index 3d11635..071aa18 100644 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java @@ -36,22 +36,22 @@ public class CommandDispatcher { private final RootCommandNode root = new RootCommandNode<>(); private final Predicate> hasCommand = new Predicate>() { @Override - public boolean test(CommandNode input) { + public boolean test(final CommandNode input) { return input != null && (input.getCommand() != null || input.getChildren().stream().anyMatch(hasCommand)); } }; - public void register(LiteralArgumentBuilder command) { + public void register(final LiteralArgumentBuilder command) { final LiteralCommandNode build = command.build(); root.addChild(build); } - public int execute(String input, S source) throws CommandException { + public int execute(final String input, final S source) throws CommandException { final ParseResults parse = parse(input, source); return execute(parse); } - public int execute(ParseResults parse) throws CommandException { + public int execute(final ParseResults parse) throws CommandException { if (parse.getRemaining().length() > 0) { if (parse.getExceptions().size() == 1) { throw parse.getExceptions().values().iterator().next(); @@ -61,32 +61,32 @@ public class CommandDispatcher { throw ERROR_UNKNOWN_ARGUMENT.create(parse.getRemaining()); } } - CommandContext context = parse.getContext().build(); - Command command = context.getCommand(); + final CommandContext context = parse.getContext().build(); + final Command command = context.getCommand(); if (command == null) { throw ERROR_UNKNOWN_COMMAND.create(); } return command.run(context); } - public ParseResults parse(String command, S source) throws CommandException { - StringReader reader = new StringReader(command); + public ParseResults parse(final String command, final S source) throws CommandException { + final StringReader reader = new StringReader(command); return parseNodes(root, reader, new CommandContextBuilder<>(this, source)); } - private ParseResults parseNodes(CommandNode node, StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { + private ParseResults parseNodes(final CommandNode node, final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { final S source = contextBuilder.getSource(); - Map, CommandException> errors = Maps.newHashMap(); + final Map, CommandException> errors = Maps.newHashMap(); - for (CommandNode child : node.getChildren()) { + for (final CommandNode child : node.getChildren()) { if (!child.canUse(source)) { continue; } - CommandContextBuilder context = contextBuilder.copy(); - int cursor = reader.getCursor(); + final CommandContextBuilder context = contextBuilder.copy(); + final int cursor = reader.getCursor(); try { child.parse(reader, context); - } catch (CommandException ex) { + } catch (final CommandException ex) { errors.put(child, ex); reader.setCursor(cursor); continue; @@ -107,13 +107,13 @@ public class CommandDispatcher { return new ParseResults<>(contextBuilder, reader.getRemaining(), errors); } - public String[] getAllUsage(CommandNode node, S source) { + public String[] getAllUsage(final CommandNode node, final S source) { final ArrayList result = Lists.newArrayList(); - getAllUsage(node, source, result, ""); + getAllUsage(node, source, result, ""); return result.toArray(new String[result.size()]); } - private void getAllUsage(CommandNode node, S source, ArrayList result, String prefix) { + private void getAllUsage(final CommandNode node, final S source, final ArrayList result, final String prefix) { if (!node.canUse(source)) { return; } @@ -129,12 +129,12 @@ public class CommandDispatcher { } } - public Map, String> getSmartUsage(CommandNode node, S source) { - Map, String> result = Maps.newLinkedHashMap(); + public Map, String> getSmartUsage(final CommandNode node, final S source) { + final Map, String> result = Maps.newLinkedHashMap(); final boolean optional = node.getCommand() != null; - for (CommandNode child : node.getChildren()) { - String usage = getSmartUsage(child, source, optional, false); + for (final CommandNode child : node.getChildren()) { + final String usage = getSmartUsage(child, source, optional, false); if (usage != null) { result.put(child, usage); } @@ -142,15 +142,15 @@ public class CommandDispatcher { return result; } - private String getSmartUsage(CommandNode node, S source, boolean optional, boolean deep) { + private String getSmartUsage(final CommandNode node, final S source, final boolean optional, final boolean deep) { if (!node.canUse(source)) { return null; } - String self = optional ? USAGE_OPTIONAL_OPEN + node.getUsageText() + USAGE_OPTIONAL_CLOSE : node.getUsageText(); - boolean childOptional = node.getCommand() != null; - String open = childOptional ? USAGE_OPTIONAL_OPEN : USAGE_REQUIRED_OPEN; - String close = childOptional ? USAGE_OPTIONAL_CLOSE : USAGE_REQUIRED_CLOSE; + final String self = optional ? USAGE_OPTIONAL_OPEN + node.getUsageText() + USAGE_OPTIONAL_CLOSE : node.getUsageText(); + final boolean childOptional = node.getCommand() != null; + final String open = childOptional ? USAGE_OPTIONAL_OPEN : USAGE_REQUIRED_OPEN; + final String close = childOptional ? USAGE_OPTIONAL_CLOSE : USAGE_REQUIRED_CLOSE; if (!deep) { final Collection> children = node.getChildren().stream().filter(c -> c.canUse(source)).collect(Collectors.toList()); @@ -160,7 +160,7 @@ public class CommandDispatcher { return self + ARGUMENT_SEPARATOR + usage; } } else if (children.size() > 1) { - Set childUsage = Sets.newLinkedHashSet(); + final Set childUsage = Sets.newLinkedHashSet(); for (final CommandNode child : children) { final String usage = getSmartUsage(child, source, childOptional, true); if (usage != null) { @@ -171,7 +171,7 @@ public class CommandDispatcher { final String usage = childUsage.iterator().next(); return self + ARGUMENT_SEPARATOR + (childOptional ? USAGE_OPTIONAL_OPEN + usage + USAGE_OPTIONAL_CLOSE : usage); } else if (childUsage.size() > 1) { - StringBuilder builder = new StringBuilder(open); + final StringBuilder builder = new StringBuilder(open); int count = 0; for (final CommandNode child : children) { if (count > 0) { @@ -191,14 +191,14 @@ public class CommandDispatcher { return self; } - private Set findSuggestions(CommandNode node, StringReader reader, CommandContextBuilder contextBuilder, Set result) { + private Set findSuggestions(final CommandNode node, final StringReader reader, final CommandContextBuilder contextBuilder, final Set result) { final S source = contextBuilder.getSource(); - for (CommandNode child : node.getChildren()) { + for (final CommandNode child : node.getChildren()) { if (!child.canUse(source)) { continue; } - CommandContextBuilder context = contextBuilder.copy(); - int cursor = reader.getCursor(); + final CommandContextBuilder context = contextBuilder.copy(); + final int cursor = reader.getCursor(); try { child.parse(reader, context); if (reader.canRead()) { @@ -210,7 +210,7 @@ public class CommandDispatcher { reader.setCursor(cursor); child.listSuggestions(reader.getRemaining(), result, context); } - } catch (CommandException e) { + } catch (final CommandException e) { reader.setCursor(cursor); child.listSuggestions(reader.getRemaining(), result, context); } @@ -219,8 +219,8 @@ public class CommandDispatcher { return result; } - public String[] getCompletionSuggestions(String command, S source) { - StringReader reader = new StringReader(command); + public String[] getCompletionSuggestions(final String command, final S source) { + final StringReader reader = new StringReader(command); final Set nodes = findSuggestions(root, reader, new CommandContextBuilder<>(this, source), Sets.newLinkedHashSet()); return nodes.toArray(new String[nodes.size()]); diff --git a/src/main/java/com/mojang/brigadier/ParseResults.java b/src/main/java/com/mojang/brigadier/ParseResults.java index a5a446e..b761676 100644 --- a/src/main/java/com/mojang/brigadier/ParseResults.java +++ b/src/main/java/com/mojang/brigadier/ParseResults.java @@ -12,13 +12,13 @@ public class ParseResults { private final String remaining; private final Map, CommandException> exceptions; - public ParseResults(CommandContextBuilder context, String remaining, Map, CommandException> exceptions) { + public ParseResults(final CommandContextBuilder context, final String remaining, final Map, CommandException> exceptions) { this.context = context; this.remaining = remaining; this.exceptions = exceptions; } - public ParseResults(CommandContextBuilder context) { + public ParseResults(final CommandContextBuilder context) { this(context, "", Collections.emptyMap()); } diff --git a/src/main/java/com/mojang/brigadier/StringReader.java b/src/main/java/com/mojang/brigadier/StringReader.java index e85e617..7a5f898 100644 --- a/src/main/java/com/mojang/brigadier/StringReader.java +++ b/src/main/java/com/mojang/brigadier/StringReader.java @@ -20,7 +20,7 @@ public class StringReader { private final String string; private int cursor; - public StringReader(String string) { + public StringReader(final String string) { this.string = string; } @@ -28,7 +28,7 @@ public class StringReader { return string; } - public void setCursor(int cursor) { + public void setCursor(final int cursor) { this.cursor = cursor; } @@ -116,7 +116,7 @@ public class StringReader { || c == '.' || c == '+'; } - public String readUnquotedString() throws CommandException { + public String readUnquotedString() { final int start = cursor; while (canRead() && isAllowedInUnquotedString(peek())) { skip(); @@ -163,7 +163,7 @@ public class StringReader { } public boolean readBoolean() throws CommandException { - String value = readString(); + final String value = readString(); if (value.equals("true")) { return true; } else if (value.equals("false")) { diff --git a/src/main/java/com/mojang/brigadier/arguments/ArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/ArgumentType.java index c9fe5f3..f3f9903 100644 --- a/src/main/java/com/mojang/brigadier/arguments/ArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/ArgumentType.java @@ -2,7 +2,6 @@ package com.mojang.brigadier.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.context.ParsedArgument; import com.mojang.brigadier.exceptions.CommandException; import java.util.Set; @@ -10,7 +9,8 @@ import java.util.Set; public interface ArgumentType { T parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException; - default void listSuggestions(String command, Set output, CommandContextBuilder contextBuilder) {} + default void listSuggestions(final String command, final Set output, final CommandContextBuilder contextBuilder) { + } default String getUsageSuffix() { return null; diff --git a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java index 2cb0fa9..a8ab2aa 100644 --- a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java @@ -1,16 +1,12 @@ package com.mojang.brigadier.arguments; -import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.context.ParsedArgument; import com.mojang.brigadier.exceptions.CommandException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; public class BoolArgumentType implements ArgumentType { - public static final SimpleCommandExceptionType ERROR_INVALID = new SimpleCommandExceptionType("argument.bool.invalid", "Value must be true or false"); - private BoolArgumentType() { } @@ -18,12 +14,12 @@ public class BoolArgumentType implements ArgumentType { return new BoolArgumentType(); } - public static boolean getBool(CommandContext context, String name) { + public static boolean getBool(final CommandContext context, final String name) { return context.getArgument(name, Boolean.class); } @Override - public Boolean parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { + public Boolean parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { return reader.readBoolean(); } diff --git a/src/main/java/com/mojang/brigadier/arguments/IntegerArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/IntegerArgumentType.java index fc013cc..5df435b 100644 --- a/src/main/java/com/mojang/brigadier/arguments/IntegerArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/IntegerArgumentType.java @@ -1,10 +1,8 @@ package com.mojang.brigadier.arguments; -import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.context.ParsedArgument; import com.mojang.brigadier.exceptions.CommandException; import com.mojang.brigadier.exceptions.ParameterizedCommandExceptionType; @@ -19,7 +17,7 @@ public class IntegerArgumentType implements ArgumentType { private final int maximum; private final String suffix; - private IntegerArgumentType(int minimum, int maximum, String suffix) { + private IntegerArgumentType(final int minimum, final int maximum, final String suffix) { this.minimum = minimum; this.maximum = maximum; this.suffix = suffix; @@ -29,25 +27,25 @@ public class IntegerArgumentType implements ArgumentType { return integer(Integer.MIN_VALUE); } - public static IntegerArgumentType integer(int min) { + public static IntegerArgumentType integer(final int min) { return integer(min, Integer.MAX_VALUE); } - public static IntegerArgumentType integer(int min, int max) { + public static IntegerArgumentType integer(final int min, final int max) { return integer(min, max, ""); } - public static IntegerArgumentType integer(int min, int max, String suffix) { + public static IntegerArgumentType integer(final int min, final int max, final String suffix) { return new IntegerArgumentType(min, max, suffix); } - public static int getInteger(CommandContext context, String name) { + public static int getInteger(final CommandContext context, final String name) { return context.getArgument(name, int.class); } @Override - public Integer parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { - int result = reader.readInt(); + public Integer parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { + final int result = reader.readInt(); for (int i = 0; i < suffix.length(); i++) { if (reader.canRead() && reader.peek() == suffix.charAt(i)) { reader.skip(); @@ -65,11 +63,11 @@ public class IntegerArgumentType implements ArgumentType { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof IntegerArgumentType)) return false; - IntegerArgumentType that = (IntegerArgumentType) o; + final IntegerArgumentType that = (IntegerArgumentType) o; return maximum == that.maximum && minimum == that.minimum && Objects.equals(suffix, that.suffix); } diff --git a/src/main/java/com/mojang/brigadier/arguments/StringArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/StringArgumentType.java index 25fd7b4..ab7db02 100644 --- a/src/main/java/com/mojang/brigadier/arguments/StringArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/StringArgumentType.java @@ -4,15 +4,12 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.context.ParsedArgument; import com.mojang.brigadier.exceptions.CommandException; -import com.mojang.brigadier.exceptions.ParameterizedCommandExceptionType; -import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; public class StringArgumentType implements ArgumentType { private final StringType type; - private StringArgumentType(StringType type) { + private StringArgumentType(final StringType type) { this.type = type; } @@ -28,14 +25,14 @@ public class StringArgumentType implements ArgumentType { return new StringArgumentType(StringType.GREEDY_PHRASE); } - public static String getString(CommandContext context, String name) { + public static String getString(final CommandContext context, final String name) { return context.getArgument(name, String.class); } @Override - public String parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { + public String parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { if (type == StringType.GREEDY_PHRASE) { - String text = reader.getRemaining(); + final String text = reader.getRemaining(); reader.setCursor(reader.getTotalLength()); return text; } else if (type == StringType.SINGLE_WORD) { @@ -50,15 +47,15 @@ public class StringArgumentType implements ArgumentType { return "string()"; } - public static String escapeIfRequired(String input) { + public static String escapeIfRequired(final String input) { if (input.contains("\\") || input.contains("\"") || input.contains(CommandDispatcher.ARGUMENT_SEPARATOR)) { return escape(input); } return input; } - private static String escape(String input) { - StringBuilder result = new StringBuilder("\""); + private static String escape(final String input) { + final StringBuilder result = new StringBuilder("\""); for (int i = 0; i < input.length(); i++) { final char c = input.charAt(i); diff --git a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java b/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java index 4313ee8..152727a 100644 --- a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java +++ b/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java @@ -14,7 +14,7 @@ public abstract class ArgumentBuilder> { protected abstract T getThis(); - public T then(ArgumentBuilder argument) { + public T then(final ArgumentBuilder argument) { arguments.addChild(argument.build()); return getThis(); } @@ -23,7 +23,7 @@ public abstract class ArgumentBuilder> { return arguments.getChildren(); } - public T executes(Command command) { + public T executes(final Command command) { this.command = command; return getThis(); } @@ -32,7 +32,7 @@ public abstract class ArgumentBuilder> { return command; } - public T requires(Predicate requirement) { + public T requires(final Predicate requirement) { this.requirement = requirement; return getThis(); } diff --git a/src/main/java/com/mojang/brigadier/builder/LiteralArgumentBuilder.java b/src/main/java/com/mojang/brigadier/builder/LiteralArgumentBuilder.java index 5fce01d..90a7c27 100644 --- a/src/main/java/com/mojang/brigadier/builder/LiteralArgumentBuilder.java +++ b/src/main/java/com/mojang/brigadier/builder/LiteralArgumentBuilder.java @@ -6,11 +6,11 @@ import com.mojang.brigadier.tree.LiteralCommandNode; public class LiteralArgumentBuilder extends ArgumentBuilder> { private final String literal; - protected LiteralArgumentBuilder(String literal) { + protected LiteralArgumentBuilder(final String literal) { this.literal = literal; } - public static LiteralArgumentBuilder literal(String name) { + public static LiteralArgumentBuilder literal(final String name) { return new LiteralArgumentBuilder<>(name); } @@ -25,9 +25,9 @@ public class LiteralArgumentBuilder extends ArgumentBuilder build() { - LiteralCommandNode result = new LiteralCommandNode<>(getLiteral(), getCommand(), getRequirement()); + final LiteralCommandNode result = new LiteralCommandNode<>(getLiteral(), getCommand(), getRequirement()); - for (CommandNode argument : getArguments()) { + for (final CommandNode argument : getArguments()) { result.addChild(argument); } diff --git a/src/main/java/com/mojang/brigadier/builder/RequiredArgumentBuilder.java b/src/main/java/com/mojang/brigadier/builder/RequiredArgumentBuilder.java index c43bbfa..742764e 100644 --- a/src/main/java/com/mojang/brigadier/builder/RequiredArgumentBuilder.java +++ b/src/main/java/com/mojang/brigadier/builder/RequiredArgumentBuilder.java @@ -8,12 +8,12 @@ public class RequiredArgumentBuilder extends ArgumentBuilder type; - private RequiredArgumentBuilder(String name, ArgumentType type) { + private RequiredArgumentBuilder(final String name, final ArgumentType type) { this.name = name; this.type = type; } - public static RequiredArgumentBuilder argument(String name, ArgumentType type) { + public static RequiredArgumentBuilder argument(final String name, final ArgumentType type) { return new RequiredArgumentBuilder<>(name, type); } @@ -31,9 +31,9 @@ public class RequiredArgumentBuilder extends ArgumentBuilder build() { - ArgumentCommandNode result = new ArgumentCommandNode<>(getName(), getType(), getCommand(), getRequirement()); + final ArgumentCommandNode result = new ArgumentCommandNode<>(getName(), getType(), getCommand(), getRequirement()); - for (CommandNode argument : getArguments()) { + for (final CommandNode argument : getArguments()) { result.addChild(argument); } diff --git a/src/main/java/com/mojang/brigadier/context/CommandContext.java b/src/main/java/com/mojang/brigadier/context/CommandContext.java index 023b7ae..1773dc9 100644 --- a/src/main/java/com/mojang/brigadier/context/CommandContext.java +++ b/src/main/java/com/mojang/brigadier/context/CommandContext.java @@ -15,7 +15,7 @@ public class CommandContext { private final Map, String> nodes; private final String input; - public CommandContext(S source, Map> arguments, Command command, Map, String> nodes, String input) { + public CommandContext(final S source, final Map> arguments, final Command command, final Map, String> nodes, final String input) { this.source = source; this.arguments = arguments; this.command = command; @@ -32,8 +32,8 @@ public class CommandContext { } @SuppressWarnings("unchecked") - public V getArgument(String name, Class clazz) { - ParsedArgument argument = arguments.get(name); + public V getArgument(final String name, final Class clazz) { + final ParsedArgument argument = arguments.get(name); if (argument == null) { throw new IllegalArgumentException("No such argument '" + name + "' exists on this command"); @@ -48,11 +48,11 @@ public class CommandContext { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof CommandContext)) return false; - CommandContext that = (CommandContext) o; + final CommandContext that = (CommandContext) o; if (!arguments.equals(that.arguments)) return false; if (!Iterables.elementsEqual(nodes.entrySet(), that.nodes.entrySet())) return false; @@ -80,7 +80,7 @@ public class CommandContext { } public CommandContext copy() { - Map> arguments = Maps.newLinkedHashMap(); + final Map> arguments = Maps.newLinkedHashMap(); this.arguments.forEach((k, v) -> arguments.put(k, v.copy())); return new CommandContext<>(source, arguments, command, nodes, input); } diff --git a/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java b/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java index efc15d0..4b9cd7b 100644 --- a/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java +++ b/src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java @@ -15,12 +15,12 @@ public class CommandContextBuilder { private S source; private Command command; - public CommandContextBuilder(CommandDispatcher dispatcher, S source) { + public CommandContextBuilder(final CommandDispatcher dispatcher, final S source) { this.dispatcher = dispatcher; this.source = source; } - public CommandContextBuilder withSource(S source) { + public CommandContextBuilder withSource(final S source) { this.source = source; return this; } @@ -29,7 +29,7 @@ public class CommandContextBuilder { return source; } - public CommandContextBuilder withArgument(String name, ParsedArgument argument) { + public CommandContextBuilder withArgument(final String name, final ParsedArgument argument) { this.arguments.put(name, argument); return this; } @@ -38,12 +38,12 @@ public class CommandContextBuilder { return arguments; } - public CommandContextBuilder withCommand(Command command) { + public CommandContextBuilder withCommand(final Command command) { this.command = command; return this; } - public CommandContextBuilder withNode(CommandNode node, String raw) { + public CommandContextBuilder withNode(final CommandNode node, final String raw) { if (!nodes.isEmpty()) { input.append(CommandDispatcher.ARGUMENT_SEPARATOR); } @@ -53,7 +53,7 @@ public class CommandContextBuilder { } public CommandContextBuilder copy() { - CommandContextBuilder copy = new CommandContextBuilder<>(dispatcher, source); + final CommandContextBuilder copy = new CommandContextBuilder<>(dispatcher, source); copy.command = this.command; arguments.forEach((k, v) -> copy.arguments.put(k, v.copy())); copy.nodes.putAll(this.nodes); diff --git a/src/main/java/com/mojang/brigadier/context/ParsedArgument.java b/src/main/java/com/mojang/brigadier/context/ParsedArgument.java index ec5249a..bfe5b88 100644 --- a/src/main/java/com/mojang/brigadier/context/ParsedArgument.java +++ b/src/main/java/com/mojang/brigadier/context/ParsedArgument.java @@ -4,7 +4,7 @@ public class ParsedArgument { private final String raw; private final T result; - public ParsedArgument(String raw, T result) { + public ParsedArgument(final String raw, final T result) { this.raw = raw; this.result = result; } @@ -18,11 +18,11 @@ public class ParsedArgument { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof ParsedArgument)) return false; - ParsedArgument that = (ParsedArgument) o; + final ParsedArgument that = (ParsedArgument) o; if (!raw.equals(that.raw)) return false; if (!result.equals(that.result)) return false; diff --git a/src/main/java/com/mojang/brigadier/exceptions/CommandException.java b/src/main/java/com/mojang/brigadier/exceptions/CommandException.java index 46ec457..3af98e9 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/CommandException.java +++ b/src/main/java/com/mojang/brigadier/exceptions/CommandException.java @@ -6,7 +6,7 @@ public class CommandException extends Exception { private final CommandExceptionType type; private final Map data; - public CommandException(CommandExceptionType type, Map data) { + public CommandException(final CommandExceptionType type, final Map data) { this.type = type; this.data = data; } diff --git a/src/main/java/com/mojang/brigadier/exceptions/CommandExceptionType.java b/src/main/java/com/mojang/brigadier/exceptions/CommandExceptionType.java index 2a0ac70..37ed893 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/CommandExceptionType.java +++ b/src/main/java/com/mojang/brigadier/exceptions/CommandExceptionType.java @@ -2,5 +2,6 @@ package com.mojang.brigadier.exceptions; public interface CommandExceptionType { String getTypeName(); + String getErrorMessage(CommandException exception); } diff --git a/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java b/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java index 7741919..a1fa636 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java +++ b/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java @@ -7,14 +7,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class ParameterizedCommandExceptionType implements CommandExceptionType { - private static Pattern PATTERN = Pattern.compile("\\$\\{(\\w+)}"); + private static final Pattern PATTERN = Pattern.compile("\\$\\{(\\w+)}"); private static final Joiner JOINER = Joiner.on(", "); private final String name; private final String message; private final String[] keys; - public ParameterizedCommandExceptionType(String name, String message, String... keys) { + public ParameterizedCommandExceptionType(final String name, final String message, final String... keys) { this.name = name; this.message = message; this.keys = keys; @@ -26,7 +26,7 @@ public class ParameterizedCommandExceptionType implements CommandExceptionType { } @Override - public String getErrorMessage(CommandException exception) { + public String getErrorMessage(final CommandException exception) { final Matcher matcher = PATTERN.matcher(message); final StringBuffer result = new StringBuffer(); while (matcher.find()) { @@ -36,7 +36,7 @@ public class ParameterizedCommandExceptionType implements CommandExceptionType { return result.toString(); } - public CommandException create(Object... values) { + public CommandException create(final Object... values) { if (values.length != keys.length) { throw new IllegalArgumentException("Invalid values! (Expected: " + JOINER.join(keys) + ")"); } @@ -51,11 +51,11 @@ public class ParameterizedCommandExceptionType implements CommandExceptionType { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof CommandExceptionType)) return false; - CommandExceptionType that = (CommandExceptionType) o; + final CommandExceptionType that = (CommandExceptionType) o; return getTypeName().equals(that.getTypeName()); } diff --git a/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java b/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java index d32d676..93b5875 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java +++ b/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java @@ -6,7 +6,7 @@ public class SimpleCommandExceptionType implements CommandExceptionType { private final String name; private final String message; - public SimpleCommandExceptionType(String name, String message) { + public SimpleCommandExceptionType(final String name, final String message) { this.name = name; this.message = message; } @@ -17,7 +17,7 @@ public class SimpleCommandExceptionType implements CommandExceptionType { } @Override - public String getErrorMessage(CommandException exception) { + public String getErrorMessage(final CommandException exception) { return message; } @@ -26,11 +26,11 @@ public class SimpleCommandExceptionType implements CommandExceptionType { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof CommandExceptionType)) return false; - CommandExceptionType that = (CommandExceptionType) o; + final CommandExceptionType that = (CommandExceptionType) o; return getTypeName().equals(that.getTypeName()); } diff --git a/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java b/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java index 45e470c..53e3ba1 100644 --- a/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/ArgumentCommandNode.java @@ -18,7 +18,7 @@ public class ArgumentCommandNode extends CommandNode { private final String name; private final ArgumentType type; - public ArgumentCommandNode(String name, ArgumentType type, Command command, Predicate requirement) { + public ArgumentCommandNode(final String name, final ArgumentType type, final Command command, final Predicate requirement) { super(command, requirement); this.name = name; this.type = type; @@ -51,17 +51,17 @@ public class ArgumentCommandNode extends CommandNode { } @Override - public void parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { - int start = reader.getCursor(); - T result = type.parse(reader, contextBuilder); - ParsedArgument parsed = new ParsedArgument<>(reader.getString().substring(start, reader.getCursor()), result); + public void parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { + final int start = reader.getCursor(); + final T result = type.parse(reader, contextBuilder); + final ParsedArgument parsed = new ParsedArgument<>(reader.getString().substring(start, reader.getCursor()), result); contextBuilder.withArgument(name, parsed); contextBuilder.withNode(this, parsed.getRaw()); } @Override - public void listSuggestions(String command, Set output, CommandContextBuilder contextBuilder) { + public void listSuggestions(final String command, final Set output, final CommandContextBuilder contextBuilder) { type.listSuggestions(command, output, contextBuilder); } @@ -76,11 +76,11 @@ public class ArgumentCommandNode extends CommandNode { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof ArgumentCommandNode)) return false; - ArgumentCommandNode that = (ArgumentCommandNode) o; + final ArgumentCommandNode that = (ArgumentCommandNode) o; if (!name.equals(that.name)) return false; if (!type.equals(that.type)) return false; diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java index 266837d..dbe401c 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -17,10 +17,10 @@ import java.util.stream.Collectors; public abstract class CommandNode implements Comparable> { private Map> children = Maps.newLinkedHashMap(); + private final Predicate requirement; private Command command; - private Predicate requirement; - protected CommandNode(Command command, Predicate requirement) { + protected CommandNode(final Command command, final Predicate requirement) { this.command = command; this.requirement = requirement; } @@ -33,18 +33,18 @@ public abstract class CommandNode implements Comparable> { return children.values(); } - public boolean canUse(S source) { + public boolean canUse(final S source) { return requirement.test(source); } - public void addChild(CommandNode node) { - CommandNode child = children.get(node.getMergeKey()); + public void addChild(final CommandNode node) { + final CommandNode child = children.get(node.getMergeKey()); if (child != null) { // We've found something to merge onto if (node.getCommand() != null) { child.command = node.getCommand(); } - for (CommandNode grandchild : node.getChildren()) { + for (final CommandNode grandchild : node.getChildren()) { child.addChild(grandchild); } } else { @@ -55,11 +55,11 @@ public abstract class CommandNode implements Comparable> { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof CommandNode)) return false; - CommandNode that = (CommandNode) o; + final CommandNode that = (CommandNode) o; if (!children.equals(that.children)) return false; if (command != null ? !command.equals(that.command) : that.command != null) return false; @@ -89,7 +89,7 @@ public abstract class CommandNode implements Comparable> { protected abstract String getSortedKey(); @Override - public int compareTo(CommandNode o) { + public int compareTo(final CommandNode o) { return ComparisonChain .start() .compareTrueFirst(this instanceof LiteralCommandNode, o instanceof LiteralCommandNode) diff --git a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java index c615a2e..3a00b71 100644 --- a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java @@ -1,7 +1,6 @@ package com.mojang.brigadier.tree; import com.mojang.brigadier.Command; -import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContextBuilder; @@ -16,7 +15,7 @@ public class LiteralCommandNode extends CommandNode { private final String literal; - public LiteralCommandNode(String literal, Command command, Predicate requirement) { + public LiteralCommandNode(final String literal, final Command command, final Predicate requirement) { super(command, requirement); this.literal = literal; } @@ -31,7 +30,7 @@ public class LiteralCommandNode extends CommandNode { } @Override - public void parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { + public void parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { for (int i = 0; i < literal.length(); i++) { if (reader.canRead() && reader.peek() == literal.charAt(i)) { reader.skip(); @@ -44,18 +43,18 @@ public class LiteralCommandNode extends CommandNode { } @Override - public void listSuggestions(String command, Set output, CommandContextBuilder contextBuilder) { + public void listSuggestions(final String command, final Set output, final CommandContextBuilder contextBuilder) { if (literal.startsWith(command)) { output.add(literal); } } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof LiteralCommandNode)) return false; - LiteralCommandNode that = (LiteralCommandNode) o; + final LiteralCommandNode that = (LiteralCommandNode) o; if (!literal.equals(that.literal)) return false; return super.equals(o); diff --git a/src/main/java/com/mojang/brigadier/tree/RootCommandNode.java b/src/main/java/com/mojang/brigadier/tree/RootCommandNode.java index af56fab..fc7c201 100644 --- a/src/main/java/com/mojang/brigadier/tree/RootCommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/RootCommandNode.java @@ -23,15 +23,15 @@ public class RootCommandNode extends CommandNode { } @Override - public void parse(StringReader reader, CommandContextBuilder contextBuilder) throws CommandException { + public void parse(final StringReader reader, final CommandContextBuilder contextBuilder) throws CommandException { } @Override - public void listSuggestions(String command, Set output, CommandContextBuilder contextBuilder) { + public void listSuggestions(final String command, final Set output, final CommandContextBuilder contextBuilder) { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof RootCommandNode)) return false; return super.equals(o); diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherCompletionsTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherCompletionsTest.java index 8895ed6..da10f35 100644 --- a/src/test/java/com/mojang/brigadier/CommandDispatcherCompletionsTest.java +++ b/src/test/java/com/mojang/brigadier/CommandDispatcherCompletionsTest.java @@ -6,14 +6,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import static com.mojang.brigadier.arguments.IntegerArgumentType.integer; import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal; import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; @RunWith(MockitoJUnitRunner.class) public class CommandDispatcherCompletionsTest { @@ -36,9 +33,9 @@ public class CommandDispatcherCompletionsTest { subject.register(literal("foo")); subject.register(literal("bar")); subject.register(literal("baz").requires(s -> false)); - assertThat(subject.getCompletionSuggestions("", source), equalTo(new String[] {"bar", "foo"})); - assertThat(subject.getCompletionSuggestions("f", source), equalTo(new String[] {"foo"})); - assertThat(subject.getCompletionSuggestions("b", source), equalTo(new String[] {"bar"})); + assertThat(subject.getCompletionSuggestions("", source), equalTo(new String[]{"bar", "foo"})); + assertThat(subject.getCompletionSuggestions("f", source), equalTo(new String[]{"foo"})); + assertThat(subject.getCompletionSuggestions("b", source), equalTo(new String[]{"bar"})); assertThat(subject.getCompletionSuggestions("q", source), is(emptyArray())); } @@ -46,12 +43,12 @@ public class CommandDispatcherCompletionsTest { public void testSubCommand() throws Exception { subject.register(literal("foo").then(literal("abc")).then(literal("def")).then(literal("ghi").requires(s -> false))); subject.register(literal("bar")); - assertThat(subject.getCompletionSuggestions("", source), equalTo(new String[] {"bar", "foo"})); - assertThat(subject.getCompletionSuggestions("f", source), equalTo(new String[] {"foo"})); - assertThat(subject.getCompletionSuggestions("foo", source), equalTo(new String[] {"foo"})); - assertThat(subject.getCompletionSuggestions("foo ", source), equalTo(new String[] {"abc", "def"})); - assertThat(subject.getCompletionSuggestions("foo a", source), equalTo(new String[] {"abc"})); - assertThat(subject.getCompletionSuggestions("foo d", source), equalTo(new String[] {"def"})); + assertThat(subject.getCompletionSuggestions("", source), equalTo(new String[]{"bar", "foo"})); + assertThat(subject.getCompletionSuggestions("f", source), equalTo(new String[]{"foo"})); + assertThat(subject.getCompletionSuggestions("foo", source), equalTo(new String[]{"foo"})); + assertThat(subject.getCompletionSuggestions("foo ", source), equalTo(new String[]{"abc", "def"})); + assertThat(subject.getCompletionSuggestions("foo a", source), equalTo(new String[]{"abc"})); + assertThat(subject.getCompletionSuggestions("foo d", source), equalTo(new String[]{"def"})); assertThat(subject.getCompletionSuggestions("foo g", source), is(emptyArray())); } } \ No newline at end of file diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java index 64702a6..f20a978 100644 --- a/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java +++ b/src/test/java/com/mojang/brigadier/CommandDispatcherTest.java @@ -1,10 +1,7 @@ package com.mojang.brigadier; -import com.google.common.collect.ImmutableMap; -import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandException; -import com.mojang.brigadier.exceptions.CommandExceptionType; import com.mojang.brigadier.tree.LiteralCommandNode; import org.junit.Before; import org.junit.Test; @@ -13,7 +10,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import java.util.Collections; -import java.util.Map; import static com.mojang.brigadier.arguments.IntegerArgumentType.integer; import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal; @@ -21,7 +17,11 @@ import static com.mojang.brigadier.builder.RequiredArgumentBuilder.argument; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class CommandDispatcherTest { @@ -65,7 +65,7 @@ public class CommandDispatcherTest { try { subject.execute("foo", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(CommandDispatcher.ERROR_UNKNOWN_COMMAND)); assertThat(ex.getData(), is(Collections.emptyMap())); } @@ -78,7 +78,7 @@ public class CommandDispatcherTest { try { subject.execute("foo", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(CommandDispatcher.ERROR_UNKNOWN_COMMAND)); assertThat(ex.getData(), is(Collections.emptyMap())); } @@ -91,7 +91,7 @@ public class CommandDispatcherTest { try { subject.execute("", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(CommandDispatcher.ERROR_UNKNOWN_COMMAND)); assertThat(ex.getData(), is(Collections.emptyMap())); } @@ -104,7 +104,7 @@ public class CommandDispatcherTest { try { subject.execute("foo bar", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(CommandDispatcher.ERROR_UNKNOWN_ARGUMENT)); assertThat(ex.getData(), is(Collections.singletonMap("argument", "bar"))); } @@ -117,7 +117,7 @@ public class CommandDispatcherTest { try { subject.execute("foo baz", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(LiteralCommandNode.ERROR_INCORRECT_LITERAL)); assertThat(ex.getData(), is(Collections.singletonMap("expected", "bar"))); } @@ -134,7 +134,7 @@ public class CommandDispatcherTest { try { subject.execute("foo unknown", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(CommandDispatcher.ERROR_UNKNOWN_ARGUMENT)); assertThat(ex.getData(), is(Collections.singletonMap("argument", "unknown"))); } @@ -143,7 +143,7 @@ public class CommandDispatcherTest { @SuppressWarnings("unchecked") @Test public void testExecuteSubcommand() throws Exception { - Command subCommand = mock(Command.class); + final Command subCommand = mock(Command.class); when(subCommand.run(any())).thenReturn(100); subject.register(literal("foo").then( @@ -167,7 +167,7 @@ public class CommandDispatcherTest { try { subject.execute("foo bar", source); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(StringReader.ERROR_EXPECTED_INT)); assertThat(ex.getData(), is(Collections.emptyMap())); } diff --git a/src/test/java/com/mojang/brigadier/CommandDispatcherUsagesTest.java b/src/test/java/com/mojang/brigadier/CommandDispatcherUsagesTest.java index df47a32..c549b00 100644 --- a/src/test/java/com/mojang/brigadier/CommandDispatcherUsagesTest.java +++ b/src/test/java/com/mojang/brigadier/CommandDispatcherUsagesTest.java @@ -2,7 +2,6 @@ package com.mojang.brigadier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; -import com.google.common.collect.Maps; import com.mojang.brigadier.exceptions.CommandException; import com.mojang.brigadier.tree.CommandNode; import org.junit.Before; @@ -13,15 +12,12 @@ import org.mockito.runners.MockitoJUnitRunner; import java.util.Map; -import static com.mojang.brigadier.arguments.IntegerArgumentType.integer; import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; @RunWith(MockitoJUnitRunner.class) public class CommandDispatcherUsagesTest { @@ -93,10 +89,10 @@ public class CommandDispatcherUsagesTest { ); } - private CommandNode get(String command) { + private CommandNode get(final String command) { try { return Iterators.getLast(subject.parse(command, source).getContext().getNodes().keySet().iterator()); - } catch (CommandException e) { + } catch (final CommandException e) { throw new AssertionError("get() failed unexpectedly", e); } } @@ -118,7 +114,7 @@ public class CommandDispatcherUsagesTest { @Test public void testAllUsage_root() throws Exception { final String[] results = subject.getAllUsage(subject.getRoot(), source); - assertThat(results, equalTo(new String[] { + assertThat(results, equalTo(new String[]{ "a 1 i", "a 1 ii", "a 2 i", @@ -147,15 +143,15 @@ public class CommandDispatcherUsagesTest { public void testSmartUsage_root() throws Exception { final Map, String> results = subject.getSmartUsage(subject.getRoot(), source); assertThat(results, equalTo(ImmutableMap.builder() - .put(get("a"), "a (1|2)") - .put(get("b"), "b 1") - .put(get("c"), "c") - .put(get("e"), "e [1]") - .put(get("f"), "f (1|2)") - .put(get("g"), "g [1]") - .put(get("h"), "h [1|2|3]") - .put(get("i"), "i [1|2]") - .build() + .put(get("a"), "a (1|2)") + .put(get("b"), "b 1") + .put(get("c"), "c") + .put(get("e"), "e [1]") + .put(get("f"), "f (1|2)") + .put(get("g"), "g [1]") + .put(get("h"), "h [1|2|3]") + .put(get("i"), "i [1|2]") + .build() )); } diff --git a/src/test/java/com/mojang/brigadier/StringReaderTest.java b/src/test/java/com/mojang/brigadier/StringReaderTest.java index f2daede..b3e7a52 100644 --- a/src/test/java/com/mojang/brigadier/StringReaderTest.java +++ b/src/test/java/com/mojang/brigadier/StringReaderTest.java @@ -1,9 +1,7 @@ package com.mojang.brigadier; import com.google.common.collect.ImmutableMap; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.exceptions.CommandException; -import org.hamcrest.CoreMatchers; import org.junit.Test; import java.util.Collections; @@ -15,7 +13,7 @@ import static org.junit.Assert.assertThat; public class StringReaderTest { @Test public void canRead() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); assertThat(reader.canRead(), is(true)); reader.skip(); // 'a' assertThat(reader.canRead(), is(true)); @@ -27,7 +25,7 @@ public class StringReaderTest { @Test public void getRemainingLength() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); assertThat(reader.getRemainingLength(), is(3)); reader.setCursor(1); assertThat(reader.getRemainingLength(), is(2)); @@ -39,7 +37,7 @@ public class StringReaderTest { @Test public void canRead_length() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); assertThat(reader.canRead(1), is(true)); assertThat(reader.canRead(2), is(true)); assertThat(reader.canRead(3), is(true)); @@ -49,7 +47,7 @@ public class StringReaderTest { @Test public void peek() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); assertThat(reader.peek(), is('a')); assertThat(reader.getCursor(), is(0)); reader.setCursor(2); @@ -59,7 +57,7 @@ public class StringReaderTest { @Test public void read() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); assertThat(reader.read(), is('a')); assertThat(reader.read(), is('b')); assertThat(reader.read(), is('c')); @@ -68,14 +66,14 @@ public class StringReaderTest { @Test public void skip() throws Exception { - StringReader reader = new StringReader("abc"); + final StringReader reader = new StringReader("abc"); reader.skip(); assertThat(reader.getCursor(), is(1)); } @Test public void getRemaining() throws Exception { - StringReader reader = new StringReader("Hello!"); + final StringReader reader = new StringReader("Hello!"); assertThat(reader.getRemaining(), equalTo("Hello!")); reader.setCursor(3); assertThat(reader.getRemaining(), equalTo("lo!")); @@ -85,7 +83,7 @@ public class StringReaderTest { @Test public void getRead() throws Exception { - StringReader reader = new StringReader("Hello!"); + final StringReader reader = new StringReader("Hello!"); assertThat(reader.getRead(), equalTo("")); reader.setCursor(3); assertThat(reader.getRead(), equalTo("Hel")); diff --git a/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java index de29be9..8a781ea 100644 --- a/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/BoolArgumentTypeTest.java @@ -2,22 +2,16 @@ package com.mojang.brigadier.arguments; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.context.ParsedArgument; -import com.mojang.brigadier.exceptions.CommandException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import java.util.Collections; - -import static com.mojang.brigadier.arguments.BoolArgumentType.ERROR_INVALID; import static com.mojang.brigadier.arguments.BoolArgumentType.bool; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,7 +29,7 @@ public class BoolArgumentTypeTest { @Test public void parse() throws Exception { - StringReader reader = mock(StringReader.class); + final StringReader reader = mock(StringReader.class); when(reader.readBoolean()).thenReturn(true); assertThat(type.parse(reader, context), is(true)); verify(reader).readBoolean(); diff --git a/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java index 35f7e46..84781b3 100644 --- a/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/IntegerArgumentTypeTest.java @@ -36,25 +36,25 @@ public class IntegerArgumentTypeTest { @Test public void parse_noSuffix() throws Exception { - StringReader reader = new StringReader("15"); + final StringReader reader = new StringReader("15"); assertThat(integer().parse(reader, context), is(15)); assertThat(reader.canRead(), is(false)); } @Test public void parse_suffix() throws Exception { - StringReader reader = new StringReader("15L"); + final StringReader reader = new StringReader("15L"); assertThat(integer(0, 100, "L").parse(reader, context), is(15)); assertThat(reader.canRead(), is(false)); } @Test public void parse_suffix_incorrect() throws Exception { - StringReader reader = new StringReader("15W"); + final StringReader reader = new StringReader("15W"); try { integer(0, 100, "L").parse(reader, context); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(IntegerArgumentType.ERROR_WRONG_SUFFIX)); assertThat(ex.getData(), equalTo(ImmutableMap.of("suffix", "L"))); } @@ -62,11 +62,11 @@ public class IntegerArgumentTypeTest { @Test public void parse_suffix_missing() throws Exception { - StringReader reader = new StringReader("15"); + final StringReader reader = new StringReader("15"); try { integer(0, 100, "L").parse(reader, context); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(IntegerArgumentType.ERROR_WRONG_SUFFIX)); assertThat(ex.getData(), equalTo(ImmutableMap.of("suffix", "L"))); } @@ -74,11 +74,11 @@ public class IntegerArgumentTypeTest { @Test public void parse_tooSmall() throws Exception { - StringReader reader = new StringReader("-5"); + final StringReader reader = new StringReader("-5"); try { integer(0, 100).parse(reader, context); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(IntegerArgumentType.ERROR_TOO_SMALL)); assertThat(ex.getData(), equalTo(ImmutableMap.of("found", -5, "minimum", 0))); } @@ -86,11 +86,11 @@ public class IntegerArgumentTypeTest { @Test public void parse_tooBig() throws Exception { - StringReader reader = new StringReader("5"); + final StringReader reader = new StringReader("5"); try { integer(-100, 0).parse(reader, context); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(IntegerArgumentType.ERROR_TOO_BIG)); assertThat(ex.getData(), equalTo(ImmutableMap.of("found", 5, "maximum", 0))); } @@ -98,7 +98,7 @@ public class IntegerArgumentTypeTest { @Test public void testSuggestions() throws Exception { - Set set = Sets.newHashSet(); + final Set set = Sets.newHashSet(); @SuppressWarnings("unchecked") final CommandContextBuilder context = Mockito.mock(CommandContextBuilder.class); type.listSuggestions("", set, context); assertThat(set, is(empty())); diff --git a/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java b/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java index 35c4547..ec5f0ed 100644 --- a/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java +++ b/src/test/java/com/mojang/brigadier/arguments/StringArgumentTypeTest.java @@ -30,7 +30,7 @@ public class StringArgumentTypeTest { @Test public void testParseWord() throws Exception { - StringReader reader = mock(StringReader.class); + final StringReader reader = mock(StringReader.class); when(reader.readUnquotedString()).thenReturn("hello"); assertThat(word().parse(reader, context), equalTo("hello")); verify(reader).readUnquotedString(); @@ -38,7 +38,7 @@ public class StringArgumentTypeTest { @Test public void testParseString() throws Exception { - StringReader reader = mock(StringReader.class); + final StringReader reader = mock(StringReader.class); when(reader.readString()).thenReturn("hello world"); assertThat(string().parse(reader, context), equalTo("hello world")); verify(reader).readString(); @@ -46,14 +46,14 @@ public class StringArgumentTypeTest { @Test public void testParseGreedyString() throws Exception { - StringReader reader = new StringReader("Hello world! This is a test."); + final StringReader reader = new StringReader("Hello world! This is a test."); assertThat(greedyString().parse(reader, context), equalTo("Hello world! This is a test.")); assertThat(reader.canRead(), is(false)); } @Test public void testSuggestions() throws Exception { - Set set = Sets.newHashSet(); + final Set set = Sets.newHashSet(); string().listSuggestions("", set, context); assertThat(set, is(empty())); } diff --git a/src/test/java/com/mojang/brigadier/builder/ArgumentBuilderTest.java b/src/test/java/com/mojang/brigadier/builder/ArgumentBuilderTest.java index 971b9d0..6063ea8 100644 --- a/src/test/java/com/mojang/brigadier/builder/ArgumentBuilderTest.java +++ b/src/test/java/com/mojang/brigadier/builder/ArgumentBuilderTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import static com.mojang.brigadier.arguments.IntegerArgumentType.integer; import static com.mojang.brigadier.builder.RequiredArgumentBuilder.argument; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.IsCollectionContaining.hasItem; import static org.junit.Assert.assertThat; @@ -21,7 +20,7 @@ public class ArgumentBuilderTest { @Test public void testArguments() throws Exception { - RequiredArgumentBuilder argument = argument("bar", integer()); + final RequiredArgumentBuilder argument = argument("bar", integer()); builder.then(argument); diff --git a/src/test/java/com/mojang/brigadier/builder/LiteralArgumentBuilderTest.java b/src/test/java/com/mojang/brigadier/builder/LiteralArgumentBuilderTest.java index 3ecaa6a..a544826 100644 --- a/src/test/java/com/mojang/brigadier/builder/LiteralArgumentBuilderTest.java +++ b/src/test/java/com/mojang/brigadier/builder/LiteralArgumentBuilderTest.java @@ -25,14 +25,14 @@ public class LiteralArgumentBuilderTest { @Test public void testBuild() throws Exception { - LiteralCommandNode node = builder.build(); + final LiteralCommandNode node = builder.build(); assertThat(node.getLiteral(), is("foo")); } @Test public void testBuildWithExecutor() throws Exception { - LiteralCommandNode node = builder.executes(command).build(); + final LiteralCommandNode node = builder.executes(command).build(); assertThat(node.getLiteral(), is("foo")); assertThat(node.getCommand(), is(command)); @@ -42,7 +42,7 @@ public class LiteralArgumentBuilderTest { public void testBuildWithChildren() throws Exception { builder.then(argument("bar", integer())); builder.then(argument("baz", integer())); - LiteralCommandNode node = builder.build(); + final LiteralCommandNode node = builder.build(); assertThat(node.getChildren(), hasSize(2)); } diff --git a/src/test/java/com/mojang/brigadier/builder/RequiredArgumentBuilderTest.java b/src/test/java/com/mojang/brigadier/builder/RequiredArgumentBuilderTest.java index 9601406..3104a9e 100644 --- a/src/test/java/com/mojang/brigadier/builder/RequiredArgumentBuilderTest.java +++ b/src/test/java/com/mojang/brigadier/builder/RequiredArgumentBuilderTest.java @@ -28,7 +28,7 @@ public class RequiredArgumentBuilderTest { @Test public void testBuild() throws Exception { - ArgumentCommandNode node = builder.build(); + final ArgumentCommandNode node = builder.build(); assertThat(node.getName(), is("foo")); assertThat(node.getType(), is(type)); @@ -36,7 +36,7 @@ public class RequiredArgumentBuilderTest { @Test public void testBuildWithExecutor() throws Exception { - ArgumentCommandNode node = builder.executes(command).build(); + final ArgumentCommandNode node = builder.executes(command).build(); assertThat(node.getName(), is("foo")); assertThat(node.getType(), is(type)); @@ -47,7 +47,7 @@ public class RequiredArgumentBuilderTest { public void testBuildWithChildren() throws Exception { builder.then(argument("bar", integer())); builder.then(argument("baz", integer())); - ArgumentCommandNode node = builder.build(); + final ArgumentCommandNode node = builder.build(); assertThat(node.getChildren(), hasSize(2)); } diff --git a/src/test/java/com/mojang/brigadier/context/CommandContextTest.java b/src/test/java/com/mojang/brigadier/context/CommandContextTest.java index 3cb289b..0cbd0ac 100644 --- a/src/test/java/com/mojang/brigadier/context/CommandContextTest.java +++ b/src/test/java/com/mojang/brigadier/context/CommandContextTest.java @@ -37,13 +37,13 @@ public class CommandContextTest { @Test(expected = IllegalArgumentException.class) public void testGetArgument_wrongType() throws Exception { - CommandContext context = builder.withArgument("foo", new ParsedArgument<>("123", 123)).build(); + final CommandContext context = builder.withArgument("foo", new ParsedArgument<>("123", 123)).build(); context.getArgument("foo", String.class); } @Test public void testGetArgument() throws Exception { - CommandContext context = builder.withArgument("foo", new ParsedArgument<>("123", 123)).build(); + final CommandContext context = builder.withArgument("foo", new ParsedArgument<>("123", 123)).build(); assertThat(context.getArgument("foo", int.class), is(123)); } @@ -55,11 +55,11 @@ public class CommandContextTest { @SuppressWarnings("unchecked") @Test public void testEquals() throws Exception { - Object otherSource = new Object(); - Command command = mock(Command.class); - Command otherCommand = mock(Command.class); - CommandNode node = mock(CommandNode.class); - CommandNode otherNode = mock(CommandNode.class); + final Object otherSource = new Object(); + final Command command = mock(Command.class); + final Command otherCommand = mock(Command.class); + final CommandNode node = mock(CommandNode.class); + final CommandNode otherNode = mock(CommandNode.class); new EqualsTester() .addEqualityGroup(new CommandContextBuilder<>(dispatcher, source).build(), new CommandContextBuilder<>(dispatcher, source).build()) .addEqualityGroup(new CommandContextBuilder<>(dispatcher, otherSource).build(), new CommandContextBuilder<>(dispatcher, otherSource).build()) @@ -73,7 +73,7 @@ public class CommandContextTest { @Test public void testGetInput() throws Exception { - CommandContext context = builder.withNode(literal("foo").build(), "foo").withNode(argument("bar", integer()).build(), "100").withNode(literal("baz").build(), "baz").build(); + final CommandContext context = builder.withNode(literal("foo").build(), "foo").withNode(argument("bar", integer()).build(), "100").withNode(literal("baz").build(), "baz").build(); assertThat(context.getInput(), is("foo 100 baz")); } diff --git a/src/test/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionTypeTest.java b/src/test/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionTypeTest.java index 008db3f..a268b50 100644 --- a/src/test/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionTypeTest.java +++ b/src/test/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionTypeTest.java @@ -5,8 +5,6 @@ import com.google.common.testing.EqualsTester; import org.junit.Before; import org.junit.Test; -import java.util.Map; - import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -31,7 +29,7 @@ public class ParameterizedCommandExceptionTypeTest { @Test public void testCreate() throws Exception { - CommandException exception = type.create("World"); + final CommandException exception = type.create("World"); assertThat(exception.getType(), is(type)); assertThat(exception.getData(), is(ImmutableMap.of("name", "World"))); assertThat(exception.getMessage(), is("Hello, World!")); diff --git a/src/test/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionTypeTest.java b/src/test/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionTypeTest.java index 1939896..7e94269 100644 --- a/src/test/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionTypeTest.java +++ b/src/test/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionTypeTest.java @@ -11,8 +11,8 @@ import static org.junit.Assert.assertThat; public class SimpleCommandExceptionTypeTest { @Test public void testCreate() throws Exception { - SimpleCommandExceptionType type = new SimpleCommandExceptionType("foo", "bar"); - CommandException exception = type.create(); + final SimpleCommandExceptionType type = new SimpleCommandExceptionType("foo", "bar"); + final CommandException exception = type.create(); assertThat(exception.getType(), is(type)); assertThat(exception.getMessage(), is("bar")); assertThat(exception.getData().values(), empty()); diff --git a/src/test/java/com/mojang/brigadier/tree/AbstractCommandNodeTest.java b/src/test/java/com/mojang/brigadier/tree/AbstractCommandNodeTest.java index a71b7d1..0f697da 100644 --- a/src/test/java/com/mojang/brigadier/tree/AbstractCommandNodeTest.java +++ b/src/test/java/com/mojang/brigadier/tree/AbstractCommandNodeTest.java @@ -13,13 +13,14 @@ import static org.junit.Assert.assertThat; @RunWith(MockitoJUnitRunner.class) public abstract class AbstractCommandNodeTest { - @Mock private Command command; + @Mock + private Command command; protected abstract CommandNode getCommandNode(); @Test public void testAddChild() throws Exception { - CommandNode node = getCommandNode(); + final CommandNode node = getCommandNode(); node.addChild(literal("child1").build()); node.addChild(literal("child2").build()); @@ -30,7 +31,7 @@ public abstract class AbstractCommandNodeTest { @Test public void testAddChildMergesGrandchildren() throws Exception { - CommandNode node = getCommandNode(); + final CommandNode node = getCommandNode(); node.addChild(literal("child").then( literal("grandchild1") @@ -46,7 +47,7 @@ public abstract class AbstractCommandNodeTest { @Test public void testAddChildPreservesCommand() throws Exception { - CommandNode node = getCommandNode(); + final CommandNode node = getCommandNode(); node.addChild(literal("child").executes(command).build()); node.addChild(literal("child").build()); @@ -56,7 +57,7 @@ public abstract class AbstractCommandNodeTest { @Test public void testAddChildOverwritesCommand() throws Exception { - CommandNode node = getCommandNode(); + final CommandNode node = getCommandNode(); node.addChild(literal("child").build()); node.addChild(literal("child").executes(command).build()); diff --git a/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java b/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java index 5728c90..ffe9e07 100644 --- a/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java +++ b/src/test/java/com/mojang/brigadier/tree/ArgumentCommandNodeTest.java @@ -1,16 +1,13 @@ package com.mojang.brigadier.tree; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.common.testing.EqualsTester; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; -import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.context.CommandContextBuilder; -import com.mojang.brigadier.exceptions.CommandException; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -22,14 +19,12 @@ import static com.mojang.brigadier.builder.RequiredArgumentBuilder.argument; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { private ArgumentCommandNode node; private CommandContextBuilder contextBuilder; - private Object source = new Object(); @Override protected CommandNode getCommandNode() { @@ -44,7 +39,7 @@ public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { @Test public void testParse() throws Exception { - StringReader reader = new StringReader("123 456"); + final StringReader reader = new StringReader("123 456"); node.parse(reader, contextBuilder); assertThat(contextBuilder.getArguments().containsKey("foo"), is(true)); @@ -64,15 +59,15 @@ public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { @Test public void testUsage_empty() throws Exception { - @SuppressWarnings("unchecked") ArgumentType type = mock(ArgumentType.class); + @SuppressWarnings("unchecked") final ArgumentType type = mock(ArgumentType.class); when(type.getUsageText()).thenReturn(null); - ArgumentCommandNode node = argument("foo", type).build(); + final ArgumentCommandNode node = argument("foo", type).build(); assertThat(node.getUsageText(), is("")); } @Test public void testSuggestions() throws Exception { - Set set = Sets.newHashSet(); + final Set set = Sets.newHashSet(); @SuppressWarnings("unchecked") final CommandContextBuilder context = Mockito.mock(CommandContextBuilder.class); node.listSuggestions("", set, context); assertThat(set, is(empty())); @@ -80,7 +75,7 @@ public class ArgumentCommandNodeTest extends AbstractCommandNodeTest { @Test public void testEquals() throws Exception { - @SuppressWarnings("unchecked") Command command = (Command) mock(Command.class); + @SuppressWarnings("unchecked") final Command command = (Command) mock(Command.class); new EqualsTester() .addEqualityGroup( diff --git a/src/test/java/com/mojang/brigadier/tree/LiteralCommandNodeTest.java b/src/test/java/com/mojang/brigadier/tree/LiteralCommandNodeTest.java index 762666c..6adb879 100644 --- a/src/test/java/com/mojang/brigadier/tree/LiteralCommandNodeTest.java +++ b/src/test/java/com/mojang/brigadier/tree/LiteralCommandNodeTest.java @@ -40,21 +40,21 @@ public class LiteralCommandNodeTest extends AbstractCommandNodeTest { @Test public void testParse() throws Exception { - StringReader reader = new StringReader("foo bar"); + final StringReader reader = new StringReader("foo bar"); node.parse(reader, contextBuilder); assertThat(reader.getRemaining(), equalTo(" bar")); } @Test public void testParseExact() throws Exception { - StringReader reader = new StringReader("foo"); + final StringReader reader = new StringReader("foo"); node.parse(reader, contextBuilder); assertThat(reader.getRemaining(), equalTo("")); } @Test public void testParseSimilar() throws Exception { - StringReader reader = new StringReader("foobar"); + final StringReader reader = new StringReader("foobar"); node.parse(reader, contextBuilder); assertThat(reader.getRemaining(), equalTo("bar")); // This should succeed, because it's the responsibility of the dispatcher to realize there's trailing text @@ -62,11 +62,11 @@ public class LiteralCommandNodeTest extends AbstractCommandNodeTest { @Test public void testParseInvalid() throws Exception { - StringReader reader = new StringReader("bar"); + final StringReader reader = new StringReader("bar"); try { node.parse(reader, contextBuilder); fail(); - } catch (CommandException ex) { + } catch (final CommandException ex) { assertThat(ex.getType(), is(LiteralCommandNode.ERROR_INCORRECT_LITERAL)); assertThat(ex.getData(), is(ImmutableMap.of("expected", "foo"))); } @@ -79,7 +79,7 @@ public class LiteralCommandNodeTest extends AbstractCommandNodeTest { @Test public void testSuggestions() throws Exception { - Set set = Sets.newHashSet(); + final Set set = Sets.newHashSet(); @SuppressWarnings("unchecked") final CommandContextBuilder context = Mockito.mock(CommandContextBuilder.class); node.listSuggestions("", set, context); @@ -100,7 +100,7 @@ public class LiteralCommandNodeTest extends AbstractCommandNodeTest { @Test public void testEquals() throws Exception { - @SuppressWarnings("unchecked") Command command = mock(Command.class); + @SuppressWarnings("unchecked") final Command command = mock(Command.class); new EqualsTester() .addEqualityGroup( diff --git a/src/test/java/com/mojang/brigadier/tree/RootCommandNodeTest.java b/src/test/java/com/mojang/brigadier/tree/RootCommandNodeTest.java index babd73c..3d2d193 100644 --- a/src/test/java/com/mojang/brigadier/tree/RootCommandNodeTest.java +++ b/src/test/java/com/mojang/brigadier/tree/RootCommandNodeTest.java @@ -31,7 +31,7 @@ public class RootCommandNodeTest extends AbstractCommandNodeTest { @Test public void testParse() throws Exception { - StringReader reader = new StringReader("hello world"); + final StringReader reader = new StringReader("hello world"); node.parse(reader, new CommandContextBuilder<>(new CommandDispatcher<>(), new Object())); assertThat(reader.getCursor(), is(0)); } @@ -48,7 +48,7 @@ public class RootCommandNodeTest extends AbstractCommandNodeTest { @Test public void testSuggestions() throws Exception { - Set set = Sets.newHashSet(); + final Set set = Sets.newHashSet(); @SuppressWarnings("unchecked") final CommandContextBuilder context = Mockito.mock(CommandContextBuilder.class); node.listSuggestions("", set, context); assertThat(set, is(empty()));